Skip to content

(MODULES-12011) pdk update to pdk-templates main (8ca954f) - #639

Open
imaqsood wants to merge 3 commits into
mainfrom
MODULES-12011-sa
Open

imaqsood wants to merge 3 commits into
mainfrom
MODULES-12011-sa

Conversation

@imaqsood

Copy link
Copy Markdown
Contributor

Summary

pdk update of puppetlabs/puppetlabs-java to pdk-templates main (8ca954f), with PDK 4.0.1.

Jira: https://perforce.atlassian.net/browse/MODULES-12011 (epic MODULES-11997)

Commits

  • 1c50bcf (MODULES-12011) Update .sync.yml for pdk-templates main
  • cc98da2 (MODULES-12011) Fix rubocop offenses under the template rubocop profile
  • 6cb6562 (MODULES-12011) pdk update to pdk-templates main (8ca954f)

Hand edits kept in .sync.yml

  • ci.yml acceptance flags: --arch-exclude arm, --collection-platform-exclude 9:redhat-7, --collection-platform-exclude 9:centos-7, --collection-platform-exclude 9:oraclelinux-7, --collection-platform-exclude 9:debian-10, --collection-platform-exclude 9:ubuntu-18.04, --collection-platform-exclude 9:ubuntu-20.04
  • nightly.yml acceptance flags: --arch-exclude arm, --collection-platform-exclude 9:redhat-7, --collection-platform-exclude 9:centos-7, --collection-platform-exclude 9:oraclelinux-7, --collection-platform-exclude 9:debian-10, --collection-platform-exclude 9:ubuntu-18.04, --collection-platform-exclude 9:ubuntu-20.04
  • puppet-lint check strict_indent stays disabled (was in Rakefile)

Hand edits dropped

  • ci.yml: additional_packages: "libcurl4-openssl-dev" (the template Gemfile resolves bolt 5 / faraday 2 without patron)
  • ci.yml: ruby_version: "3.2" (module_ci / module_acceptance default)
  • nightly.yml: additional_packages: "libcurl4-openssl-dev" (the template Gemfile resolves bolt 5 / faraday 2 without patron)
  • nightly.yml: ruby_version: "3.2" (module_ci / module_acceptance default)
  • Gemfile gem "voxpupuli-puppet-lint-plugins", '~> 7.0', require: false (template main's pin/condition for voxpupuli-puppet-lint-plugins)
  • Gemfile gem "puppetlabs_spec_helper", '~> 9.0', require: false (template main's pin/condition for puppetlabs_spec_helper)
  • Rakefile: require 'puppetlabs-syntax/tasks/puppetlabs-syntax' (template main requires puppetlabs-syntax when puppetlabs_spec_helper 9 loads it)

Tests

cat-module (static, unit; full suite): pass, 426 passed, 0 failed

🤖 Generated with Claude Code

imaqsood and others added 3 commits November 13, 2026 10:47
Prepare .sync.yml for pdk update to pdk-templates main (8ca954f):
set the hand edits to pdk-managed files that are still needed, so the
template renders them, and drop settings main makes obsolete (the PR
body lists each one kept or dropped).

Co-Authored-By: Claude <noreply@anthropic.com>
Safe autocorrect (rubocop --autocorrect) of the offenses the pdk-templates
main (8ca954f) rubocop profile adds, so the pdk update commit does
not park them in .rubocop_todo.yml. Safe cops only: no behaviour change.

Co-Authored-By: Claude <noreply@anthropic.com>
Run pdk update (PDK 4.0.1) against pdk-templates main at 8ca954f.
Pure pdk output, plus .rubocop_todo.yml regenerated with
`rubocop --auto-gen-config --no-exclude-limit` (kept as is when only its
header would change).

Co-Authored-By: Claude <noreply@anthropic.com>
@imaqsood
imaqsood requested review from a team and bastelfreak as code owners November 13, 2026 05:40

@span786 span786 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.

Thanks @imaqsood, this looks good. It's the same shape as waves 1 and 2.

I checked the parts a template update can quietly break. The .sync.yml acceptance_flags reproduce the Puppet 9 excludes from main exactly in both workflows, including --arch-exclude arm. The disabled puppet-lint checks carry over (strict_indent still disabled). .rubocop.yml inherits the regenerated .rubocop_todo.yml. Dropping ruby_version: "3.2" matches the shared workflows' default. Dropping additional_packages: libcurl4-openssl-dev is backed by the Puppet 9 / Ruby 4 spec lane passing without it: bolt now comes from puppetcore, so patron no longer needs building. CI is green, including that lane and the static/syntax checks, and the branch is up to date with main.

The safe-autocorrect commit is trailing commas in specs plus File.dirname(path, 3) in java_default_home. That form needs Ruby ≥ 3.1, which is fine given metadata.json requires Puppet ≥ 8 (agent Ruby 3.2+), and I confirmed it matches the nested dirname calls.

Non-blocking: the Rakefile loses the comment explaining why strict_indent is disabled (the 3.x vs 5.x indentation conflict, MODULES-11700). The .sync.yml comment now only says it was disabled by hand. Worth adding the reason or ticket there in a later wave so the next update doesn't drop it as unexplained.

Approving.

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