Skip to content

(MODULES-12006) pdk update to pdk-templates main (8ca954f) - #1094

Merged
imaqsood merged 3 commits into
mainfrom
MODULES-12006-sa
Nov 19, 2026
Merged

imaqsood merged 3 commits into
mainfrom
MODULES-12006-sa

Conversation

@imaqsood

Copy link
Copy Markdown
Contributor

Summary

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

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

Commits

  • 81faa45 (MODULES-12006) Update .sync.yml for pdk-templates main
  • 67b4620 (MODULES-12006) Fix rubocop offenses under the template rubocop profile
  • e45db64 (MODULES-12006) pdk update to pdk-templates main (8ca954f)

Hand edits kept in .sync.yml

  • puppet-lint check strict_indent stays disabled (was in Rakefile)
  • puppet-lint check exec_idempotency stays disabled (was in Rakefile)
  • puppet-lint check params_not_optional_with_undef stays disabled (was in Rakefile)

Hand edits dropped

  • 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): real, 0 passed, 0 failed

🤖 Generated with Claude Code

imaqsood and others added 3 commits November 12, 2026 16:37
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 a review from a team as a code owner November 12, 2026 11:29

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

I checked the parts a template update can quietly break:

  • The acceptance flags in ci.yml and nightly.yml match main exactly (including --provision-prefer provision_service, --provision-exclude docker and --arch-exclude arm).
  • The hand-disabled puppet-lint checks carry over, and .rubocop.yml inherits the regenerated .rubocop_todo.yml.
  • The pdk update commit only touches template-managed files. Each hand edit listed as dropped is replaced by the template's own equivalent (puppetcore gem-source logic, per-source gem pins, conditional syntax-task requires).
  • CI is green, including the Puppet 9 / Ruby 4 spec lane and the static checks, and the branch is up to date with main.

The autocorrect commit only touches specs: trailing commas, plus a <<- heredoc in compose_v3_spec.rb becoming <<~ with re-indented content that strips back to the same YAML.

Approving. I'll leave the merge to you.

@imaqsood
imaqsood merged commit 8b12e7f into main Nov 19, 2026
38 of 45 checks passed
@imaqsood
imaqsood deleted the MODULES-12006-sa branch November 19, 2026 02:29
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