Skip to content

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

Merged
joshcooper merged 1 commit into
mainfrom
PA-8998-require-puppet9-master
Aug 19, 2026
Merged

joshcooper merged 1 commit into
mainfrom
PA-8998-require-puppet9-master

Conversation

@span786

@span786 span786 commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Resolves PA-8998.
  • test_upgrade_puppet8_to_puppet9.rb used require_master_collection min: 'puppet8' because puppet9-nightly puppetserver builds weren't reliably published yet, so the test accepted a puppet8-or-newer master while agents were upgraded to puppet9.
  • Per Josh Cooper's comment on PA-8998, puppetserver 9-nightly builds are now available. Verified directly against artifactory: puppetserver9-nightly is published for el/9/x86_64 (our master's platform).
  • Tightens the guard to require_master_collection min: 'puppet9' so the test properly exercises the upgrade against a real puppet9 master instead of silently falling back to puppet8.
  • Also updates the Rakefile's UPGRADE_TARGET_COLLECTION comment, which cited the same now-stale "puppetserver-9 nightlies aren't yet published" rationale.
  • Note (per the same comment): puppetserver 9-nightly platform coverage differs from 8.x (some platforms dropped, others added) — flagged in the updated code comment so this is checked again if the master platform in hosts.yaml ever changes.

Test plan

  • Confirmed puppetserver9-nightly exists for el-9-x86_64 (current master platform) on artifactory
  • ruby -c syntax check
  • Full test_upgrade_puppet8_to_puppet9.rb acceptance run with MASTER_COLLECTION=puppet9-nightly

@span786
span786 marked this pull request as ready for review August 6, 2026 14:25
@span786
span786 requested review from a team and bastelfreak as code owners August 6, 2026 14:25
puppetserver 9-nightly builds are now available (confirmed against
artifactory for el-9-x86_64, our master platform), so tighten
require_master_collection from 'min: puppet8' to 'min: puppet9' to
properly exercise the upgrade against a real puppet9 master instead of
falling back to a puppet8 one.

Also updates the now-stale Rakefile comment describing
UPGRADE_TARGET_COLLECTION, which cited the same "puppetserver-9
nightlies aren't yet published" rationale.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@span786
span786 force-pushed the PA-8998-require-puppet9-master branch from 6ef9164 to e859d9f Compare August 17, 2026 05:41

@joshcooper joshcooper left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requiring puppetserver 9 makes sense, but the end result is we're skipping the upgrade test:

01:39:37   glutamic-mentor.delivery.puppetlabs.net (glutamic-mentor.delivery.puppetlabs.net) 08:39:37$ puppetserver --version
...
01:39:37     puppetserver version: 8.9.11.SNAPSHOT.2026.08.10T1822
01:39:37   
01:39:37   glutamic-mentor.delivery.puppetlabs.net (glutamic-mentor.delivery.puppetlabs.net) executed in 0.37 seconds
01:39:37   
01:39:37   This master is set up with a puppetserver from the puppet8 collection. This test requires a puppetserver from the puppet9 collection or newer. Skipping the test ...

I'm thinking the pipeline needs to provision a puppet 9 stack to start with? Or will that be handled in a separate PR?

@span786

span786 commented Aug 18, 2026

Copy link
Copy Markdown
Contributor Author

This change required a change in the Pipeline as well, I opened a ci-job-configs PR https://github.com/puppetlabs/ci-job-configs/pull/10806

@span786
span786 requested a review from joshcooper August 18, 2026 16:50
@joshcooper
joshcooper merged commit 81ba06a into main Aug 19, 2026
9 checks passed
@joshcooper
joshcooper deleted the PA-8998-require-puppet9-master branch August 19, 2026 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants