Skip to content

(PA-7897) Update to pdk-templates 3.6.1.1#825

Merged
mhashizume merged 2 commits into
mainfrom
pdk-template-update-7897
Apr 23, 2026
Merged

(PA-7897) Update to pdk-templates 3.6.1.1#825
mhashizume merged 2 commits into
mainfrom
pdk-template-update-7897

Conversation

@joshcooper

@joshcooper joshcooper commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

Blocked on #822

  • bumps rubocop to 1.73.x and updates rubocop.yml based on ruby 3.1 target version.

  • If PUPPET_FORGE_TOKEN env variable is defined, install bolt dependency from puppetcore rubygem source. BOLT_GEM_VERSION can also be used to constrain the gem, like PUPPET_GEM_VERSION.

  • puppet_litmus 1.6.1 added a minimum bolt 4 requirement. Exclude 1.6.1 until we're ready for bolt 4 in a separate ticket.

  • drops orchestrator_client pin

  • disable Style/FileNull as it breaks tests on windows

  • Fixes "Could not retrieve fact networking.ip" warning

Also verified puppetcore workflow works:

❯ export BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM="forge-key:XXX"
❯ bundle install
Fetching gem metadata from https://rubygems-puppetcore.puppet.com/..
Fetching gem metadata from https://rubygems.org/......
Resolving dependencies...
Fetching bolt 5.0.1
Installing bolt 5.0.1
Fetching puppet_litmus 2.4.2
Installing puppet_litmus 2.4.2
Bundle complete! 39 Gemfile dependencies, 217 gems now installed.
Use `bundle info [gemname]` to see where a bundled gem is installed.
1 installed gem you directly depend on is looking for funding.
  Run `bundle fund` for details

❯ bundle info bolt       
  * bolt (5.0.1)
	Summary: Execute commands remotely over SSH and WinRM
	Homepage: https://github.com/puppetlabs/bolt-private
	Path: /home/josh/.rbenv/versions/3.2.10/lib/ruby/gems/3.2.0/gems/bolt-5.0.1
	Reverse Dependencies: 
		puppet_litmus (2.4.2) depends on bolt (>= 4.0, < 6.0)

❯ bundle info puppet
  * puppet (8.18.0)
	Summary: Puppet, an automated configuration management tool
	Homepage: https://github.com/puppetlabs/puppet-private
	Path: /home/josh/.rbenv/versions/3.2.10/lib/ruby/gems/3.2.0/gems/puppet-8.18.0
	Reverse Dependencies: 
		bolt (5.0.1) depends on puppet (~> 8.11)
		puppet-syntax (4.1.1) depends on puppet (>= 7, < 9)

@joshcooper joshcooper requested review from a team and bastelfreak as code owners April 22, 2026 18:21
@joshcooper joshcooper marked this pull request as draft April 22, 2026 18:21
@joshcooper joshcooper force-pushed the pdk-template-update-7897 branch from 2ebd257 to 996dea9 Compare April 22, 2026 18:40
Comment thread spec/unit/facter/settings_spec.rb Outdated
Notable pdk template changes:

* bumps rubocop to 1.73.x and updates rubocop.yml based on ruby 3.1 target
  version.

* If PUPPET_FORGE_TOKEN env variable is defined, install bolt dependency from
  puppetcore rubygem source. BOLT_GEM_VERSION can also be used to constrain
  the gem, like PUPPET_GEM_VERSION.

* puppet_litmus 1.6.1 added a minimum bolt 4 requirement. Exclude 1.6.1 until
  we're ready for bolt 4 in a separate ticket.

* drops orchestrator_client pin

* disable Style/FileNull as it breaks tests on windows
Previously, rspec tests emitted a "Could not retrieve fact networking.ip". This
warning occurs because puppet's compiler adds "server facts" and rspec-puppet
replicates this behavior in server_facts_hash[1]. However, none of the
test infrastructure provided stubbed values.

We used to provide legacy facts for this, like "ipaddress", but they were
deleted in commit e22ccfe as part of the move to pdk templates 2.5

This commits adds default_facts.yml back using pdk update --template-ref=3.6.1.1
@joshcooper joshcooper force-pushed the pdk-template-update-7897 branch from 996dea9 to 75c8f8e Compare April 23, 2026 16:06
@joshcooper joshcooper marked this pull request as ready for review April 23, 2026 17:08
@mhashizume mhashizume merged commit 8130f1a into main Apr 23, 2026
13 of 19 checks passed
@mhashizume mhashizume deleted the pdk-template-update-7897 branch April 23, 2026 17:31
@mhashizume mhashizume added the enhancement New feature or request label May 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants