Skip to content

Commit e35cea2

Browse files
Merge pull request #592 from puppetlabs/puppetcore_nightly
(FEAT) Update matrix_from_metadata_v3 to target puppetcore nightly
2 parents 72d0f1d + 61296ed commit e35cea2

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

exe/matrix_from_metadata_v3

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ options[:metadata]['requirements']&.each do |req|
260260
# This assumes that such a boundary will always allow the latest actually existing puppet version of a release stream, trading off simplicity vs accuracy here.
261261
next unless gem_req.satisfied_by?(Gem::Version.new("#{collection['puppet'].to_i}.9999"))
262262

263-
matrix[:collection] << "puppetcore#{collection['puppet'].to_i}"
263+
version = collection['puppet'].to_i
264+
prefix = 'puppetcore'
265+
matrix[:collection] << "#{prefix}#{version}-nightly"
264266

265267
spec_matrix[:include] << {
266268
puppet_version: "~> #{collection['puppet']}",

spec/exe/matrix_from_metadata_v3_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"}',
3131
'],',
3232
'"collection":[',
33-
'"puppetcore8"',
33+
'"puppetcore8-nightly"',
3434
']',
3535
'}'
3636
].join
@@ -63,7 +63,7 @@
6363
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
6464
'],',
6565
'"collection":[',
66-
'"puppetcore8"',
66+
'"puppetcore8-nightly"',
6767
']',
6868
'}'
6969
].join
@@ -103,7 +103,7 @@
103103
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
104104
'],',
105105
'"collection":[',
106-
'"puppetcore8"',
106+
'"puppetcore8-nightly"',
107107
']',
108108
'}'
109109
].join
@@ -142,7 +142,7 @@
142142
'{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
143143
'],',
144144
'"collection":[',
145-
'"puppetcore8"',
145+
'"puppetcore8-nightly"',
146146
']',
147147
'}'
148148
].join
@@ -175,7 +175,7 @@
175175
'"platforms":[',
176176
'],',
177177
'"collection":[',
178-
'"puppetcore8"',
178+
'"puppetcore8-nightly"',
179179
']',
180180
'}'
181181
].join
@@ -215,7 +215,7 @@
215215
'{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"}',
216216
'],',
217217
'"collection":[',
218-
'"puppetcore8"',
218+
'"puppetcore8-nightly"',
219219
']',
220220
'}'
221221
].join
@@ -233,7 +233,7 @@
233233
'::group::spec_matrix'
234234
)
235235
expect(github_output_content).to include(
236-
'"collection":["2023.8.4-puppet_enterprise","2021.7.9-puppet_enterprise","puppetcore8"'
236+
'"collection":["2023.8.4-puppet_enterprise","2021.7.9-puppet_enterprise","puppetcore8-nightly"'
237237
)
238238
expect(github_output_content).to include(
239239
'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'

0 commit comments

Comments
 (0)