Skip to content

Commit 24dc144

Browse files
daianamezdreadaianamezdrea
committed
PDK update
Add ubuntu condition back Add lsb-release dependency Fix lsb Update spec_helper_acceptance_local.rb
1 parent f65e161 commit 24dc144

File tree

10 files changed

+90
-87
lines changed

10 files changed

+90
-87
lines changed

‎.github/workflows/auto_release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ jobs:
6666
branch: "release-prep"
6767
delete-branch: true
6868
title: "Release prep v${{ steps.gv.outputs.ver }}"
69-
body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}"
69+
body: |
70+
Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}.
71+
Please verify before merging:
72+
- [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
73+
- [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
74+
- [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
7075
labels: "maintenance"
7176

7277
- name: PR outputs

‎.github/workflows/pr_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
8585
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
8686
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
87-
87+
8888
- name: "Honeycomb: Start recording"
8989
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
9090
with:
@@ -177,7 +177,7 @@ jobs:
177177
echo
178178
echo ::endgroup::
179179
fi
180-
180+
181181
- name: "Honeycomb: Record removal times"
182182
if: ${{ always() }}
183183
run: |

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
ref: ${{ github.ref }}
3939
clean: true
4040
- name: "PDK Build"
41-
uses: docker://puppet/pdk:nightly
41+
uses: docker://puppet/pdk:2.1.0.0
4242
with:
4343
args: 'build'
4444
- name: "Push to Forge"
45-
uses: docker://puppet/pdk:nightly
45+
uses: docker://puppet/pdk:2.1.0.0
4646
with:
4747
args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@
2525
.project
2626
.envrc
2727
/inventory.yaml
28+
/spec/fixtures/litmus_inventory.yaml

‎.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ tasks:
66

77
vscode:
88
extensions:
9-
- puppet.puppet-vscode@1.0.0:oSzfTkDf6Cmc1jOjgW33VA==
9+
- puppet.puppet-vscode@1.2.0:f5iEPbmOj6FoFTOV6q8LTg==

‎.pdkignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
.project
2626
.envrc
2727
/inventory.yaml
28+
/spec/fixtures/litmus_inventory.yaml
2829
/appveyor.yml
2930
/.fixtures.yml
3031
/Gemfile

‎Gemfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,6 @@ gems['puppet'] = location_for(puppet_version)
4545
gems['facter'] = location_for(facter_version) if facter_version
4646
gems['hiera'] = location_for(hiera_version) if hiera_version
4747

48-
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
49-
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem
50-
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
51-
gems['win32-dir'] = ['<= 0.4.9', require: false]
52-
gems['win32-eventlog'] = ['<= 0.6.5', require: false]
53-
gems['win32-process'] = ['<= 0.7.5', require: false]
54-
gems['win32-security'] = ['<= 0.2.5', require: false]
55-
gems['win32-service'] = ['0.8.8', require: false]
56-
end
57-
5848
gems.each do |gem_name, gem_params|
5949
gem gem_name, *gem_params
6050
end

‎manifests/params.pp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
$python_package_name = 'python-mysqldb'
258258
}
259259

260-
$ruby_package_name = $facts['operatingsystemmajrelease'] ? {
260+
$ruby_package_name = $facts['operatingsystemmajrelease'] ? {
261261
'8' => 'ruby-mysql', # jessie
262262
'9' => 'ruby-mysql2', # stretch
263263
'10' => 'ruby-mysql2', # buster
@@ -267,7 +267,8 @@
267267
'20.04' => 'ruby-mysql2', # focal
268268
default => 'libmysql-ruby',
269269
}
270-
}
270+
271+
}
271272

272273
'Archlinux': {
273274
$daemon_dev_package_name = undef
@@ -579,4 +580,4 @@
579580
if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' and $::operatingsystem != 'Amazon' {
580581
fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 5.0 and beyond.")
581582
}
582-
}
583+
}

‎metadata.json

Lines changed: 72 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,74 @@
11
{
2-
"name": "puppetlabs-mysql",
3-
"version": "11.0.1",
4-
"author": "puppetlabs",
5-
"summary": "Installs, configures, and manages the MySQL service.",
6-
"license": "Apache-2.0",
7-
"source": "git://github.com/puppetlabs/puppetlabs-mysql",
8-
"project_page": "http://github.com/puppetlabs/puppetlabs-mysql",
9-
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
10-
"dependencies": [{
11-
"name": "puppetlabs/stdlib",
12-
"version_requirement": ">= 3.2.0 < 8.0.0"
13-
}],
14-
"operatingsystem_support": [{
15-
"operatingsystem": "RedHat",
16-
"operatingsystemrelease": [
17-
"6",
18-
"7",
19-
"8"
20-
]
21-
},
22-
{
23-
"operatingsystem": "CentOS",
24-
"operatingsystemrelease": [
25-
"6",
26-
"7",
27-
"8"
28-
]
29-
},
30-
{
31-
"operatingsystem": "OracleLinux",
32-
"operatingsystemrelease": [
33-
"6",
34-
"7"
35-
]
36-
},
37-
{
38-
"operatingsystem": "Scientific",
39-
"operatingsystemrelease": [
40-
"6",
41-
"7"
42-
]
43-
},
44-
{
45-
"operatingsystem": "SLES",
46-
"operatingsystemrelease": [
47-
"12",
48-
"15"
49-
]
50-
},
51-
{
52-
"operatingsystem": "Ubuntu",
53-
"operatingsystemrelease": [
54-
"14.04",
55-
"16.04",
56-
"18.04",
57-
"20.04"
58-
]
59-
}
60-
],
61-
"requirements": [{
62-
"name": "puppet",
63-
"version_requirement": ">= 6.0.0 < 8.0.0"
64-
}],
65-
"description": "MySQL module",
66-
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
67-
"template-ref": "heads/main-0-g44cc7ed",
68-
"pdk-version": "1.18.1"
2+
"name": "puppetlabs-mysql",
3+
"version": "11.0.1",
4+
"author": "puppetlabs",
5+
"summary": "Installs, configures, and manages the MySQL service.",
6+
"license": "Apache-2.0",
7+
"source": "git://github.com/puppetlabs/puppetlabs-mysql",
8+
"project_page": "http://github.com/puppetlabs/puppetlabs-mysql",
9+
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
10+
"dependencies": [
11+
{
12+
"name": "puppetlabs/stdlib",
13+
"version_requirement": ">= 3.2.0 < 8.0.0"
14+
}
15+
],
16+
"operatingsystem_support": [
17+
{
18+
"operatingsystem": "RedHat",
19+
"operatingsystemrelease": [
20+
"6",
21+
"7",
22+
"8"
23+
]
24+
},
25+
{
26+
"operatingsystem": "CentOS",
27+
"operatingsystemrelease": [
28+
"6",
29+
"7",
30+
"8"
31+
]
32+
},
33+
{
34+
"operatingsystem": "OracleLinux",
35+
"operatingsystemrelease": [
36+
"6",
37+
"7"
38+
]
39+
},
40+
{
41+
"operatingsystem": "Scientific",
42+
"operatingsystemrelease": [
43+
"6",
44+
"7"
45+
]
46+
},
47+
{
48+
"operatingsystem": "SLES",
49+
"operatingsystemrelease": [
50+
"12",
51+
"15"
52+
]
53+
},
54+
{
55+
"operatingsystem": "Ubuntu",
56+
"operatingsystemrelease": [
57+
"14.04",
58+
"16.04",
59+
"18.04",
60+
"20.04"
61+
]
62+
}
63+
],
64+
"requirements": [
65+
{
66+
"name": "puppet",
67+
"version_requirement": ">= 6.0.0 < 8.0.0"
68+
}
69+
],
70+
"description": "MySQL module",
71+
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
72+
"template-ref": "heads/main-0-ge04486b",
73+
"pdk-version": "2.1.0"
6974
}

‎spec/spec_helper_acceptance_local.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def export_locales
3737

3838
RSpec.configure do |c|
3939
c.before :suite do
40-
if os[:family] == 'debian'
40+
if os[:family] == 'debian' || os[:family] == 'ubuntu'
4141
# needed for the puppet fact
4242
LitmusHelper.instance.apply_manifest("package { 'ap': ensure => installed, }", expect_failures: false)
4343
end

0 commit comments

Comments
 (0)