beaker 7.8.1 → 7.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64705ecc4d36dfd8388655a14f0e35f897dbbe201fbe7e38c2303dadf4a29d9e
-  data.tar.gz: ba6c7790d328b191e9f3cdbee701d570f03fb0faf66f5eb05c9f622dd65d9e76
+  metadata.gz: 81a5056bbf75fb1a2d0203ea5885a278d12300fc339415e5afeeb46ebef8d785
+  data.tar.gz: e5a03effce21a9d74058016da1dcdf3421c9f9ccb2ea9717b295c8b5f99a16b1
 SHA512:
-  metadata.gz: 9d1d8a81da7ddc95cae0aee120d936fc5c433bb3eb7132d0f902a8fa35b0876c91495398abdba2a7cd37e230e8e1f788c2418383cf5665ecd59f417a4b400d25
-  data.tar.gz: 1926fe23cb90e9a2c8c93a8a8b4ff7fd44e79a273350b9bde338ef82032f6a6b073b4293a44534b83a4fde5d738a6eb963a49d9c3a69225ef164613004954dec
+  metadata.gz: 4c7ce30592e319300a0dfe9d864c4194ba1ea6eaf86febb0b0c1b8122ae9f6ec7ab4a7e718a7b0e43a48c64746f9226d4cad83688d6f71871ab9e57282e25d7e
+  data.tar.gz: 0cb47533c54b7ef3497652a1b4396ea90c53f5cf2ef7e6c9a3a964826b1cf782e75f46cd371ce38de33ae7a7249f9f6f3631d2818014c9acec11aae40dd7d7da

data/CHANGELOG.md

@@ -2,9 +2,20 @@
 
 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.2](https://github.com/voxpupuli/beaker/tree/7.8.2) (2026-09-09)
 
-[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.0...7.8.1)
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.1...7.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_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.2'
   end
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 7.8.1
+  version: 7.8.2
 platform: ruby
 authors:
 - Puppet