beaker 4.21.0 → 4.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92aa5f010caeb1dc51e07fda6804186857ce5d3d74c9f8391ff3d6f3cd720f7a
-  data.tar.gz: 8c6903944cf9c77f166edec11fe1503085a048f70119456a5680339771564558
+  metadata.gz: 4f4ee75a711cc94d5814ed063880f947c8529b62bdd992eb5c867af160940655
+  data.tar.gz: 63d0cdbd54c8693e25b7d2b6b81d26bc8403f1736442624417d9c70674a7d06c
 SHA512:
-  metadata.gz: bf304b5107c82a834e86fd4123aa36f89ea8933571f35d2abe5cb3a934447f0a4c154fe8006b315cc4a90404c170a42a4a256b2d90542b1f4ad34024ad248601
-  data.tar.gz: c4331359a27c7b880fbd34213983337f0c79374b353d8f5581def07196df83d7ad0209a7694de4ba8989520cc25fe2210f35ade13d048e5290d98e63e8e240eb
+  metadata.gz: 990c909cc18aa7634f56a0c98573025c3f4a41f6bd0057936c7086a961a55b3ba7e87bd0e9326316ad86c3d843ac3a637ad48eac95ce8cf2bcf61d647af5f477
+  data.tar.gz: 85d6f87e4a62e744911e3b616dc3ec34d6e42d1564664d02e9e09dd915163b9c7d30dd66224d274a58a9ae970497b4ea5766a5da4822530300ad15b80b61c44e

data/CHANGELOG.md

@@ -20,7 +20,17 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
 - Fixed - for any bug fixes.
 - Security - in case of vulnerabilities.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.21.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.22.0...master)
+
+# [4.22.0](https://github.com/puppetlabs/beaker/compare/4.21.0...4.22.0) - 2020-05-08
+
+### Added
+
+- Host methods chmod and modified_at. ([#1638](https://github.com/puppetlabs/beaker/pull/1638))
+
+### Removed
+
+- Support for EL-5. ([#1639](https://github.com/puppetlabs/beaker/pull/1639)) ([#1640](https://github.com/puppetlabs/beaker/pull/1640))
 
 # [4.21.0](https://github.com/puppetlabs/beaker/compare/4.20.0...4.21.0) - 2020-03-31
 
@@ -43,7 +53,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
 
 ### Changed
 
-- The `wait_time`, `max_connection_tries`, and `uptime_retries` parameters have been added to `Host::Unix::Exec.reboot`. This allows for more fine-grained control over how the reboot is handled. ([#1625](https://github.com/puppetlabs/beaker/pull/1625)) 
+- The `wait_time`, `max_connection_tries`, and `uptime_retries` parameters have been added to `Host::Unix::Exec.reboot`. This allows for more fine-grained control over how the reboot is handled. ([#1625](https://github.com/puppetlabs/beaker/pull/1625))
 
 ### Fixed
 

data/acceptance/tests/base/external_resources_test.rb

@@ -2,7 +2,6 @@ test_name 'External Resources Test' do
   step 'Verify EPEL resources are up and available' do
     def build_url(el_version)
       url_base = options[:epel_url]
-      url_base = options[:epel_url_archive] if el_version == 5
       "#{url_base}/epel-release-latest-#{el_version}.noarch.rpm"
     end
 
@@ -23,11 +22,10 @@ test_name 'External Resources Test' do
       assert_match(/200 OK/, curl_headers_result.stdout, "EPEL #{el_version} should be reachable at #{url}")
     end
 
-    step 'Verify el_version numbers 5,6,7 are found on the epel resource' do
-      [5,6,7].each do |el_version|
+    step 'Verify el_version numbers 6,7,8 are found on the epel resource' do
+      [6,7,8].each do |el_version|
         epel_url_test(el_version)
       end
     end
-
   end
 end

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

@@ -35,4 +35,13 @@ module Mac::Exec
     false
   end
 
+  # Update ModifiedDate on a file
+  # @param [String] file Path to the file
+  # @param [String] timestamp Timestamp to set
+  def modified_at(file, timestamp = nil)
+    require 'date'
+    time = timestamp ? DateTime.parse("#{timestamp}") : DateTime.now
+    timestamp = time.strftime('%Y%m%d%H%M')
+    execute("touch -mt #{timestamp} #{file}")
+  end
 end

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

@@ -37,6 +37,28 @@ module PSWindows::Exec
     execute("move /y #{orig} #{dest}")
   end
 
+  # Update ModifiedDate on a file
+  # @param [String] file Path to the file
+  # @param [String] timestamp Timestamp to set
+  def modified_at(file, timestamp = nil)
+    require 'date'
+    time = timestamp ? DateTime.parse("#{timestamp}") : DateTime.now
+
+    result = execute("powershell Test-Path #{file} -PathType Leaf")
+
+    if result.include? 'False'
+      execute("powershell New-Item -ItemType file #{file}")
+    end
+    execute("powershell (gci #{file}).LastWriteTime = Get-Date " \
+      "-Year '#{time.year}'" \
+      "-Month '#{time.month}'" \
+      "-Day '#{time.day}'" \
+      "-Hour '#{time.hour}'" \
+      "-Minute '#{time.minute}'" \
+      "-Second '#{time.second}'"
+    )
+  end
+
   def path
     'c:/windows/system32;c:/windows'
   end

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

@@ -2,9 +2,9 @@ module Unix::Exec
   include Beaker::CommandFactory
 
   # Reboots the host, comparing uptime values to verify success
-  # @param [Integer] wait_time How long to wait after sending the reboot 
+  # @param [Integer] wait_time How long to wait after sending the reboot
   #                            command before attempting to check in on the host
-  # @param [Integer] max_connection_tries How many times to retry connecting to 
+  # @param [Integer] max_connection_tries How many times to retry connecting to
   #                            host after reboot. Note that there is an fibbonacci
   #                            backoff when attempting retries so the time spent
   #                            waiting on this can grow quickly.
@@ -40,7 +40,7 @@ module Unix::Exec
       current_uptime_str = parse_uptime current_uptime
       current_uptime_int = uptime_int current_uptime_str
       unless original_uptime_int > current_uptime_int
-        raise Beaker::Host::RebootFailure, "Uptime did not reset. Reboot appears to have failed." 
+        raise Beaker::Host::RebootFailure, "Uptime did not reset. Reboot appears to have failed."
       end
     rescue Beaker::Host::RebootFailure => e
       attempts += 1
@@ -89,7 +89,7 @@ module Unix::Exec
       return "0 min"
     end
     raise "Couldn't parse uptime: #{uptime}" if result.nil?
-    
+
     result[1].strip.chomp(",")
   end
 
@@ -101,6 +101,16 @@ module Unix::Exec
     (abs ? '/bin/touch' : 'touch') + " #{file}"
   end
 
+  # Update ModifiedDate on a file
+  # @param [String] file Path to the file
+  # @param [String] timestamp Timestamp to set
+  def modified_at(file, timestamp = nil)
+    require 'date'
+    time = timestamp ? DateTime.parse("#{timestamp}") : DateTime.now
+    timestamp = time.strftime('%Y%m%d%H%M')
+    execute("/bin/touch -mt #{timestamp} #{file}")
+  end
+
   def path
     '/bin:/usr/bin'
   end
@@ -117,7 +127,7 @@ module Unix::Exec
   # @param [String] dir The directory structure to create on the host
   # @return [Boolean] True, if directory construction succeeded, otherwise False
   def mkdir_p dir
-    cmd = "mkdir -p #{dir}"
+    cmd = "mkdir -p '#{dir}'"
     result = exec(Beaker::Command.new(cmd), :acceptable_exit_codes => [0, 1])
     result.exit_code == 0
   end
@@ -125,7 +135,7 @@ module Unix::Exec
   # Recursively remove the path provided
   # @param [String] path The path to remove
   def rm_rf path
-    execute("rm -rf #{path}")
+    execute("rm -rf '#{path}'")
   end
 
   # Move the origin to destination. The destination is removed prior to moving.
@@ -134,7 +144,7 @@ module Unix::Exec
   # @param [Boolean] rm Remove the destination prior to move
   def mv orig, dest, rm=true
     rm_rf dest unless !rm
-    execute("mv #{orig} #{dest}")
+    execute("mv '#{orig}' '#{dest}'")
   end
 
   # Attempt to ping the provided target hostname

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

@@ -30,6 +30,10 @@ module Unix::File
     execute("chown #{recursive ? '-R ' : ''}#{user} #{path}")
   end
 
+  def chmod(mod, path, recursive=false)
+    execute("chmod #{recursive ? '-R ' : ''}#{mod} #{path}")
+  end
+
   # Change group ownership of a path
   #
   # @see http://pubs.opengroup.org/onlinepubs/9699919799/utilities/chgrp.html

data/lib/beaker/host/windows/file.rb

@@ -35,6 +35,9 @@ module Windows::File
     super(group, cygpath, recursive)
   end
 
+  # Not needed on windows
+  def chmod(mod, path, recursive=false); end
+
   # (see {Beaker::Host::Unix::File#ls_ld})
   # @note Cygwin's `ls_ld` implementation does not support
   #   windows-, DOS-, or mixed-style paths, only UNIX/POSIX-style.

data/lib/beaker/host_prebuilt_steps.rb

@@ -244,7 +244,7 @@ module Beaker
       report_and_raise(logger, e, "proxy_config")
     end
 
-    #Install EPEL on host or hosts with platform = /el-(5|6|7)/.  Do nothing on host or hosts of other platforms.
+    #Install EPEL on host or hosts with platform = /el-(6|7)/.  Do nothing on host or hosts of other platforms.
     # @param [Host, Array<Host>] host One or more hosts to act upon.  Will use individual host epel_url, epel_arch
     #                                 and epel_pkg before using defaults provided in opts.
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
@@ -258,11 +258,10 @@ module Beaker
       debug_opt = opts[:debug] ? 'vh' : ''
       block_on host do |host|
         case
-        when el_based?(host) && ['5','6','7'].include?(host['platform'].version)
+        when el_based?(host) && ['6','7'].include?(host['platform'].version)
           result = host.exec(Command.new('rpm -qa | grep epel-release'), :acceptable_exit_codes => [0,1])
           if result.exit_code == 1
             url_base = opts[:epel_url]
-            url_base = opts[:epel_url_archive] if host['platform'].version == '5'
             host.install_package_with_rpm("#{url_base}/epel-release-latest-#{host['platform'].version}.noarch.rpm", '--replacepkgs', { :package_proxy => opts[:package_proxy] })
             #update /etc/yum.repos.d/epel.repo for new baseurl
             host.exec(Command.new("sed -i -e 's;#baseurl.*$;baseurl=#{Regexp.escape("#{url_base}/#{host['platform'].version}")}/\$basearch;' /etc/yum.repos.d/epel.repo"))

data/lib/beaker/options/presets.rb

@@ -174,7 +174,6 @@ module Beaker
           :package_proxy          => false,
           :add_el_extras          => false,
           :epel_url               => "http://dl.fedoraproject.org/pub/epel",
-          :epel_url_archive       => 'http://archive.fedoraproject.org/pub/archive/epel',
           :consoleport            => 443,
           :pe_dir                 => '/opt/enterprise/dists',
           :pe_version_file        => 'LATEST',

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.21.0'
+    STRING = '4.22.0'
   end
 end

data/spec/beaker/host/mac/exec_spec.rb

@@ -31,5 +31,15 @@ module Beaker
         expect(instance.selinux_enabled?).to be === false
       end
     end
+
+    describe '#modified_at' do
+      it 'calls execute with touch and timestamp' do
+        time = '190101010000'
+        path = '/path/to/file'
+        expect( instance ).to receive(:execute).with("touch -mt #{time} #{path}").and_return(0)
+
+        instance.modified_at(path, time)
+      end
+    end
   end
 end

data/spec/beaker/host/pswindows/exec_spec.rb

@@ -50,6 +50,38 @@ module Beaker
         expect( instance.mv(origin, destination, false) ).to be === 0
       end
     end
+
+    describe '#modified_at' do
+      before do
+        allow(instance).to receive(:execute).and_return(stdout)
+      end
+
+      context 'file exists' do
+        let(:stdout) { 'True' }
+        it 'sets the modified_at date' do
+          file = 'C:\path\to\file'
+          expect(instance).to receive(:execute).with("powershell Test-Path #{file} -PathType Leaf")
+          expect(instance).to receive(:execute).with(
+            "powershell (gci C:\\path\\to\\file).LastWriteTime = Get-Date -Year '1970'-Month '1'-Day '1'-Hour '0'-Minute '0'-Second '0'"
+          )
+          instance.modified_at(file, '197001010000')
+        end
+      end
+
+      context 'file does not exist' do
+        let(:stdout) { 'False' }
+        it 'creates it and sets the modified_at date' do
+          file = 'C:\path\to\file'
+          expect(instance).to receive(:execute).with("powershell Test-Path #{file} -PathType Leaf")
+          expect(instance).to receive(:execute).with("powershell New-Item -ItemType file #{file}")
+          expect(instance).to receive(:execute).with(
+            "powershell (gci C:\\path\\to\\file).LastWriteTime = Get-Date -Year '1970'-Month '1'-Day '1'-Hour '0'-Minute '0'-Second '0'"
+          )
+          instance.modified_at(file, '197001010000')
+        end
+      end
+    end
+
     describe '#environment_string' do
       let(:host) { {'pathseparator' => ':'} }
 

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

@@ -29,7 +29,7 @@ module Beaker
 
       it "deletes" do
         path = '/path/to/delete'
-        expect( instance ).to receive(:execute).with("rm -rf #{path}").and_return(0)
+        expect( instance ).to receive(:execute).with("rm -rf '#{path}'").and_return(0)
         expect( instance.rm_rf(path) ).to be === 0
       end
     end
@@ -39,18 +39,28 @@ module Beaker
       let(:destination) { '/destination/path/of/content' }
 
       it 'rm first' do
-        expect( instance ).to receive(:execute).with("rm -rf #{destination}").and_return(0)
-        expect( instance ).to receive(:execute).with("mv #{origin} #{destination}").and_return(0)
+        expect( instance ).to receive(:execute).with("rm -rf '#{destination}'").and_return(0)
+        expect( instance ).to receive(:execute).with("mv '#{origin}' '#{destination}'").and_return(0)
         expect( instance.mv(origin, destination) ).to be === 0
 
       end
 
       it 'does not rm' do
-         expect( instance ).to receive(:execute).with("mv #{origin} #{destination}").and_return(0)
+         expect( instance ).to receive(:execute).with("mv '#{origin}' '#{destination}'").and_return(0)
          expect( instance.mv(origin, destination, false) ).to be === 0
       end
     end
 
+    describe '#modified_at' do
+      it 'calls execute with touch and timestamp' do
+        time = '190101010000'
+        path = '/path/to/file'
+        expect( instance ).to receive(:execute).with("/bin/touch -mt #{time} #{path}").and_return(0)
+
+        instance.modified_at(path, time)
+      end
+    end
+
     describe '#environment_string' do
       let(:host) { {'pathseparator' => ':'} }
 

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

@@ -196,6 +196,28 @@ module Beaker
       end
     end
 
+    describe '#chmod' do
+      context 'not recursive' do
+        it 'calls execute with chmod' do
+          path = '/path/to/file'
+          mod = '+x'
+
+          expect( instance ).to receive(:execute).with("chmod #{mod} #{path}")
+          instance.chmod(mod, path)
+        end
+      end
+
+      context 'recursive' do
+        it 'calls execute with chmod' do
+          path = '/path/to/file'
+          mod = '+x'
+
+          expect( instance ).to receive(:execute).with("chmod -R #{mod} #{path}")
+          instance.chmod(mod, path, true)
+        end
+      end
+    end
+
     describe '#chgrp' do
       let (:group) { 'somegroup' }
       let (:path) { '/path/to/chgrp/on' }

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -329,33 +329,6 @@ describe Beaker do
   context "add_el_extras" do
     subject { dummy_class.new }
 
-    it 'adds archived extras for el-5 hosts' do
-
-      hosts = make_hosts( { :platform => Beaker::Platform.new('el-5-arch'), :exit_code => 1 }, 2 )
-      hosts[1][:platform] = Beaker::Platform.new('oracle-5-arch')
-
-      expect( Beaker::Command ).to receive( :new ).with(
-        "rpm -qa | grep epel-release"
-      ).exactly( 2 ).times
-      hosts.each do |host|
-        expect(host).to receive( :install_package_with_rpm ).with(
-          "http://archive.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm", "--replacepkgs", {:package_proxy => false}
-        ).once
-      end
-      expect( Beaker::Command ).to receive( :new ).with(
-        "sed -i -e 's;#baseurl.*$;baseurl=http://archive\\.fedoraproject\\.org/pub/archive/epel/5/$basearch;' /etc/yum.repos.d/epel.repo"
-      ).exactly( 2 ).times
-      expect( Beaker::Command ).to receive( :new ).with(
-        "sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo"
-      ).exactly( 2 ).times
-      expect( Beaker::Command ).to receive( :new ).with(
-        "yum clean all && yum makecache"
-      ).exactly( 2 ).times
-
-      subject.add_el_extras( hosts, options )
-
-    end
-
     it 'adds extras for el-6 hosts' do
 
       hosts = make_hosts( { :platform => Beaker::Platform.new('el-6-arch'), :exit_code => 1 }, 4 )

data/spec/beaker/host_spec.rb

@@ -325,7 +325,7 @@ module Beaker
         allow( result ).to receive( :exit_code ).and_return( 0 )
         allow( host ).to receive( :exec ).and_return( result )
 
-        expect( Beaker::Command ).to receive(:new).with("mkdir -p test/test/test")
+        expect( Beaker::Command ).to receive(:new).with("mkdir -p 'test/test/test'")
         expect( host.mkdir_p('test/test/test') ).to be == true
 
       end
@@ -337,7 +337,7 @@ module Beaker
         allow( result ).to receive( :exit_code ).and_return( 0 )
         allow( host ).to receive( :exec ).and_return( result )
 
-        expect( Beaker::Command ).to receive(:new).with("mkdir -p test/test/test")
+        expect( Beaker::Command ).to receive(:new).with("mkdir -p 'test/test/test'")
         expect( host.mkdir_p('test/test/test') ).to be == true
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.21.0
+  version: 4.22.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec