Skip to content

Commit e01c392

Browse files
LukasAudLukasAud
committed
Removing Puppet 7 from default supported list
1 parent 7411eab commit e01c392

File tree

2 files changed

+27
-31
lines changed

2 files changed

+27
-31
lines changed

‎exe/matrix.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"collections": [
3-
{
4-
"puppet": 7.24,
5-
"ruby": 2.7
6-
},
73
{
84
"puppet": 8.0,
95
"ruby": 3.2
@@ -90,7 +86,7 @@
9086
},
9187
"github_runner": {
9288
"docker": {
93-
"^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|Ubuntu-18|Debian-10)": "ubuntu-20.04"
89+
"^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|Ubuntu-18|Debian-10)": "ubuntu-22.04"
9490
}
9591
}
9692
}

‎spec/exe/matrix_from_metadata_v3_spec.rb

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
matrix = [
2525
'matrix={',
2626
'"platforms":[',
27-
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
28-
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
29-
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},',
27+
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-22.04"},',
28+
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-22.04"},',
29+
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-22.04"},',
3030
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"}',
3131
'],',
3232
'"collection":[',
33-
'"puppet7-nightly","puppet8-nightly"',
33+
'"puppet8-nightly"',
3434
']',
3535
'}'
3636
].join
@@ -41,7 +41,7 @@
4141
'::group::spec_matrix'
4242
)
4343
expect(github_output_content).to include(matrix)
44-
expect(github_output_content).to include('spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}')
44+
expect(github_output_content).to include('spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}')
4545
end
4646
end
4747

@@ -53,17 +53,17 @@
5353
[
5454
'matrix={',
5555
'"platforms":[',
56-
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
57-
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
56+
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-22.04"},',
57+
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-22.04"},',
5858
'{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},',
5959
'{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},',
6060
'{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},',
61-
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},',
61+
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-22.04"},',
6262
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},',
6363
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
6464
'],',
6565
'"collection":[',
66-
'"puppet7-nightly","puppet8-nightly"',
66+
'"puppet8-nightly"',
6767
']',
6868
'}'
6969
].join
@@ -82,7 +82,7 @@
8282
)
8383
expect(github_output_content).to include(matrix)
8484
expect(github_output_content).to include(
85-
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
85+
'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
8686
)
8787
end
8888
end
@@ -93,17 +93,17 @@
9393
[
9494
'matrix={',
9595
'"platforms":[',
96-
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
97-
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
96+
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-22.04"},',
97+
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-22.04"},',
9898
'{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},',
9999
'{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},',
100100
'{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},',
101-
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},',
101+
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-22.04"},',
102102
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},',
103103
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
104104
'],',
105105
'"collection":[',
106-
'"puppet7-nightly","puppet8-nightly"',
106+
'"puppet8-nightly"',
107107
']',
108108
'}'
109109
].join
@@ -122,7 +122,7 @@
122122
)
123123
expect(github_output_content).to include(matrix)
124124
expect(github_output_content).to include(
125-
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
125+
'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
126126
)
127127
end
128128
end
@@ -133,16 +133,16 @@
133133
[
134134
'matrix={',
135135
'"platforms":[',
136-
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
137-
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
136+
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-22.04"},',
137+
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-22.04"},',
138138
'{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},',
139139
'{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},',
140140
'{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},',
141141
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},',
142142
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
143143
'],',
144144
'"collection":[',
145-
'"puppet7-nightly","puppet8-nightly"',
145+
'"puppet8-nightly"',
146146
']',
147147
'}'
148148
].join
@@ -162,7 +162,7 @@
162162
)
163163
expect(github_output_content).to include(matrix)
164164
expect(github_output_content).to include(
165-
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
165+
'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
166166
)
167167
end
168168
end
@@ -175,7 +175,7 @@
175175
'"platforms":[',
176176
'],',
177177
'"collection":[',
178-
'"puppet7-nightly","puppet8-nightly"',
178+
'"puppet8-nightly"',
179179
']',
180180
'}'
181181
].join
@@ -198,7 +198,7 @@
198198
)
199199
expect(github_output_content).to include(matrix)
200200
expect(github_output_content).to include(
201-
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
201+
'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
202202
)
203203
end
204204
end
@@ -209,13 +209,13 @@
209209
[
210210
'matrix={',
211211
'"platforms":[',
212-
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
212+
'{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-22.04"},',
213213
'{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
214-
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},',
214+
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-22.04"},',
215215
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"}',
216216
'],',
217217
'"collection":[',
218-
'"puppet7-nightly","puppet8-nightly"',
218+
'"puppet8-nightly"',
219219
']',
220220
'}'
221221
].join
@@ -233,10 +233,10 @@
233233
'::group::spec_matrix'
234234
)
235235
expect(github_output_content).to include(
236-
'"collection":["2023.8.0-puppet_enterprise","2021.7.9-puppet_enterprise","puppet7-nightly","puppet8-nightly"'
236+
'"collection":["2023.8.0-puppet_enterprise","2021.7.9-puppet_enterprise","puppet8-nightly"'
237237
)
238238
expect(github_output_content).to include(
239-
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
239+
'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
240240
)
241241
end
242242
end

0 commit comments

Comments
 (0)