beaker 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bd64151b4d7038041d90e11963d3cf10ebef210df726cf0732904d991f9307b
-  data.tar.gz: 90952c9a755e89c4c9a2df207f71829152ed2a1824b481df0daa1d9695563d82
+  metadata.gz: 8f99a4862979da16eeca708167851a6cc41356ef28f5093ffaf8b486687eb8ea
+  data.tar.gz: e9ca97f27f048c0aae5bba989ab7ed23491cb9ca111ab359b1b1b791c72fbf96
 SHA512:
-  metadata.gz: b6962dadc9e45225e1f861c171a02031bf7d1a76cfc50933b850f874d50b652105d380aed5b68ee0c4ce28318d631ef0a2c32bd89e96653afa93224b9592a3e5
-  data.tar.gz: 34b7603729a023b0549a693c06269a2fc8d953179ed6a03a691083d30b2eaee5ac7bbbc45a27844d02c788cb2849b8612b1d57c4caacc9c13ee077031c2a9123
+  metadata.gz: 29286dc6b82ff7f399dc24757be5a45770d1fa144d99c9287f6abadabda0bb1330acc7a67ee71b196029f68ae7ca5f526a79725ef281ff25ae64f81f110d48d5
+  data.tar.gz: 160d6a88237f9f53b6ee0b384858ab0c411eeb477f331e3262aba5f179c6f07e1c3f72cb2c3a8ad3fef2366609004198f58c1421c1e15f08c79fb3578a159251

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [5.6.0](https://github.com/voxpupuli/beaker/tree/5.6.0) (2023-11-23)
+
+**Implemented enhancements:**
+
+- Use DNF for Amazon Linux 2023 [\#1832](https://github.com/voxpupuli/beaker/pull/1832) ([mhashizume](https://github.com/mhashizume))
+- Use DNF for Fedora, newer Enterprise Linux [\#1835](https://github.com/voxpupuli/beaker/pull/1835) ([mhashizume](https://github.com/mhashizume))
+
+**Fixed bugs:**
+
+- Permit PlatformTagContainer class for beaker hosts [\#1833](https://github.com/voxpupuli/beaker/pull/1833) ([tlehman](https://github.com/tlehman))
+
 ## [5.5.0](https://github.com/voxpupuli/beaker/tree/5.5.0) (2023-10-02)
 
 [Full Changelog](https://github.com/voxpupuli/beaker/compare/5.4.0...5.5.0)

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', '~> 1.1'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.0.0'
 
   # Run time dependencies
   s.add_runtime_dependency 'minitar', '~> 0.6'

data/lib/beaker/cli.rb

@@ -106,7 +106,7 @@ module Beaker
         end
 
         # Setup perf monitoring if needed
-        @perf = Beaker::Perf.new(@hosts, @options) if /(aggressive)|(normal)/.match?(@options[:collect_perf_data].to_s)
+        @perf = Beaker::Perf.new(@hosts, @options) if /aggressive|normal/.match?(@options[:collect_perf_data].to_s)
 
         # pre acceptance  phase
         run_suite(:pre_suite, :fast)
@@ -138,7 +138,7 @@ module Beaker
         end
 
         # cleanup on error
-        if /(never)|(onpass)/.match?(@options[:preserve_hosts].to_s)
+        if /never|onpass/.match?(@options[:preserve_hosts].to_s)
           @logger.notify "Cleanup: cleaning up after failed run"
           @network_manager.cleanup if @network_manager
         else
@@ -159,7 +159,7 @@ module Beaker
         end
 
         # cleanup on success
-        if /(never)|(onfail)/.match?(@options[:preserve_hosts].to_s)
+        if /never|onfail/.match?(@options[:preserve_hosts].to_s)
           @logger.notify "Cleanup: cleaning up after successful run"
           @network_manager.cleanup if @network_manager
         else

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

@@ -87,10 +87,10 @@ module Unix::Pkg
       execute("zypper --non-interactive --gpg-auto-import-keys in #{name}", opts)
     when /el-4/
       @logger.debug("Package installation not supported on rhel4")
-    when /amazon|fedora-(2[2-9]|3[0-9])/
+    when /amazon-2023|el-(8|9|1[0-9])|fedora/
       name = "#{name}-#{version}" if version
       execute("dnf -y #{cmdline_args} install #{name}", opts)
-    when /cisco|fedora|centos|redhat|eos|el-/
+    when /cisco|centos|redhat|eos|el-[1-7]-/
       name = "#{name}-#{version}" if version
       execute("yum -y #{cmdline_args} install #{name}", opts)
     when /ubuntu|debian|cumulus|huaweios/
@@ -172,9 +172,9 @@ module Unix::Pkg
       execute("zypper --non-interactive rm #{name}", opts)
     when /el-4/
       @logger.debug("Package uninstallation not supported on rhel4")
-    when /amazon|edora-(2[2-9]|3[0-9])/
+    when /amazon-2023|el-(8|9|1[0-9])|fedora/
       execute("dnf -y #{cmdline_args} remove #{name}", opts)
-    when /cisco|fedora|centos|redhat|eos|el-/
+    when /cisco|centos|redhat|eos|el-[1-7]-/
       execute("yum -y #{cmdline_args} remove #{name}", opts)
     when /ubuntu|debian|cumulus|huaweios/
       execute("apt-get purge #{cmdline_args} -y #{name}", opts)

data/lib/beaker/host.rb

@@ -489,11 +489,7 @@ module Beaker
       # We enable achieve mode and compression
       rsync_args << "-az"
 
-      user = if not self['user']
-               "root"
-             else
-               self['user']
-             end
+      user = self['user'] || 'root'
       hostname_with_user = "#{user}@#{reachable_name}"
 
       Rsync.host = hostname_with_user

data/lib/beaker/options/hosts_file_parser.rb

@@ -4,6 +4,7 @@ module Beaker
     module HostsFileParser
       PERMITTED_YAML_CLASSES = [
         'Beaker',
+        'Beaker::DSL::TestTagging::PlatformTagConfiner',
         'Beaker::Logger',
         'Beaker::Options::OptionsHash',
         'Beaker::Platform',

data/lib/beaker/platform.rb

@@ -117,9 +117,7 @@ module Beaker
     # @example Platform.new('debian-7-xxx').with_version_codename == 'debian-wheezy-xxx'
     # @return [String] the platform string with the platform version represented as a codename
     def with_version_codename
-      version_array = [@variant, @version, @arch]
-      version_array = [@variant, @codename, @arch] if @codename
-      return version_array.join('-')
+      [@variant, @codename || @version, @arch].join('-')
     end
 
     # Returns the platform string with the platform version as a number.  If no conversion is necessary

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '5.5.0'
+    STRING = '5.6.0'
   end
 end

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

@@ -175,24 +175,12 @@ module Beaker
         end
       end
 
-      (1..21).to_a.each do |fedora_release|
-        it "uses yum on fedora-#{fedora_release}" do
-          @opts = { 'platform' => "fedora-#{fedora_release}-is-me" }
-          pkg = 'fedora_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 be == "hello"
-        end
-      end
-
-      (22..39).to_a.each do |fedora_release|
-        it "uses dnf on fedora-#{fedora_release}" do
-          @opts = { 'platform' => "fedora-#{fedora_release}-is-me" }
-          pkg = 'fedora_package'
-          expect(Beaker::Command).to receive(:new).with("dnf -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 be == "hello"
-        end
+      it "uses dnf on fedora" do
+        @opts = { 'platform' => "fedora-is-me" }
+        pkg = 'fedora_package'
+        expect(Beaker::Command).to receive(:new).with("dnf -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 be == "hello"
       end
 
       it "uses dnf on amazon-2023" do
@@ -221,24 +209,12 @@ module Beaker
           expect(instance.uninstall_package('pkg')).to be == "hello"
         end
 
-        (1..21).to_a.each do |fedora_release|
-          it "uses yum on fedora-#{fedora_release}" do
-            @opts = { 'platform' => "fedora-#{fedora_release}-is-me" }
-            pkg = 'fedora_package'
-            expect(Beaker::Command).to receive(:new).with("yum -y  remove #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
-            expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-            expect(instance.uninstall_package(pkg)).to be == "hello"
-          end
-        end
-
-        (22..39).to_a.each do |fedora_release|
-          it "uses dnf on fedora-#{fedora_release}" do
-            @opts = { 'platform' => "fedora-#{fedora_release}-is-me" }
-            pkg = 'fedora_package'
-            expect(Beaker::Command).to receive(:new).with("dnf -y  remove #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
-            expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
-            expect(instance.uninstall_package(pkg)).to be == "hello"
-          end
+        it "uses dnf on fedora" do
+          @opts = { 'platform' => "fedora-is-me" }
+          pkg = 'fedora_package'
+          expect(Beaker::Command).to receive(:new).with("dnf -y  remove #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
+          expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
+          expect(instance.uninstall_package(pkg)).to be == "hello"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement