Skip to content

(PA-8998) Require a puppet9 master for the puppet8->9 upgrade test #847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshcooper merged 1 commit into from
Aug 19, 2026
Merged

(PA-8998) Require a puppet9 master for the puppet8->9 upgrade test #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions acceptance/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,9 @@ task :ci do
Rake.application['prepare'].invoke
# UPGRADE_TARGET_COLLECTION selects which upgrade test to run, defaulting to
# MASTER_COLLECTION. Override when the master must be on an older stream than
# the upgrade target — e.g. testing puppet8→9 agent upgrades with a puppet8
# master because puppetserver-9 nightlies aren't yet published. Treat blank
# env values as unset; an empty string is truthy in Ruby and would otherwise
# mask the MASTER_COLLECTION fallback.
# the upgrade target -- e.g. to deliberately test a puppet9 agent upgrade
# against an older master. Treat blank env values as unset; an empty string
# is truthy in Ruby and would otherwise mask the MASTER_COLLECTION fallback.
upgrade_target = ENV['UPGRADE_TARGET_COLLECTION'].to_s.strip
upgrade_target = ENV['MASTER_COLLECTION'].to_s.strip if upgrade_target.empty?
case upgrade_target
Expand Down
16 changes: 11 additions & 5 deletions acceptance/tests/test_upgrade_puppet8_to_puppet9.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,17 @@
# Tests FOSS upgrades from the latest Puppet 8 (the puppet8-nightly collection)
# to the latest puppet9-nightly build.
test_name 'puppet_agent class: Upgrade agents from puppet8 to puppet9' do
# puppet9-nightly puppetserver may not yet be published; accept a puppet8 or
# newer master so the test can run while agents are upgraded to puppet9.
# puppet_collection_for(:puppetserver, ...) returns bare 'puppet8'/'puppet9'
# (no -nightly suffix), so compare against the bare collection name.
require_master_collection min: 'puppet8'
# puppetserver 9-nightly builds are now available (PA-8998), so require an
# actual puppet9 master to properly exercise the upgrade instead of falling
# back to a puppet8 master. puppet_collection_for(:puppetserver, ...) returns
# bare 'puppet8'/'puppet9' (no -nightly suffix), so compare against the bare
# collection name.
#
# Note puppetserver 9-nightly platform coverage differs from puppet8-nightly
# (some platforms were dropped, others added) -- if the master platform in
# hosts.yaml changes, confirm a puppetserver9-nightly build still exists for
# it before relying on this.
require_master_collection min: 'puppet9'
exclude_pe_upgrade_platforms

# Both passing-agent-SHAs lookups have to succeed; if VPN/network flaps and
Expand Down
Loading