beaker 7.8.1 → 7.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64705ecc4d36dfd8388655a14f0e35f897dbbe201fbe7e38c2303dadf4a29d9e
-  data.tar.gz: ba6c7790d328b191e9f3cdbee701d570f03fb0faf66f5eb05c9f622dd65d9e76
+  metadata.gz: 5455c2d1cebdb2d73661f32339bb96c2b47e6d8195e822e90f8a6ec7e70f3ebb
+  data.tar.gz: d6c85cc74414509a007961f62bdc42f693ad367119d8b4bd3ed241156fbe1216
 SHA512:
-  metadata.gz: 9d1d8a81da7ddc95cae0aee120d936fc5c433bb3eb7132d0f902a8fa35b0876c91495398abdba2a7cd37e230e8e1f788c2418383cf5665ecd59f417a4b400d25
-  data.tar.gz: 1926fe23cb90e9a2c8c93a8a8b4ff7fd44e79a273350b9bde338ef82032f6a6b073b4293a44534b83a4fde5d738a6eb963a49d9c3a69225ef164613004954dec
+  metadata.gz: 9b8930a7bbadf2a1d5e5849315b2d8821e5d11d3b29c0f156d2ad1267e14265df07c9309c6862c70cbdc810d7b07103a09754dd25f1b0c6c40a4c24b38ae554a
+  data.tar.gz: e8c5c06e24ceaf07cd795b3e817d7460a2be9451d3c264845173171d1c31eca05dcdf0f493bf916ec78f7a0bf835711c1284030f603e369bd16cdc74c9caf235

data/.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Ruby
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@bec3f19a76460dbe12f60def7d1a77585f07516c # v1.322.0
         with:
           ruby-version: 'ruby'
       - name: Build gem
@@ -96,7 +96,7 @@ jobs:
         with:
           name: gem-artifact
       - name: Install Ruby
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@bec3f19a76460dbe12f60def7d1a77585f07516c # v1.322.0
         with:
           ruby-version: 'ruby'
       - name: Wait for release to propagate

data/.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@bec3f19a76460dbe12f60def7d1a77585f07516c # v1.322.0
         with:
           ruby-version: '4.0'
           bundler-cache: true
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@bec3f19a76460dbe12f60def7d1a77585f07516c # v1.322.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

data/CHANGELOG.md

@@ -2,9 +2,28 @@
 
 All notable changes to this project will be documented in this file.
 
-## [7.8.1](https://github.com/voxpupuli/beaker/tree/7.8.1) (2026-09-04)
+## [7.8.3](https://github.com/voxpupuli/beaker/tree/7.8.3) (2026-09-17)
 
-[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.0...7.8.1)
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.2...7.8.3)
+
+**Fixed bugs:**
+
+- Fix Solaris sshd\_config editing in ssh\_permit\_user\_environment [\#2029](https://github.com/voxpupuli/beaker/pull/2029) ([shubhamshinde360](https://github.com/shubhamshinde360))
+
+## [v7.8.2](https://github.com/voxpupuli/beaker/tree/v7.8.2) (2026-09-09)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.1...v7.8.2)
+
+**Fixed bugs:**
+
+- Create root's dotfiles on EL 8+ hosts \(the other half of \#2033\) [\#2037](https://github.com/voxpupuli/beaker/pull/2037) ([silug](https://github.com/silug))
+- Fix NTP on Ubuntu 26.04 by using chrony [\#2036](https://github.com/voxpupuli/beaker/pull/2036) ([bwitt](https://github.com/bwitt))
+- Install iproute on EL 8+ hosts [\#2035](https://github.com/voxpupuli/beaker/pull/2035) ([silug](https://github.com/silug))
+- Fix Debian 13 NTP setup by using chrony [\#1996](https://github.com/voxpupuli/beaker/pull/1996) ([treydock](https://github.com/treydock))
+
+## [v7.8.1](https://github.com/voxpupuli/beaker/tree/v7.8.1) (2026-09-04)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.0...v7.8.1)
 
 **Fixed bugs:**
 

data/lib/beaker/host/unix/exec.rb

@@ -300,11 +300,13 @@ module Unix::Exec
   #   (from {#ssh_service_restart}).
   def ssh_permit_user_environment
     case self['platform']
-    when /amazon|debian|ubuntu|archlinux|el-|centos|fedora|redhat|oracle|scientific|opensuse|sles|solaris/
+    when /amazon|debian|ubuntu|archlinux|el-|centos|fedora|redhat|oracle|scientific|opensuse|sles/
       directory = tmpdir
       exec(Beaker::Command.new("sed -e 's/^PermitUserEnvironment .*/PermitUserEnvironment yes/' -e t -e '1s/^/PermitUserEnvironment yes\\n/' /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
       exec(Beaker::Command.new("echo '' >/etc/environment")) if self['platform'].include?('ubuntu-')
+    when /solaris/
+      exec(Beaker::Command.new("perl -i -0777 -pe 's/^#?PermitUserEnvironment\\b[^\\n]*/PermitUserEnvironment yes/m or s/\\z/PermitUserEnvironment yes\\n/' /etc/ssh/sshd_config"))
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), { :pty => true })
     else

data/lib/beaker/host_prebuilt_steps.rb

@@ -13,6 +13,13 @@ module Beaker
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
+    # Prefer the mechanism a booted host uses (the tmpfiles rule); fall back
+    # to copying the templates where systemd-tmpfiles is not available.
+    ROOT_DOTFILES_SYNC_CMD = 'if [ -f /usr/lib/tmpfiles.d/rootfiles.conf ] && command -v systemd-tmpfiles >/dev/null 2>&1; then ' \
+                             'systemd-tmpfiles --create rootfiles.conf; ' \
+                             'elif [ -d /usr/share/rootfiles ]; then ' \
+                             'for f in /usr/share/rootfiles/.[!.]*; do [ -e "/root/${f##*/}" ] || cp -p "$f" /root/; done; ' \
+                             'fi'
     ROOT_KEYS_SYNC_CMD = "curl -k -o - -L #{ROOT_KEYS_SCRIPT} | %s"
     ROOT_KEYS_SYNC_CMD_AIX = "curl --tlsv1 -o - -L #{ROOT_KEYS_SCRIPT} | %s"
 
@@ -72,11 +79,41 @@ module Beaker
       logger = opts[:logger]
       block_on host do |host|
         check_and_install_packages_if_needed(host, host_packages(host))
+        ensure_root_dotfiles(host)
       end
     rescue => e
       report_and_raise(logger, e, "validate")
     end
 
+    # Make sure root's shell dotfiles exist on EL 8+ and Fedora hosts.
+    #
+    # Since rootfiles 8.1-32 (EL 9+) and 9.0 (Fedora 43+), `/root/.bashrc`
+    # and friends are no longer shipped as regular files: they are %ghost
+    # entries that systemd-tmpfiles copies out of `/usr/share/rootfiles` at
+    # boot, per `/usr/lib/tmpfiles.d/rootfiles.conf`. Nothing else runs that
+    # rule -- the systemd package carries no tmpfiles file trigger -- so in a
+    # container, which is never booted, installing the package leaves /root
+    # without the dotfiles.
+    #
+    # That matters because a non-interactive bash started by sshd only
+    # sources `/etc/bashrc` (and from there `/etc/profile.d/*.sh`) through
+    # `~/.bashrc`. Without it, PATH additions made in profile.d, such as
+    # `/etc/profile.d/puppet-agent.sh`, never reach commands run over ssh.
+    #
+    # Apply the tmpfiles rule the way boot would, and fall back to copying
+    # the templates when systemd-tmpfiles is not installed. Either path only
+    # creates files that are missing, so this is a no-op on a booted host,
+    # on hosts whose rootfiles still ships the files directly (no rule and no
+    # `/usr/share/rootfiles`), and for any customised file already in /root.
+    #
+    # @param [Host] host Host to act on
+    def ensure_root_dotfiles(host)
+      platform = host['platform']
+      return unless (platform.variant == 'el' && platform.version.to_i >= 8) || platform.variant == 'fedora'
+
+      host.exec(Command.new(ROOT_DOTFILES_SYNC_CMD), :accept_all_exit_codes => true)
+    end
+
     # Return a list of packages that should be present.
     #
     # @param [Host] host A host return the packages for

data/lib/beaker/platform.rb

@@ -109,6 +109,11 @@ module Beaker
         true
       when 'el'
         @version.to_i >= 8
+      when 'debian'
+        @version.to_i >= 13
+      when 'ubuntu'
+        # version may be '2604' or '26.04'
+        @version.delete('.').to_i >= 2604
       else
         false
       end
@@ -120,7 +125,7 @@ module Beaker
     def base_packages
       case @variant
       when 'el'
-        @version.to_i >= 8 ? %w[iputils rootfiles] : %w[curl]
+        @version.to_i >= 8 ? %w[iputils iproute rootfiles] : %w[curl]
       when 'debian'
         %w[curl lsb-release]
       when 'freebsd'
@@ -132,7 +137,7 @@ module Beaker
       when 'amazon', 'amazonfips'
         ['iputils']
       when 'fedora'
-        %w[iputils iproute]
+        %w[iputils iproute rootfiles]
       when 'aix', 'osx', 'windows'
         []
       else

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '7.8.1'
+    STRING = '7.8.3'
   end
 end

data/spec/beaker/host/unix/exec_spec.rb

@@ -95,6 +95,18 @@ module Beaker
             expect { instance.ssh_permit_user_environment }.not_to raise_error
           end
         end
+
+        context 'on Solaris' do
+          PlatformHelpers::SOLARISPLATFORMS.each do |platform|
+            it "calls the correct commands for #{platform}" do
+              opts['platform'] = platform
+              expect(instance).to receive(:exec).once
+              expect(Beaker::Command).to receive(:new).with("perl -i -0777 -pe 's/^#?PermitUserEnvironment\\b[^\\n]*/PermitUserEnvironment yes/m or s/\\z/PermitUserEnvironment yes\\n/' /etc/ssh/sshd_config")
+              expect(instance).to receive(:ssh_service_restart)
+              expect { instance.ssh_permit_user_environment }.not_to raise_error
+            end
+          end
+        end
       end
 
       it 'raises an error on unsupported platforms' do

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -276,10 +276,27 @@ describe Beaker do
     it "can validate el-9 hosts" do
       host = make_host('host', { :platform => 'el-9-64' })
 
-      %w[iputils rootfiles].each do |pkg|
+      %w[iputils iproute rootfiles].each do |pkg|
         expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
         expect(host).to receive(:install_package).with(pkg).once
       end
+      # rootfiles alone is not enough in a container: its dotfiles are
+      # tmpfiles-created %ghost files, so the tmpfiles rule is applied too
+      expect(host).to receive(:exec).with(
+        satisfy { |cmd| cmd.command.include?('systemd-tmpfiles --create rootfiles.conf') && cmd.command.include?('/usr/share/rootfiles') },
+        { :accept_all_exit_codes => true },
+      ).once
+
+      subject.validate_host(host, options)
+    end
+
+    it "does not touch root's dotfiles on non-EL hosts" do
+      host = make_host('host', { :platform => 'debian-12-64' })
+      allow(host).to receive(:check_for_package).and_return(true)
+
+      expect(host).not_to receive(:exec).with(
+        satisfy { |cmd| cmd.command.include?('/usr/share/rootfiles') }, anything
+      )
 
       subject.validate_host(host, options)
     end
@@ -321,7 +338,7 @@ describe Beaker do
     it "can validate RHEL8 hosts" do
       host = make_host('host', { :platform => 'el-8-64' })
 
-      %w[iputils rootfiles].each do |pkg|
+      %w[iputils iproute rootfiles].each do |pkg|
         expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
         expect(host).to receive(:install_package).with(pkg).once
       end
@@ -332,10 +349,15 @@ describe Beaker do
     it "can validate Fedora hosts" do
       host = make_host('host', { :platform => 'fedora-32-x86_64' })
 
-      ['iputils', 'iproute'].each do |pkg|
+      %w[iputils iproute rootfiles].each do |pkg|
         expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
         expect(host).to receive(:install_package).with(pkg).once
       end
+      # Fedora 43+ rootfiles is tmpfiles-based like EL 9+, so the rule is applied too
+      expect(host).to receive(:exec).with(
+        satisfy { |cmd| cmd.command.include?('systemd-tmpfiles --create rootfiles.conf') },
+        { :accept_all_exit_codes => true },
+      ).once
 
       subject.validate_host(host, options)
     end

data/spec/helpers.rb

@@ -136,4 +136,6 @@ module PlatformHelpers
     scientific
     archlinux
   ]
+
+  SOLARISPLATFORMS = %w[solaris10-SPARC solaris11-SPARC]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 7.8.1
+  version: 7.8.3
 platform: ruby
 authors:
 - Puppet
@@ -755,7 +755,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []