beaker 4.29.0 → 4.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbfaa8f41aaa3ee0ef3400002bed63eccc4bbf4a1057b047f85610fbb30fa677
-  data.tar.gz: 942d0e998c84ca98160a49da29608010c8ec42d4c1a175946ff5d31a69f0a991
+  metadata.gz: d9dde6d3115c1e75993890082fb188bb858ba64d5d62d1f332c1614f0da106d3
+  data.tar.gz: 2c9f2f21992cfb485756eff3249b3f530894e359fbb183eee840a66091773f4f
 SHA512:
-  metadata.gz: 78f4703fbd41da566acc7a674f3694c7d756bfae560f5ff8c00dbc240db7725de3ccc40c01e2c412564ea56d0f94eac8573b8d98c5b1a743b52890bc8341ccf0
-  data.tar.gz: a605d125585bf3ddc1dab03216b8056c9aadb26d662074bb15e96594ca3868c08552c06b25a767449af3c31d3099f6f00599274eb2c229995711311a1d11e799
+  metadata.gz: 34066a115a337b515eb8222a659ee4e2adec97cf4ecb4d44593a153e6a1f9189523f76b99d8c5f64a2acbf270f427a1ed108d4d88e6bebc559a4a4d022b183a0
+  data.tar.gz: a79c9f4c5cf94337a21cb4f31191e031c3748c8fb8232f31df8f1cc65c3d5e279a1855b887e9fdd5cd5f25925e126e1ca3eef858b501202a5dbcaaad0c2a9daa

data/CHANGELOG.md

@@ -20,6 +20,12 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
 - Fixed - for any bug fixes.
 - Security - in case of vulnerabilities.
 
+# [4.29.1](https://github.com/voxpupuli/beaker/compare/4.29.0...4.29.1) - 25-05-2021
+
+### Fixed
+
+- Fixed `vagrant*` matching in the unix `get_ip()`
+
 # [4.29.0](https://github.com/voxpupuli/beaker/compare/4.28.1...4.29.0) - 19-05-2021
 
 ### Added

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

@@ -138,7 +138,9 @@ module Unix::Exec
     if self['platform'].include?('solaris') || self['platform'].include?('osx')
       execute("ifconfig -a inet| awk '/broadcast/ {print $2}' | cut -d/ -f1 | head -1").strip
     else
-      execute("ip a | awk '/global/{print$2}' | cut -d/ -f1 | #{self['hypervisor'] == 'vagrant' ? 'tail' : 'head'} -1").strip
+
+      pipe_cmd = "#{self['hypervisor']}".include?('vagrant') ? 'tail' : 'head'
+      execute("ip a | awk '/global/{print$2}' | cut -d/ -f1 | #{pipe_cmd} -1").strip
     end
   end
 

data/lib/beaker/host_prebuilt_steps.rb

@@ -13,6 +13,7 @@ module Beaker
     SLEEPWAIT = 5
     TRIES = 5
     RHEL8_PACKAGES = ['curl', 'chrony']
+    FEDORA_PACKAGES = ['curl', 'chrony']
     UNIX_PACKAGES = ['curl', 'ntpdate']
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
@@ -52,7 +53,7 @@ module Beaker
           logger.notify "NTP date succeeded on #{host}"
         else
           case
-          when host['platform'] =~ /el-8/
+          when host['platform'] =~ /el-8|fedora/
             ntp_command = "chronyc add server #{ntp_server} prefer trust;chronyc makestep;chronyc burst 1/2"
           when host['platform'] =~ /sles-/
             ntp_command = "sntp #{ntp_server}"
@@ -126,6 +127,8 @@ module Beaker
           check_and_install_packages_if_needed(host, SOLARIS11_PACKAGES)
         when host['platform'] =~ /archlinux/
           check_and_install_packages_if_needed(host, ARCHLINUX_PACKAGES)
+        when host['platform'] =~ /fedora/
+          check_and_install_packages_if_needed(host, FEDORA_PACKAGES)
         when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-|netscaler|cisco_/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.29.0'
+    STRING = '4.29.1'
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -12,6 +12,7 @@ describe Beaker do
   let( :unix_only_pkgs ) { Beaker::HostPrebuiltSteps::UNIX_PACKAGES }
   let( :sles_only_pkgs ) { Beaker::HostPrebuiltSteps::SLES_PACKAGES }
   let( :rhel8_packages ) { Beaker::HostPrebuiltSteps::RHEL8_PACKAGES }
+  let( :fedora_packages) { Beaker::HostPrebuiltSteps::FEDORA_PACKAGES }
   let( :platform )       { @platform || 'unix' }
   let( :ip )             { "ip.address.0.0" }
   let( :stdout)          { @stdout || ip }
@@ -159,6 +160,15 @@ describe Beaker do
       subject.timesync(hosts, options)
     end
 
+    it "can sync time on Fedora hosts" do
+      hosts = make_hosts(:platform => 'fedora-32-x86_64')
+      expect(Beaker::Command).to receive(:new)
+        .with("chronyc add server #{ntpserver} prefer trust;chronyc makestep;chronyc burst 1/2")
+        .exactly(3)
+        .times
+      subject.timesync(hosts, options)
+    end
+
     it "can set time server on unix hosts" do
       hosts = make_hosts( { :platform => 'unix' } )
 
@@ -450,6 +460,19 @@ describe Beaker do
       subject.validate_host(hosts, options)
     end
 
+    it "can validate Fedora hosts" do
+      @platform = 'fedora-32-x86_64'
+
+      hosts.each do |host|
+        fedora_packages.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
+      end
+
+      subject.validate_host(hosts, options)
+    end
+
     it 'skips validation on cisco hosts' do
       @platform = 'cisco_nexus-7-x86_64'
       expect( subject ).to receive( :check_and_install_packages_if_needed ).never

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.29.0
+  version: 4.29.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec