Skip to content

Commit 3425bb2

Browse files
committed
(maint) Enable puppetserver 8 nightlies
Nightlies for puppetserver 8 have started to ship as of yesterday. This commit enables the puppet7 to puppet8 upgrade test to use puppetserver 8 nightlies.
1 parent c511041 commit 3425bb2

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

acceptance/helpers.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ def require_master_collection(args)
8787
if args.is_a?(Symbol)
8888
collection = args.to_s
8989

90-
# Dirty, temporary workaround for when we have puppet8 agent nightlies but not server nightlies
91-
# Once we have puppet8 server releases, remove the second conditional
92-
unless collection.include?(server_collection) || collection == 'puppet8-nightly'
90+
unless collection.include?(server_collection)
9391
skip_test(msg_prefix + "\nThis test requires a puppetserver from the #{collection} collection. Skipping the test ...")
9492
end
9593

acceptance/pre_suite/00_master_setup.rb

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,7 @@
3030

3131
step 'Install puppetserver' do
3232
# puppetserver is distributed in "release streams" instead of collections.
33-
34-
# Dirty, temporary workaround for when we have puppet8 agent nightlies but not server nightlies
35-
# Once we have puppet8 server releases, pare down to just what's in the else statement
36-
opts = if install_options[:puppet_collection].include?('nightly')
37-
{ release_stream: 'puppet7' }
38-
else
39-
{ release_stream: install_options[:puppet_collection] }
40-
end
33+
opts = { release_stream: install_options[:puppet_collection] }
4134

4235
install_puppetserver_on(master, opts)
4336

0 commit comments

Comments
 (0)