beaker 6.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f50bf08da3941bdb936808fbf3239d476331a4d2f842ed073a565ed3cd19040
-  data.tar.gz: a75ef8fd5402e0113683d1609057a659022812ed67abfaa1f0c41cace52db742
+  metadata.gz: 77c1a3954ba46fdb90013e09113edb3b0e9f4976da6ed8598befc0e0c4faf54a
+  data.tar.gz: 8a514875b6013196ee000cd5fe1fa430057c80408511d6e6be1e28c37fd6e651
 SHA512:
-  metadata.gz: 7428fcbccda27a250f1d224ede4f6431e854a91f8e9ab64c690a1dd4b2fc5a2b7850793d764e8ca885d5b3d654c36b2e9409d8928320b20acdb55003b843c1ae
-  data.tar.gz: 8cd11c359dfe66ddb64de2762296f261cbc71ad39d95e3c9c92f1825bd0389f6a2b979826e4372c8a1cc0de36ea7b503910206cb97d0031b5be16bfcfe9358c8
+  metadata.gz: b142270c19368140de4dc01202d20c366d2ea914704c00d37eefb869d92136858063935b1780e8b08e0cc5afc1accd605951d93da06994584945fcbd8f97e9ca
+  data.tar.gz: cd3e194d4e98dfcf5c01eeb22ede113561c20ae54d90d3ce8e95cfa19b864d5ca65bbc0e3f4f25b583354100b7177e71d73620652ca7ad34c7991fb3c47aa5f1

data/.github/workflows/test.yml

@@ -22,8 +22,7 @@ jobs:
         run: bundle exec rake rubocop
 
   test:
-    # CentOS 7 testing is broken on Ubuntu 22.04
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [6.2.0](https://github.com/voxpupuli/beaker/tree/6.2.0) (2024-07-24)
+
+**Implemented enhancements:**
+
+- Debian: Replace apt-get with apt for updates [\#1890](https://github.com/voxpupuli/beaker/pull/1890) ([bastelfreak](https://github.com/bastelfreak))
+
+**Fixed bugs:**
+
+- EL8/9 & Fedora: Install iputils [\#1893](https://github.com/voxpupuli/beaker/pull/1893) ([bastelfreak](https://github.com/bastelfreak))
+
+## [6.1.0](https://github.com/voxpupuli/beaker/tree/6.1.0) (2024-06-04)
+
+**Implemented enhancements:**
+
+- Add package logic for Amazon Linux 2 [\#1887](https://github.com/voxpupuli/beaker/pull/1884) ([mhashizume](https://github.com/joshcooper))
+
 ## [6.0.0](https://github.com/voxpupuli/beaker/tree/6.0.0) (2024-05-24)
 
 **Breaking changes:**

data/Rakefile

@@ -67,11 +67,11 @@ def hosts_opt(use_preserved_hosts = false)
 end
 
 def agent_target
-  ENV['TEST_TARGET'] || 'centos7-64af'
+  ENV['TEST_TARGET'] || 'centos9-64af'
 end
 
 def master_target
-  ENV['MASTER_TEST_TARGET'] || 'centos7-64default.mdcal'
+  ENV['MASTER_TEST_TARGET'] || 'centos9-64default.mdcal'
 end
 
 def test_targets

data/acceptance/tests/base/host/packages.rb

@@ -17,6 +17,8 @@ def get_host_pkg(host)
     Beaker::HostPrebuiltSteps::OPENBSD_PACKAGES
   when /solaris-10/
     Beaker::HostPrebuiltSteps::SOLARIS10_PACKAGES
+  when /el-[89]/
+    Beaker::HostPrebuiltSteps::RHEL8_PACKAGES
   else
     Beaker::HostPrebuiltSteps::UNIX_PACKAGES
   end

data/beaker.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '~> 2.4'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.7.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.8.0'
 
   # Run time dependencies
   s.add_runtime_dependency 'minitar', '~> 0.6'

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

@@ -62,7 +62,8 @@ module Unix::Pkg
     return unless /debian|ubuntu/.match?(self['platform'])
     return unless @apt_needs_update
 
-    execute("apt-get update")
+    # -qq: Only output errors to stdout
+    execute("apt-get update -qq")
     @apt_needs_update = false
   end
 
@@ -85,7 +86,7 @@ module Unix::Pkg
     when /amazon-2023|el-(8|9|1[0-9])|fedora/
       name = "#{name}-#{version}" if version
       execute("dnf -y #{cmdline_args} install #{name}", opts)
-    when /amazon-7|centos|redhat|el-[1-7]-/
+    when /amazon-(2|7)|centos|redhat|el-[1-7]-/
       name = "#{name}-#{version}" if version
       execute("yum -y #{cmdline_args} install #{name}", opts)
     when /ubuntu|debian/
@@ -167,7 +168,7 @@ module Unix::Pkg
       execute("zypper --non-interactive rm #{name}", opts)
     when /amazon-2023|el-(8|9|1[0-9])|fedora/
       execute("dnf -y #{cmdline_args} remove #{name}", opts)
-    when /amazon-7|centos|redhat|el-[1-7]-/
+    when /amazon-(2|7)|centos|redhat|el-[1-7]-/
       execute("yum -y #{cmdline_args} remove #{name}", opts)
     when /ubuntu|debian/
       execute("apt-get purge #{cmdline_args} -y #{name}", opts)
@@ -263,7 +264,8 @@ module Unix::Pkg
       execute("zypper --non-interactive --no-gpg-checks in #{onhost_package_file}")
     when /^(debian|ubuntu)$/
       execute("dpkg -i --force-all #{onhost_package_file}")
-      execute("apt-get update")
+      # -qq: Only output errors to stdout
+      execute("apt-get update -qq")
     when /^solaris$/
       self.solaris_install_local_package(onhost_package_file, onhost_copy_dir)
     when /^osx$/

data/lib/beaker/host_prebuilt_steps.rb

@@ -11,8 +11,8 @@ module Beaker
     SLEEPWAIT = 5
     TRIES = 5
     AMAZON2023_PACKAGES = %w[chrony]
-    RHEL8_PACKAGES = %w[chrony]
-    FEDORA_PACKAGES = %w[chrony]
+    RHEL8_PACKAGES = %w[chrony iputils] # iputils provides ping. beaker assumes that's present
+    FEDORA_PACKAGES = %w[chrony iputils]
     UNIX_PACKAGES = %w[curl ntpdate]
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
@@ -204,7 +204,8 @@ module Beaker
     # @param [Host, Array<Host>] hosts One or more hosts to act upon
     def apt_get_update hosts
       block_on hosts do |host|
-        host.exec(Command.new("apt-get update")) if /ubuntu|debian/.match?(host[:platform])
+        # -qq: Only output errors to stdout
+        host.exec(Command.new("apt-get update -qq")) if /ubuntu|debian/.match?(host[:platform])
       end
     end
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.0.0'
+    STRING = '6.2.0'
   end
 end

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

@@ -128,7 +128,7 @@ module Beaker
         it "calls update for #{platform}" do
           @opts = { 'platform' => platform }
           instance.instance_variable_set(:@apt_needs_update, true)
-          expect(instance).to receive('execute').with("apt-get update")
+          expect(instance).to receive('execute').with("apt-get update -qq")
           expect { instance.update_apt_if_needed }.not_to raise_error
         end
       end
@@ -161,7 +161,7 @@ module Beaker
         expect(instance.install_package(pkg)).to eq "hello"
       end
 
-      it "uses yum on amazon linux 2" do
+      it "uses yum on misnamed amazon linux 7" do
         @opts = { 'platform' => "amazon-7-is-me" }
         pkg = 'amazon_package'
         expect(Beaker::Command).to receive(:new).with("yum -y  install #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
@@ -169,6 +169,14 @@ module Beaker
         expect(instance.install_package(pkg)).to eq "hello"
       end
 
+      it "uses yum on amazon linux 2" do
+        @opts = { 'platform' => "amazon-2-is-me" }
+        pkg = 'amazon_package'
+        expect(Beaker::Command).to receive(:new).with("yum -y  install #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
+        expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
+        expect(instance.install_package(pkg)).to eq "hello"
+      end
+
       it "uses pacman on archlinux" do
         @opts = { 'platform' => 'archlinux-is-me' }
         pkg = 'archlinux_package'
@@ -281,7 +289,7 @@ module Beaker
 
       it 'Amazon Linux 2 uses yum' do
         @platform = platform
-        @version = '7'
+        @version = '2'
         package_file = 'test_123.yay'
         expect(instance).to receive(:execute).with(/^yum.*#{package_file}$/)
         instance.install_local_package(package_file)
@@ -301,7 +309,7 @@ module Beaker
         %w[debian ubuntu].each do |platform|
           @platform = platform
           expect(instance).to receive(:execute).with(/^dpkg.*#{package_file}$/)
-          expect(instance).to receive(:execute).with('apt-get update')
+          expect(instance).to receive(:execute).with('apt-get update -qq')
           instance.install_local_package(package_file)
         end
       end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -227,7 +227,7 @@ describe Beaker do
     it "can perform apt-get on ubuntu hosts" do
       host = make_host('testhost', { :platform => 'ubuntu' })
 
-      expect(Beaker::Command).to receive(:new).with("apt-get update").once
+      expect(Beaker::Command).to receive(:new).with("apt-get update -qq").once
 
       subject.apt_get_update(host)
     end
@@ -235,7 +235,7 @@ describe Beaker do
     it "can perform apt-get on debian hosts" do
       host = make_host('testhost', { :platform => 'debian' })
 
-      expect(Beaker::Command).to receive(:new).with("apt-get update").once
+      expect(Beaker::Command).to receive(:new).with("apt-get update -qq").once
 
       subject.apt_get_update(host)
     end

data/spec/helpers.rb

@@ -124,6 +124,7 @@ module PlatformHelpers
 
   REDHATPLATFORMS = %w[
     amazon-2023
+    amazon-2
     fedora
     el-
     centos

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -640,7 +640,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!