puppet_litmus 2.4.2 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/exe/matrix.json +10 -4
- data/exe/matrix_from_metadata_v2 +4 -0
- data/exe/matrix_from_metadata_v3 +6 -6
- data/lib/puppet_litmus/version.rb +1 -1
- data/spec/exe/fake_metadata.json +2 -1
- data/spec/exe/matrix_from_metadata_v2_spec.rb +10 -4
- data/spec/exe/matrix_from_metadata_v3_spec.rb +41 -6
- data/spec/spec_helper.rb +2 -2
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 68a5da663b866300b6b5a615485c799acf5e21734dcccc7218fa0eb90a5796aa
|
|
4
|
+
data.tar.gz: a6d3f206e3c5c5f7676d2bac31e39cb60171df89f43cafded174703d45f8e8e0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f1c2dbfa634c423163cb8d2722d5fc172073d2c1daa2065d7acba8e95242e96ec22e63f53ded70180d1260c75df80ab7106e33bbb99dd42bf76ca15b02232323
|
|
7
|
+
data.tar.gz: 02cb42bb65966d51a94b57b87d590684a7b79101544bd30cafbfb3de85759e242ec0501759ecc432824bca55aaa3c5673bb1c9e63ebeef6845ad0dc77b4ddec0
|
data/exe/matrix.json
CHANGED
|
@@ -23,12 +23,14 @@
|
|
|
23
23
|
"Debian": {
|
|
24
24
|
"10": { "x86_64": "debian-10" },
|
|
25
25
|
"11": { "x86_64": "debian-11" },
|
|
26
|
-
"12": { "x86_64": "debian-12", "arm": "debian-12-arm64" }
|
|
26
|
+
"12": { "x86_64": "debian-12", "arm": "debian-12-arm64" },
|
|
27
|
+
"13": { "x86_64": "debian-13" }
|
|
27
28
|
},
|
|
28
29
|
"RedHat": {
|
|
29
30
|
"7": { "x86_64": "rhel-7" },
|
|
30
31
|
"8": { "x86_64": "rhel-8" },
|
|
31
|
-
"9": { "x86_64": "rhel-9", "arm": "rhel-9-arm64" }
|
|
32
|
+
"9": { "x86_64": "rhel-9", "arm": "rhel-9-arm64" },
|
|
33
|
+
"10": { "x86_64": "rhel-10", "arm": "rhel-10-arm64" }
|
|
32
34
|
},
|
|
33
35
|
"SLES" : {
|
|
34
36
|
"12": { "x86_64": "sles-12" },
|
|
@@ -66,7 +68,8 @@
|
|
|
66
68
|
"Debian": {
|
|
67
69
|
"10": { "x86_64": "litmusimage/debian:10" },
|
|
68
70
|
"11": { "x86_64": "litmusimage/debian:11" },
|
|
69
|
-
"12": { "x86_64": "litmusimage/debian:12" }
|
|
71
|
+
"12": { "x86_64": "litmusimage/debian:12" },
|
|
72
|
+
"13": { "x86_64": "litmusimage/debian:13" }
|
|
70
73
|
},
|
|
71
74
|
"OracleLinux": {
|
|
72
75
|
"7": { "x86_64": "litmusimage/oraclelinux:7" },
|
|
@@ -76,6 +79,9 @@
|
|
|
76
79
|
"Scientific": {
|
|
77
80
|
"7": { "x86_64": "litmusimage/scientificlinux:7" }
|
|
78
81
|
},
|
|
82
|
+
"SLES": {
|
|
83
|
+
"15": { "x86_64": "litmusimage/sles:15" }
|
|
84
|
+
},
|
|
79
85
|
"Ubuntu": {
|
|
80
86
|
"18.04": { "x86_64": "litmusimage/ubuntu:18.04" },
|
|
81
87
|
"20.04": { "x86_64": "litmusimage/ubuntu:20.04" },
|
|
@@ -86,7 +92,7 @@
|
|
|
86
92
|
},
|
|
87
93
|
"github_runner": {
|
|
88
94
|
"docker": {
|
|
89
|
-
"^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|(AlmaLinux|OracleLinux|Rocky|CentOS)-9|AlmaLinux-8|Fedora-36|Ubuntu-18|Debian-10)":
|
|
95
|
+
"^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|(AlmaLinux|OracleLinux|Rocky|CentOS)-9|AlmaLinux-8|Fedora-36|SLES-15|Ubuntu-18|Debian-10)": "ubuntu-22.04"
|
|
90
96
|
}
|
|
91
97
|
}
|
|
92
98
|
}
|
data/exe/matrix_from_metadata_v2
CHANGED
|
@@ -28,6 +28,7 @@ IMAGE_TABLE = {
|
|
|
28
28
|
'RedHat-7' => 'rhel-7',
|
|
29
29
|
'RedHat-8' => 'rhel-8',
|
|
30
30
|
'RedHat-9' => 'rhel-9',
|
|
31
|
+
'RedHat-10' => 'rhel-10',
|
|
31
32
|
'SLES-12' => 'sles-12',
|
|
32
33
|
'SLES-15' => 'sles-15',
|
|
33
34
|
'Windows-2016' => 'windows-2016',
|
|
@@ -38,6 +39,7 @@ IMAGE_TABLE = {
|
|
|
38
39
|
ARM_IMAGE_TABLE = {
|
|
39
40
|
'Debian-12-arm' => 'debian-12-arm64',
|
|
40
41
|
'RedHat-9-arm' => 'rhel-9-arm64',
|
|
42
|
+
'RedHat-10-arm' => 'rhel-10-arm64',
|
|
41
43
|
'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64',
|
|
42
44
|
'Ubuntu-24.04-arm' => 'ubuntu-2404-lts-arm64'
|
|
43
45
|
}.freeze
|
|
@@ -55,6 +57,7 @@ DOCKER_PLATFORMS = {
|
|
|
55
57
|
'Debian-10' => 'litmusimage/debian:10',
|
|
56
58
|
'Debian-11' => 'litmusimage/debian:11',
|
|
57
59
|
'Debian-12' => 'litmusimage/debian:12',
|
|
60
|
+
'Debian-13' => 'litmusimage/debian:13',
|
|
58
61
|
'OracleLinux-7' => 'litmusimage/oraclelinux:7',
|
|
59
62
|
'OracleLinux-8' => 'litmusimage/oraclelinux:8',
|
|
60
63
|
'OracleLinux-9' => 'litmusimage/oraclelinux:9',
|
|
@@ -120,6 +123,7 @@ if ARGV.include?('--provision-service')
|
|
|
120
123
|
'Debian-10' => 'debian-10',
|
|
121
124
|
'Debian-11' => 'debian-11',
|
|
122
125
|
'Debian-12' => 'debian-12',
|
|
126
|
+
'Debian-13' => 'debian-13',
|
|
123
127
|
'Ubuntu-20.04' => 'ubuntu-2004-lts',
|
|
124
128
|
'Ubuntu-22.04' => 'ubuntu-2204-lts',
|
|
125
129
|
'Ubuntu-24.04' => 'ubuntu-2404-lts'
|
data/exe/matrix_from_metadata_v3
CHANGED
|
@@ -281,12 +281,12 @@ options[:metadata]['requirements']&.each do |req|
|
|
|
281
281
|
end
|
|
282
282
|
|
|
283
283
|
version = collection['puppet'].to_i
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
284
|
+
forge_token = ENV.fetch('PUPPET_FORGE_TOKEN', nil)
|
|
285
|
+
prefix = forge_token ? 'puppetcore' : 'puppet'
|
|
286
|
+
nightly = options[:nightly] && forge_token
|
|
287
|
+
Action.warning('--nightly ignored: PUPPET_FORGE_TOKEN is not set, falling back to public puppet collection') \
|
|
288
|
+
if options[:nightly] && !forge_token
|
|
289
|
+
group = nightly ? "#{prefix}#{version}-nightly" : "#{prefix}#{version}"
|
|
290
290
|
matrix[:collection] << if options[:latest_agent] && collection['puppet'] != 'nightly'
|
|
291
291
|
require 'net/http'
|
|
292
292
|
require 'json'
|
data/spec/exe/fake_metadata.json
CHANGED
|
@@ -25,6 +25,8 @@ RSpec.describe 'matrix_from_metadata_v2' do
|
|
|
25
25
|
'"platforms":[',
|
|
26
26
|
'{"label":"AmazonLinux-2","provider":"docker","image":"litmusimage/amazonlinux:2"},',
|
|
27
27
|
'{"label":"AmazonLinux-2023","provider":"docker","image":"litmusimage/amazonlinux:2023"},',
|
|
28
|
+
'{"label":"RedHat-10","provider":"provision_service","image":"rhel-10"},',
|
|
29
|
+
'{"label":"RedHat-10-arm","provider":"provision_service","image":"rhel-10-arm64"},',
|
|
28
30
|
'{"label":"RedHat-8","provider":"provision_service","image":"rhel-8"},',
|
|
29
31
|
'{"label":"RedHat-9","provider":"provision_service","image":"rhel-9"},',
|
|
30
32
|
'{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
|
|
@@ -41,7 +43,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
|
|
|
41
43
|
expect(github_output_content).to include(
|
|
42
44
|
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
|
|
43
45
|
)
|
|
44
|
-
expect(result.stdout).to include("Created matrix with
|
|
46
|
+
expect(result.stdout).to include("Created matrix with 22 cells:\n - Acceptance Test Cells: 20\n - Spec Test Cells: 2")
|
|
45
47
|
end
|
|
46
48
|
end
|
|
47
49
|
|
|
@@ -68,6 +70,8 @@ RSpec.describe 'matrix_from_metadata_v2' do
|
|
|
68
70
|
'"platforms":[',
|
|
69
71
|
'{"label":"AmazonLinux-2","provider":"docker","image":"litmusimage/amazonlinux:2"},',
|
|
70
72
|
'{"label":"AmazonLinux-2023","provider":"docker","image":"litmusimage/amazonlinux:2023"},',
|
|
73
|
+
'{"label":"RedHat-10","provider":"provision_service","image":"rhel-10"},',
|
|
74
|
+
'{"label":"RedHat-10-arm","provider":"provision_service","image":"rhel-10-arm64"},',
|
|
71
75
|
'{"label":"RedHat-8","provider":"provision_service","image":"rhel-8"},',
|
|
72
76
|
'{"label":"RedHat-9","provider":"provision_service","image":"rhel-9"},',
|
|
73
77
|
'{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
|
|
@@ -83,7 +87,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
|
|
|
83
87
|
expect(github_output_content).to include(
|
|
84
88
|
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
|
|
85
89
|
)
|
|
86
|
-
expect(result.stdout).to include("Created matrix with
|
|
90
|
+
expect(result.stdout).to include("Created matrix with 20 cells:\n - Acceptance Test Cells: 18\n - Spec Test Cells: 2")
|
|
87
91
|
end
|
|
88
92
|
end
|
|
89
93
|
|
|
@@ -100,7 +104,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
|
|
|
100
104
|
expect(result.status_code).to eq 0
|
|
101
105
|
end
|
|
102
106
|
|
|
103
|
-
it 'generates the matrix without excluded platforms' do
|
|
107
|
+
it 'generates the matrix without excluded platforms' do # rubocop:disable RSpec/ExampleLength
|
|
104
108
|
expect(result.stdout).to include('::warning::Cannot find image for Ubuntu-14.04')
|
|
105
109
|
expect(result.stdout).to include('::warning::Cannot find image for CentOS-6')
|
|
106
110
|
expect(result.stdout).to include('::warning::Ubuntu-18.04 was excluded from testing')
|
|
@@ -110,6 +114,8 @@ RSpec.describe 'matrix_from_metadata_v2' do
|
|
|
110
114
|
[
|
|
111
115
|
'matrix={',
|
|
112
116
|
'"platforms":[',
|
|
117
|
+
'{"label":"RedHat-10","provider":"provision_service","image":"rhel-10"},',
|
|
118
|
+
'{"label":"RedHat-10-arm","provider":"provision_service","image":"rhel-10-arm64"},',
|
|
113
119
|
'{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
|
|
114
120
|
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","image":"ubuntu-2204-lts-arm64"}',
|
|
115
121
|
'],',
|
|
@@ -122,7 +128,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
|
|
|
122
128
|
expect(github_output_content).to include(
|
|
123
129
|
'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
|
|
124
130
|
)
|
|
125
|
-
expect(result.stdout).to include("Created matrix with
|
|
131
|
+
expect(result.stdout).to include("Created matrix with 10 cells:\n - Acceptance Test Cells: 8\n - Spec Test Cells: 2")
|
|
126
132
|
end
|
|
127
133
|
end
|
|
128
134
|
|
|
@@ -58,6 +58,8 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
58
58
|
'{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},',
|
|
59
59
|
'{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},',
|
|
60
60
|
'{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},',
|
|
61
|
+
'{"label":"RedHat-10","provider":"provision_service","arch":"x86_64","image":"rhel-10","runner":"ubuntu-latest"},',
|
|
62
|
+
'{"label":"RedHat-10-arm","provider":"provision_service","arch":"arm","image":"rhel-10-arm64","runner":"ubuntu-latest"},',
|
|
61
63
|
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-22.04"},',
|
|
62
64
|
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},',
|
|
63
65
|
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
|
|
@@ -98,6 +100,8 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
98
100
|
'{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},',
|
|
99
101
|
'{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},',
|
|
100
102
|
'{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},',
|
|
103
|
+
'{"label":"RedHat-10","provider":"provision_service","arch":"x86_64","image":"rhel-10","runner":"ubuntu-latest"},',
|
|
104
|
+
'{"label":"RedHat-10-arm","provider":"provision_service","arch":"arm","image":"rhel-10-arm64","runner":"ubuntu-latest"},',
|
|
101
105
|
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-22.04"},',
|
|
102
106
|
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},',
|
|
103
107
|
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
|
|
@@ -138,6 +142,8 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
138
142
|
'{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},',
|
|
139
143
|
'{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},',
|
|
140
144
|
'{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},',
|
|
145
|
+
'{"label":"RedHat-10","provider":"provision_service","arch":"x86_64","image":"rhel-10","runner":"ubuntu-latest"},',
|
|
146
|
+
'{"label":"RedHat-10-arm","provider":"provision_service","arch":"arm","image":"rhel-10-arm64","runner":"ubuntu-latest"},',
|
|
141
147
|
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},',
|
|
142
148
|
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
|
|
143
149
|
'],',
|
|
@@ -167,8 +173,8 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
167
173
|
end
|
|
168
174
|
end
|
|
169
175
|
|
|
170
|
-
context 'with --platform-exclude "ubuntu-(18.04|22.04)" --platform-exclude "redhat-
|
|
171
|
-
let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--platform-exclude', '(amazonlinux|ubuntu)-(2|18.04|22.04|2023)', '--platform-exclude', 'redhat-
|
|
176
|
+
context 'with --platform-exclude "ubuntu-(18.04|22.04)" --platform-exclude "redhat-(8|9|10)"' do
|
|
177
|
+
let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--platform-exclude', '(amazonlinux|ubuntu)-(2|18.04|22.04|2023)', '--platform-exclude', 'redhat-(8|9|10)']) }
|
|
172
178
|
let(:matrix) do
|
|
173
179
|
[
|
|
174
180
|
'matrix={',
|
|
@@ -191,6 +197,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
191
197
|
'::warning::Ubuntu-14.04 no provisioner found',
|
|
192
198
|
'::notice::platform-exclude filtered RedHat-8',
|
|
193
199
|
'::notice::platform-exclude filtered RedHat-9',
|
|
200
|
+
'::notice::platform-exclude filtered RedHat-10',
|
|
194
201
|
'::notice::platform-exclude filtered Ubuntu-18.04',
|
|
195
202
|
'::notice::platform-exclude filtered Ubuntu-22.04',
|
|
196
203
|
'::group::matrix',
|
|
@@ -232,9 +239,8 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
232
239
|
'::group::matrix',
|
|
233
240
|
'::group::spec_matrix'
|
|
234
241
|
)
|
|
235
|
-
expect(github_output_content).to
|
|
236
|
-
|
|
237
|
-
)
|
|
242
|
+
expect(github_output_content).to match(/"collection":\["\d{4}\.\d\.\d-puppet_enterprise","\d{4}\.\d\.\d-puppet_enterprise","puppetcore8"/)
|
|
243
|
+
|
|
238
244
|
expect(github_output_content).to include(
|
|
239
245
|
'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
|
|
240
246
|
)
|
|
@@ -242,7 +248,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
242
248
|
end
|
|
243
249
|
|
|
244
250
|
context 'with argument --nightly' do
|
|
245
|
-
let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--nightly']) }
|
|
251
|
+
let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--nightly'], env: { 'PUPPET_FORGE_TOKEN' => 'fake_token' }) }
|
|
246
252
|
let(:matrix) do
|
|
247
253
|
[
|
|
248
254
|
'matrix={',
|
|
@@ -252,6 +258,8 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
252
258
|
'{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},',
|
|
253
259
|
'{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},',
|
|
254
260
|
'{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},',
|
|
261
|
+
'{"label":"RedHat-10","provider":"provision_service","arch":"x86_64","image":"rhel-10","runner":"ubuntu-latest"},',
|
|
262
|
+
'{"label":"RedHat-10-arm","provider":"provision_service","arch":"arm","image":"rhel-10-arm64","runner":"ubuntu-latest"},',
|
|
255
263
|
'{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-22.04"},',
|
|
256
264
|
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},',
|
|
257
265
|
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
|
|
@@ -281,6 +289,32 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
281
289
|
end
|
|
282
290
|
end
|
|
283
291
|
|
|
292
|
+
context 'with --nightly and no PUPPET_FORGE_TOKEN' do
|
|
293
|
+
let(:result) { run_matrix_from_metadata_v3(['--nightly'], env: { 'PUPPET_FORGE_TOKEN' => nil }) }
|
|
294
|
+
|
|
295
|
+
it 'run successfully' do
|
|
296
|
+
expect(result.status_code).to eq 0
|
|
297
|
+
end
|
|
298
|
+
|
|
299
|
+
it 'falls back to public puppet collection with a warning' do
|
|
300
|
+
expect(result.stdout).to include('--nightly ignored: PUPPET_FORGE_TOKEN is not set, falling back to public puppet collection')
|
|
301
|
+
expect(github_output_content).to include('"collection":["puppet8"]')
|
|
302
|
+
end
|
|
303
|
+
end
|
|
304
|
+
|
|
305
|
+
context 'without PUPPET_FORGE_TOKEN' do
|
|
306
|
+
let(:result) { run_matrix_from_metadata_v3(['--puppetlabs'], env: { 'PUPPET_FORGE_TOKEN' => nil }) }
|
|
307
|
+
|
|
308
|
+
it 'run successfully' do
|
|
309
|
+
expect(result.status_code).to eq 0
|
|
310
|
+
end
|
|
311
|
+
|
|
312
|
+
it 'falls back to public puppet collection' do
|
|
313
|
+
result
|
|
314
|
+
expect(github_output_content).to include('"collection":["puppet8"]')
|
|
315
|
+
end
|
|
316
|
+
end
|
|
317
|
+
|
|
284
318
|
context 'with argument --latest-agent' do
|
|
285
319
|
let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--latest-agent']) }
|
|
286
320
|
|
|
@@ -296,6 +330,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
|
|
|
296
330
|
'::group::spec_matrix'
|
|
297
331
|
)
|
|
298
332
|
expect(github_output_content).to match(/{"collection":"puppetcore8","version":"\d+\.\d+\.\d+"}/)
|
|
333
|
+
|
|
299
334
|
expect(github_output_content).to include(
|
|
300
335
|
'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
|
|
301
336
|
)
|
data/spec/spec_helper.rb
CHANGED
|
@@ -38,14 +38,14 @@ def run_matrix_from_metadata_v2(options = {})
|
|
|
38
38
|
)
|
|
39
39
|
end
|
|
40
40
|
|
|
41
|
-
def run_matrix_from_metadata_v3(options = [])
|
|
41
|
+
def run_matrix_from_metadata_v3(options = [], env: {})
|
|
42
42
|
command = %w[bundle exec ./exe/matrix_from_metadata_v3]
|
|
43
43
|
unless options.include? '--metadata'
|
|
44
44
|
options << '--metadata'
|
|
45
45
|
options << File.join(File.dirname(__FILE__), 'exe', 'fake_metadata.json')
|
|
46
46
|
end
|
|
47
47
|
command += options
|
|
48
|
-
result = Open3.capture3(*command)
|
|
48
|
+
result = Open3.capture3(env, *command)
|
|
49
49
|
OpenStruct.new(
|
|
50
50
|
stdout: result[0],
|
|
51
51
|
stderr: result[1],
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: puppet_litmus
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.6.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet, Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2026-05-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bolt
|
|
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
184
184
|
- !ruby/object:Gem::Version
|
|
185
185
|
version: '0'
|
|
186
186
|
requirements: []
|
|
187
|
-
rubygems_version: 3.
|
|
187
|
+
rubygems_version: 3.4.19
|
|
188
188
|
signing_key:
|
|
189
189
|
specification_version: 4
|
|
190
190
|
summary: Providing a simple command line tool for puppet content creators, to enable
|