beaker 7.4.1 → 7.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88dbc0a39e7bec5a8b9b3a5b49ec0c38d89acf20509254041704824d01c67b2
-  data.tar.gz: 33fe3dbdfd1a1597492d20b1b01a3055e01cbff7d4cdc15b244f6ef4db864c15
+  metadata.gz: a103ea29759ffc3723d465fd0f0f06803701524d48b2c602a87a1a10a59cc5ed
+  data.tar.gz: 79ce1b1f90e3e435c36cb48c3f2c93f36e2a0506507bdd6fc2d2d22bebc71084
 SHA512:
-  metadata.gz: 645d419b3a2926cefc9a46880ca983edcb20b63e0794e3296eb77e8e8ff707ffc71afb9afd6f1a3c29e1348b60c27a177e9be0d06223769c1750715f7a89fa40
-  data.tar.gz: 7e4de01ddfeb8a4d851c40adf4e0938001c90f9dbc55b44eb28401964365631beb77adf54067853ade8e36a648b0eb3db4ac8c7b36288dd9c8d130bd3a6b7828
+  metadata.gz: 25ce805f5b3303d8a8cc828b11652fd19fb47fd36c33795ec2df9a99e7eecce41402bc6d7fc118050d5265bad087a42459fab783e0061c18c622d7a27f333bfc
+  data.tar.gz: d41c8a37470b9f5c4e6440437e9f2643b96410d0a4010aaba6a8549337ea0867cb53992b74a03d44987cdce910e6215318e3a9dd25d2a02432fd39819adce188

data/.github/workflows/release.yml

@@ -15,16 +15,16 @@ jobs:
     name: Build the gem
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Install Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
         with:
           ruby-version: 'ruby'
       - name: Build gem
         shell: bash
         run: gem build --verbose *.gemspec
       - name: Upload gem to GitHub cache
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: gem-artifact
           path: '*.gem'
@@ -39,7 +39,7 @@ jobs:
       contents: write # clone repo and create release
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: gem-artifact
       - name: Create Release
@@ -56,7 +56,7 @@ jobs:
       packages: write # publish to rubygems.pkg.github.com
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: gem-artifact
       - name: Publish gem to GitHub packages
@@ -73,10 +73,10 @@ jobs:
       id-token: write # rubygems.org authentication
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: gem-artifact
-      - uses: rubygems/configure-rubygems-credentials@v1.0.0
+      - uses: rubygems/configure-rubygems-credentials@dc5a8d8553e6ee01fc26761a49e99e733d17954a # v2.1.0
       - name: Publish gem to rubygems.org
         shell: bash
         run: gem push *.gem
@@ -92,11 +92,11 @@ jobs:
       - release-to-rubygems
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: gem-artifact
       - name: Install Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
         with:
           ruby-version: 'ruby'
       - name: Wait for release to propagate

data/.github/workflows/test.yml

@@ -16,16 +16,16 @@ jobs:
     outputs:
       ruby: ${{ steps.ruby.outputs.versions }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Install Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
         with:
           ruby-version: '4.0'
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
       - id: ruby
-        uses: voxpupuli/ruby-version@v2
+        uses: voxpupuli/ruby-version@656370e339050da63b86b1c631f5f88a3f4c0803 # 1.0.1
 
   test:
     name: "Ruby ${{ matrix.ruby }}"
@@ -38,9 +38,9 @@ jobs:
     env:
       BEAKER_HYPERVISOR: docker
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Install Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

data/CHANGELOG.md

@@ -2,9 +2,30 @@
 
 All notable changes to this project will be documented in this file.
 
-## [7.4.1](https://github.com/voxpupuli/beaker/tree/7.4.1) (2026-01-31)
+## [7.6.0](https://github.com/voxpupuli/beaker/tree/7.6.0) (2026-07-13)
 
-[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.4.0...7.4.1)
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.5.0...7.6.0)
+
+**Implemented enhancements:**
+
+- Update puppet\_configprint helper [\#2008](https://github.com/voxpupuli/beaker/pull/2008) ([Sharpie](https://github.com/Sharpie))
+
+**Fixed bugs:**
+
+- Ensure verify\_host\_key is symbolized before use [\#2010](https://github.com/voxpupuli/beaker/pull/2010) ([Sharpie](https://github.com/Sharpie))
+- Ensure .beaker dir exists before writing options [\#2009](https://github.com/voxpupuli/beaker/pull/2009) ([Sharpie](https://github.com/Sharpie))
+
+## [v7.5.0](https://github.com/voxpupuli/beaker/tree/v7.5.0) (2026-07-01)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.4.1...v7.5.0)
+
+**Implemented enhancements:**
+
+- \(maint\) Add Ubuntu 26.04 \(resolute\) codename mapping [\#2002](https://github.com/voxpupuli/beaker/pull/2002) ([SugatD](https://github.com/SugatD))
+
+## [v7.4.1](https://github.com/voxpupuli/beaker/tree/v7.4.1) (2026-01-31)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.4.0...v7.4.1)
 
 **Fixed bugs:**
 

data/Gemfile

@@ -9,7 +9,5 @@ end
 
 group :release, optional: true do
   gem 'faraday-retry', '~> 2.1', require: false
-  # fix from smortex to properly process commits that exist in multiple branches
-  gem 'github_changelog_generator', github: 'smortex/github-changelog-generator', branch: 'avoid-processing-a-single-commit-multiple-time', require: false
-  # gem 'github_changelog_generator', '~> 1.16.4', require: false
+  gem 'github_changelog_generator', '~> 1.18', require: false
 end

data/beaker.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-github', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.1.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.2.0'
 
   # Run time dependencies
   # Required for Ruby 3.3+ support

data/lib/beaker/host.rb

@@ -21,15 +21,15 @@ module Beaker
     class RebootFailure < CommandFailure; end
     class RebootWarning < StandardError; end
 
-    # This class provides array syntax for using puppet --configprint on a host
+    # This class provides array syntax for using "puppet config print" on a host
     class PuppetConfigReader
-      def initialize(host, command)
+      def initialize(host, section)
         @host = host
-        @command = command
+        @section = section
       end
 
       def has_key?(k)
-        cmd = PuppetCommand.new(@command, '--configprint all')
+        cmd = PuppetCommand.new('config', 'print', "--section=#{@section}")
         keys = @host.exec(cmd).stdout.split("\n").collect do |x|
           x[/^[^\s]+/]
         end
@@ -37,7 +37,7 @@ module Beaker
       end
 
       def [](k)
-        cmd = PuppetCommand.new(@command, "--configprint #{k}")
+        cmd = PuppetCommand.new('config', 'print', "--section=#{@section}", k)
         @host.exec(cmd).stdout.strip
       end
     end
@@ -128,10 +128,11 @@ module Beaker
 
     # Returning our PuppetConfigReader here allows users of the Host
     # class to do things like `host.puppet['vardir']` to query the
-    # 'main' section or, if they want the configuration for a
-    # particular run type, `host.puppet('agent')['vardir']`
-    def puppet_configprint(command = 'agent')
-      PuppetConfigReader.new(self, command)
+    # 'agent' section or, if they want the configuration for a
+    # particular run type, `host.puppet('main')['vardir']`, or
+    # `host.puppet('server')['hostcert']`
+    def puppet_configprint(section = 'agent')
+      PuppetConfigReader.new(self, section)
     end
     alias puppet puppet_configprint
 

data/lib/beaker/platform.rb

@@ -11,7 +11,8 @@ module Beaker
                      "bookworm" => "12",
                      "bullseye" => "11",
                      "buster" => "10", },
-        :ubuntu => { "noble" => "2404",
+        :ubuntu => { "resolute" => "2604",
+                     "noble" => "2404",
                      "jammy" => "2204",
                      "focal" => "2004",
                      "bionic" => "1804", },

data/lib/beaker/ssh_connection.rb

@@ -76,6 +76,12 @@ module Beaker
           end
         end
 
+        # Beaker stringifies options when storing them in a config file.
+        # net-ssh raises a fatal error if it does not get a symbol.
+        if ssh_opts[:verify_host_key].is_a?(String)
+          ssh_opts[:verify_host_key] = ssh_opts[:verify_host_key].to_sym
+        end
+
         Net::SSH.start(host, user, ssh_opts)
       rescue *RETRYABLE_EXCEPTIONS => e
         if try <= max_connection_tries

data/lib/beaker/subcommand.rb

@@ -84,6 +84,7 @@ module Beaker
       options_to_write = SubcommandUtil.sanitize_options_for_save(@cli.configured_options)
 
       @cli.logger.notify 'Writing configured options to disk'
+      FileUtils.mkdir_p(SubcommandUtil::CONFIG_DIR)
       SubcommandUtil::SUBCOMMAND_OPTIONS.write(options_to_write.to_yaml)
       @cli.logger.notify "Options written to #{SubcommandUtil::SUBCOMMAND_OPTIONS}"
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '7.4.1'
+    STRING = '7.6.0'
   end
 end

data/spec/beaker/platform_spec.rb

@@ -78,6 +78,11 @@ module Beaker
         expect(platform.with_version_codename).to be === 'debian-bullseye-xxx'
       end
 
+      it "can convert ubuntu-2604-xxx to ubuntu-resolute-xxx" do
+        @name = 'ubuntu-2604-xxx'
+        expect(platform.with_version_codename).to be === 'ubuntu-resolute-xxx'
+      end
+
       it "can convert ubuntu-2404-xxx to ubuntu-noble-xxx" do
         @name = 'ubuntu-2404-xxx'
         expect(platform.with_version_codename).to be === 'ubuntu-noble-xxx'
@@ -122,6 +127,11 @@ module Beaker
         expect(platform.with_version_number).to be === 'ubuntu-2204-xxx'
       end
 
+      it "can convert ubuntu-resolute-xxx to ubuntu-2604-xxx" do
+        @name = 'ubuntu-resolute-xxx'
+        expect(platform.with_version_number).to be === 'ubuntu-2604-xxx'
+      end
+
       %w[centos redhat].each do |p|
         it "leaves #{p}-7-xxx alone" do
           @name = "#{p}-7-xxx"

data/spec/beaker/shared/host_manager_spec.rb

@@ -150,7 +150,6 @@ module Beaker
 
         it "does not run in parallel if there is only 1 host in the array" do
           myhosts = host_handler.run_block_on([hosts[0]], nil, { :run_in_parallel => true }) do |host|
-            puts host
             host
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 7.4.1
+  version: 7.6.0
 platform: ruby
 authors:
 - Puppet
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -754,7 +754,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []