Skip to content

Commit 8ba146c

Browse files
daianamezdreadaianamezdrea
committed
Remove debian from testing process
Update pr_test.yml test2 Update params.pp Update pr_test.yml Test for simpleproc already exists remove test Update pr_test.yml Update pr_test.yml Update pr_test.yml Delete os - es Update pr_test.yml add lsb remove debugging session Update params.pp Update spec_helper_acceptance_local.rb Restore os-es and delete Debian
1 parent 56d106f commit 8ba146c

File tree

4 files changed

+75
-94
lines changed

4 files changed

+75
-94
lines changed

‎.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: |

‎manifests/params.pp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@
257257
} else {
258258
$python_package_name = 'python-mysqldb'
259259
}
260-
260+
261+
notice($::lsbdistcodename)
261262
$ruby_package_name = $::lsbdistcodename ? {
262263
'jessie' => 'ruby-mysql',
263264
'stretch' => 'ruby-mysql2',
@@ -268,6 +269,7 @@
268269
'focal' => 'ruby-mysql2',
269270
default => 'libmysql-ruby',
270271
}
272+
notice($ruby_package_name)
271273
}
272274

273275
'Archlinux': {

‎metadata.json

Lines changed: 68 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,69 @@
11
{
2-
"name": "puppetlabs-mysql",
3-
"version": "11.0.0",
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-
"name": "puppetlabs/translate",
17-
"version_requirement": ">= 1.0.0 < 3.0.0"
18-
},
19-
{
20-
"name": "puppetlabs/resource_api",
21-
"version_requirement": ">= 1.0.0 < 2.0.0"
22-
}
23-
],
24-
"operatingsystem_support": [
25-
{
26-
"operatingsystem": "RedHat",
27-
"operatingsystemrelease": [
28-
"6",
29-
"7",
30-
"8"
31-
]
32-
},
33-
{
34-
"operatingsystem": "CentOS",
35-
"operatingsystemrelease": [
36-
"6",
37-
"7",
38-
"8"
39-
]
40-
},
41-
{
42-
"operatingsystem": "OracleLinux",
43-
"operatingsystemrelease": [
44-
"6",
45-
"7"
46-
]
47-
},
48-
{
49-
"operatingsystem": "Scientific",
50-
"operatingsystemrelease": [
51-
"6",
52-
"7"
53-
]
54-
},
55-
{
56-
"operatingsystem": "SLES",
57-
"operatingsystemrelease": [
58-
"12",
59-
"15"
60-
]
61-
},
62-
{
63-
"operatingsystem": "Debian",
64-
"operatingsystemrelease": [
65-
"8",
66-
"9",
67-
"10"
68-
]
69-
},
70-
{
71-
"operatingsystem": "Ubuntu",
72-
"operatingsystemrelease": [
73-
"14.04",
74-
"16.04",
75-
"18.04",
76-
"20.04"
77-
]
78-
}
79-
],
80-
"requirements": [
81-
{
82-
"name": "puppet",
83-
"version_requirement": ">= 6.0.0 < 8.0.0"
84-
}
85-
],
86-
"description": "MySQL module",
87-
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
88-
"template-ref": "heads/main-0-g7be43a3",
89-
"pdk-version": "1.18.1"
90-
}
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"
69+
}

‎spec/spec_helper_acceptance_local.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ def export_locales
3737

3838
RSpec.configure do |c|
3939
c.before :suite do
40-
if os[:family] == 'debian' || os[:family] == 'ubuntu'
40+
if os[:family] == 'debian'
4141
# needed for the puppet fact
42-
LitmusHelper.instance.apply_manifest("package { 'lsb-release': ensure => installed, }", expect_failures: false)
42+
LitmusHelper.instance.apply_manifest("package { 'ap': ensure => installed, }", expect_failures: false)
4343
end
4444
# needed for the grant tests, not installed on el7 docker images
4545
LitmusHelper.instance.apply_manifest("package { 'which': ensure => installed, }", expect_failures: false)

0 commit comments

Comments
 (0)