beaker 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42f1138cc5ec8c7a9061bc89231e3eaeb8eec7f8
-  data.tar.gz: b9bc35774979598ad0b93cfc6034a5112a47c637
+  metadata.gz: 53eff8a2f49c2dc6d030c7c6032225500ba53bc5
+  data.tar.gz: 0a3ea2358e01984b5d63dc92c2594fca0aee0209
 SHA512:
-  metadata.gz: 58a79da7a9579907481842211a661163c4fd82cf6f4da34c644e32997fb5c2193f7064cfce6832e014c4c9405163176898d4fe94593333530985bfa100bbb2a2
-  data.tar.gz: 1ef6ae9adb6da65eb28bdc01c7e920b55d633debc1036dfe62d0778b852dbd5d3c394b2829e1709a934acb0f1f0138ca681f5d5324b92614263c4085cf2b4f7c
+  metadata.gz: 05ec5313fa43c0ebccad6f5c3957edd6e185c5f8e1f3468b760201b3ab8b2db6a683fbff91cd346cab9f85ccac2fea985ae932c03f1ea7d89ac4ce2173811d44
+  data.tar.gz: 4758fd7751f6ad3e5af51f07b74d093d1ddd445f030d82b7147b0f4b2f728b9bd1e77082c608af0608c555ae512583d1c1f5cdda6e1011d9de59484822d561d0

data/CHANGELOG.md

@@ -11,7 +11,19 @@ Tracking in this Changelog began for this project in version 3.25.0.
 If you're looking for changes from before this, refer to the project's
 git logs & PR history.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.3.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.4.0...master)
+
+# [4.4.0](https://github.com/puppetlabs/beaker/compare/4.3.0...4.4.0) - 2019.01.09
+
+### Added
+
+- Return root considerations for appending on nexus devices (BKR-1526)
+- Permit user environment on osx-10.14 (BKR-1534)
+- Add host helpers for working with files (BKR-1560)
+
+### Changed
+
+- Replace ntpdate with crony on RHEL-8 (BKR-1555)
 
 # [4.3.0](https://github.com/puppetlabs/beaker/compare/4.2.0...4.3.0) - 2018.12.12
 

data/lib/beaker/dsl/helpers/host_helpers.rb

@@ -462,6 +462,54 @@ module Beaker
           end
         end
 
+        # Check whether a file exists on the host
+        #
+        # @param host [Beaker::Host] The target host
+        # @param file_path [String] The absolute path of the file
+        #
+        # @return [Boolean] Whether the file exists on the host (using `test -f`)
+        def file_exists_on(host, file_path)
+          host.execute(%(test -f "#{file_path}"), accept_all_exit_codes: true) do |result|
+            return result.exit_code.zero?
+          end
+        end
+
+        # Check whether a directory exists on the host
+        #
+        # @param host [Beaker::Host] The target host
+        # @param dir_path [String] The absolute path of the directory
+        #
+        # @return [Boolean] Whether the directory exists on the host (using `test -d`)
+        def directory_exists_on(host, dir_path)
+          host.execute(%(test -d "#{dir_path}"), accept_all_exit_codes: true) do |result|
+            return result.exit_code.zero?
+          end
+        end
+
+        # Check whether a symlink exists on the host
+        #
+        # @param host [Beaker::Host] The target host
+        # @param link_path [String] The absolute path of the symlink
+        #
+        # @return [Boolean] Whether the symlink exists on the host (using `test -L`)
+        def link_exists_on(host, link_path)
+          host.execute(%(test -L "#{link_path}"), accept_all_exit_codes: true) do |result|
+            return result.exit_code.zero?
+          end
+        end
+
+        # Get the contents of a file on the host
+        #
+        # @param host [Beaker::Host] The target host
+        # @param file_path [String] The absoltue path to the file
+        #
+        # @return [String] The contents of the file
+        def file_contents_on(host, file_path)
+          host.execute(%(cat "#{file_path}"), acceptable_exit_codes: [0]) do |result|
+            return result.stdout
+          end
+        end
+
         #Run a curl command on the provided host(s)
         #
         # @param [Host, Array<Host>, String, Symbol] host    One or more hosts to act upon,

data/lib/beaker/host/cisco.rb

@@ -94,8 +94,8 @@ module Cisco
     # @return [String] Command string as needed for this host
     def append_commands(command = '', user_ac = '', opts = {})
       command.gsub('"') {'\\"'}
-      # vsh commands and ntpdate commands do not require an appended `"`
-      return '"' unless command =~ /ntpdate|\/isan\/bin\/vsh/
+      # vsh commands, ntpdate or when user is root commands do not require an appended `"`
+      return '"' unless command =~ /ntpdate|\/isan\/bin\/vsh/ || self[:user] == 'root'
     end
 
     # Construct the environment string for this command

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

@@ -21,7 +21,7 @@ module Mac::Exec
   #   (from {#ssh_service_restart})
   def ssh_permit_user_environment
     ssh_config_file = '/etc/sshd_config'
-    ssh_config_file = '/private/etc/ssh/sshd_config' if self['platform'] =~ /osx-10\.*(11|12|13)/
+    ssh_config_file = '/private/etc/ssh/sshd_config' if self['platform'] =~ /osx-10\.*(11|12|13|14)/
 
     exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> #{ssh_config_file}"))
     ssh_service_restart()

data/lib/beaker/host_prebuilt_steps.rb

@@ -12,6 +12,7 @@ module Beaker
     NTPSERVER = 'pool.ntp.org'
     SLEEPWAIT = 5
     TRIES = 5
+    RHEL8_PACKAGES = ['curl', 'chrony']
     UNIX_PACKAGES = ['curl', 'ntpdate']
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
@@ -51,13 +52,15 @@ module Beaker
           logger.notify "NTP date succeeded on #{host}"
         else
           case
-            when host['platform'] =~ /sles-/
-              ntp_command = "sntp #{ntp_server}"
-            when host['platform'] =~ /cisco_nexus/
-              ntp_server = host.exec(Command.new("getent hosts #{NTPSERVER} | head -n1 |cut -d \" \" -f1"), :acceptable_exit_codes => [0]).stdout
-              ntp_command = "sudo -E sh -c 'export DCOS_CONTEXT=2;/isan/bin/ntpdate -u -t 20 #{ntp_server}'"
-            else
-              ntp_command = "ntpdate -u -t 20 #{ntp_server}"
+          when host['platform'] =~ /el-8/
+            ntp_command = "chronyc add server #{ntp_server} prefer trust;chronyc makestep;chronyc burst 1/2"
+          when host['platform'] =~ /sles-/
+            ntp_command = "sntp #{ntp_server}"
+          when host['platform'] =~ /cisco_nexus/
+            ntp_server = host.exec(Command.new("getent hosts #{NTPSERVER} | head -n1 |cut -d \" \" -f1"), :acceptable_exit_codes => [0]).stdout
+            ntp_command = "sudo -E sh -c 'export DCOS_CONTEXT=2;/isan/bin/ntpdate -u -t 20 #{ntp_server}'"
+          else
+            ntp_command = "ntpdate -u -t 20 #{ntp_server}"
           end
           success=false
           try = 0
@@ -98,6 +101,8 @@ module Beaker
       logger = opts[:logger]
       block_on host do |host|
         case
+        when host['platform'] =~ /el-8/
+          check_and_install_packages_if_needed(host, RHEL8_PACKAGES)
         when host['platform'] =~ /sles-10/
           check_and_install_packages_if_needed(host, SLES10_PACKAGES)
         when host['platform'] =~ /sles-/

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.3.0'
+    STRING = '4.4.0'
   end
 end

data/spec/beaker/host/cisco_spec.rb

@@ -107,6 +107,7 @@ module Cisco
 
         before :each do
           @platform = 'cisco_nexus-7-x86_64'
+          @options = { :user => 'non_root' }
         end
 
         it 'appends `"` for commands' do
@@ -115,6 +116,13 @@ module Cisco
           expect( answer_test ).to be === answer_correct
         end
 
+        it 'returns nil for root user commands' do
+          @options = { :user => 'root' }
+          answer_correct = nil
+          answer_test = host.append_commands( 'fake_command' )
+          expect( answer_test ).to be === answer_correct
+        end
+
         it 'returns nil when vsh command' do
           answer_correct = nil
           answer_test = host.append_commands( '/isan/bin/vsh -c foo' )
@@ -138,6 +146,7 @@ module Cisco
 
         before :each do
           @platform = 'cisco_ios_xr-6-x86_64'
+          @options = { :user => 'non_root' }
         end
 
         it 'appends `"` for commands' do
@@ -146,6 +155,13 @@ module Cisco
           expect( answer_test ).to be === answer_correct
         end
 
+        it 'returns nil for root user commands' do
+          @options = { :user => 'root' }
+          answer_correct = nil
+          answer_test = host.append_commands( 'fake_command' )
+          expect( answer_test ).to be === answer_correct
+        end
+
         it 'returns nil when vsh command' do
           answer_correct = nil
           answer_test = host.append_commands( '/isan/bin/vsh -c foo' )

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -11,6 +11,7 @@ describe Beaker do
   let( :windows_pkgs )   { Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES }
   let( :unix_only_pkgs ) { Beaker::HostPrebuiltSteps::UNIX_PACKAGES }
   let( :sles_only_pkgs ) { Beaker::HostPrebuiltSteps::SLES_PACKAGES }
+  let( :rhel8_packages ) { Beaker::HostPrebuiltSteps::RHEL8_PACKAGES }
   let( :platform )       { @platform || 'unix' }
   let( :ip )             { "ip.address.0.0" }
   let( :stdout)          { @stdout || ip }
@@ -149,6 +150,15 @@ describe Beaker do
 
     end
 
+    it "can sync time on RHEL8 hosts" do
+      hosts = make_hosts(:platform => 'el-8-x86_x64')
+      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' } )
 
@@ -177,6 +187,15 @@ describe Beaker do
       subject.timesync( hosts, options_ntp )
 
     end
+
+    it "can set time server on RHEL8 hosts" do
+      hosts = make_hosts(:platform => 'el-8-x86_x64')
+      expect(Beaker::Command).to receive(:new)
+        .with("chronyc add server #{ntpserver_set} prefer trust;chronyc makestep;chronyc burst 1/2")
+        .exactly(3)
+        .times
+      subject.timesync(hosts, options_ntp)
+    end
   end
 
   context "apt_get_update" do
@@ -445,6 +464,19 @@ describe Beaker do
 
     end
 
+    it "can validate RHEL8 hosts" do
+      @platform = 'el-8-x86_x64'
+
+      hosts.each do |host|
+        rhel8_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.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec