beaker 2.32.1 → 2.33.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzY3MjNmNzJjZmU2NjkxYzAwZWQ3MTdmNzM5ZGM4ZmRmMmQ4MmIzOA==
+    ZjczYWQ4ZGJiZjFhYTY5OTk4M2NhYWFkYjhlNDM5ODkzNzcyNjQ3ZA==
   data.tar.gz: !binary |-
-    Y2FlMzIwMDM1NzBjNmU4ZjViNWZlNGMxOTQxNmJmMjYzMjI3YzMyYw==
+    Mjk2YjRkZDY4M2UxNzhkNDU1MjgyZjgyOTY3NTUwMzgwNmViNTZkZA==
 SHA512:
   metadata.gz: !binary |-
-    ZTFkOGE1Mjg1MDc4NjVkYTViNGYyNWU2ODZmYzY2NzhhZjM0NmYxNWI3MzQy
-    ZTBmMzljZmM4OGEzZmZjMjg4ODZlYTg0Y2RjOTUwMmJhYzdhMmY3NDgxMTlh
-    ZTgyNTEwOTI4NGJkOWRmMzVmNTYxNDM3OTk4ZDI1NGY2ZjZmOGE=
+    MGE4M2I4OGEyNjQ0OTE3NzM4OGUxNTdkZTY5MWIyNGI0MTM2ZWU1ZjYyZDg4
+    YWJiOGFlODZkZTFhZWJkNDBjNmZkNDNlNmRmZTlmN2Y4ODU0NTNhMmEyZjBl
+    Mjk5MjAwM2UzMmQzZDE2M2Q4NGZiYjNkOTZmZWJlNWZlNGZhYjg=
   data.tar.gz: !binary |-
-    OGE5NmMxZTVjZWVlZGZiY2Y5YzMyZDBhN2E5MTViNWZlNWUxY2RjNjIxZjgy
-    Yjg1NTY1YTJmNGM3YzZhYzc0MzdjOGE2ZjhmZmMwODdiNTNlZDU2NjQwZmVi
-    NDAxNjQzYjg3ODJkYjdiZGFhYzhjZTcwOTUwYTMzOTA1M2QxN2M=
+    Mjk2NjFlNzYxNjA5YzY2NWZiYjdjZWJiZGEzNWM2YzhiZGIyYmNiNDlkNDQ1
+    NzhiNDZiOTk4ZmU2M2RmMDA1NWRlZGY1MGQzNjhmZWFlNDMzOWY2NjVhMTZj
+    YmM4MDYyZWEwMTdiNGVmM2JjNGQ0MjcxMjQyMjdkMzg4OGZlMjY=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 14 Jan, 2016 (1aa6de03)](#LATEST)
+* [LATEST - 27 Jan, 2016 (abf7e410)](#LATEST)
+* [2.32.1 - 14 Jan, 2016 (8c394fdb)](#2.32.1)
 * [2.32.0 - 12 Jan, 2016 (80e153cc)](#2.32.0)
 * [2.31.0 - 16 Dec, 2015 (54b1801d)](#2.31.0)
 * [2.30.1 - 3 Dec, 2015 (9f1376ef)](#2.30.1)
@@ -107,7 +108,51 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 14 Jan, 2016 (1aa6de03)
+### <a name = "LATEST">LATEST - 27 Jan, 2016 (abf7e410)
+
+* (GEM) update beaker version to 2.33.0 (abf7e410)
+
+* Merge pull request #1045 from kevpl/maint_backupfile_public (3a86990f)
+
+
+```
+Merge pull request #1045 from kevpl/maint_backupfile_public
+
+(MAINT) made backup_the_file public
+```
+* Merge pull request #1046 from kevpl/bkr666_wrlinux5_provision (1fbea3a4)
+
+
+```
+Merge pull request #1046 from kevpl/bkr666_wrlinux5_provision
+
+(BKR-666) added wrlinux5 provisioning steps
+```
+* Merge pull request #1048 from kevpl/bkr480_fedora23_supportadd (d248d822)
+
+
+```
+Merge pull request #1048 from kevpl/bkr480_fedora23_supportadd
+
+(BKR-480) added support for fedora23
+```
+* (BKR-480) added support for fedora23 (71d2dc30)
+
+* (BKR-666) refactored supports_set_env check into host object (0ee32f72)
+
+* (BKR-666) added wrlinux-5 provisioning changes (b744229f)
+
+* (MAINT) made backup_the_file public (315271b6)
+
+
+```
+(MAINT) made backup_the_file public
+
+[skip ci]
+```
+### <a name = "2.32.1">2.32.1 - 14 Jan, 2016 (8c394fdb)
+
+* (HISTORY) update beaker history for gem release 2.32.1 (8c394fdb)
 
 * (GEM) update beaker version to 2.32.1 (1aa6de03)
 

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-i386.repo

@@ -0,0 +1,6 @@
+[pl-puppetserver-latest]
+name=PL Repo for puppetserver at commit latest
+baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f23/PC1/i386/
+enabled=1
+gpgcheck=1
+gpgkey=http://nightlies.puppetlabs.com/07BB6C57

data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-x86_64.repo

@@ -0,0 +1,6 @@
+[pl-puppetserver-latest]
+name=PL Repo for puppetserver at commit latest
+baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f23/PC1/x86_64/
+enabled=1
+gpgcheck=1
+gpgkey=http://nightlies.puppetlabs.com/07BB6C57

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

@@ -361,8 +361,6 @@ module Beaker
 
         # Back up the given file in the current_dir to the new_dir
         #
-        # @!visibility private
-        #
         # @param host [Beaker::Host] The target host
         # @param current_dir [String] The directory containing the file to back up
         # @param new_dir [String] The directory to copy the file to

data/lib/beaker/host/unix.rb

@@ -138,6 +138,23 @@ module Unix
       @external_copy_base
     end
 
+    # Tells you whether a host platform supports beaker's
+    #   {Beaker::HostPrebuiltSteps#set_env} method
+    #
+    # @return [String,nil] Reason message if set_env should be skipped,
+    #   nil if it should run.
+    def skip_set_env?
+      variant, version, arch, codename = self['platform'].to_array
+      case variant
+      when /^cisco$/
+        'Cisco does not allow SSH control through the BASH shell'
+      when /^(f5|netscaler)$/
+        "no puppet-agent package for network device platform '#{variant}'"
+      else
+        nil
+      end
+    end
+
     def initialize name, host_hash, options
       super
 

data/lib/beaker/host_prebuilt_steps.rb

@@ -110,7 +110,7 @@ module Beaker
           check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
         when host['platform'] =~ /solaris-10/
           check_and_install_packages_if_needed(host, SOLARIS10_PACKAGES)
-        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-|netscaler/
+        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-|netscaler|cisco-/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
       end
@@ -535,7 +535,12 @@ module Beaker
       logger = opts[:logger]
 
       block_on host do |host|
-        next if host['platform'] =~ /f5-|netscaler/
+        skip_msg = host.skip_set_env?
+        unless skip_msg.nil?
+          logger.debug( skip_msg )
+          next
+        end
+
         env = construct_env(host, opts)
         logger.debug("setting local environment on #{host.name}")
         if host['platform'] =~ /windows/ and host.is_cygwin?

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.32.1'
+    STRING = '2.33.0'
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -411,6 +411,12 @@ describe Beaker do
       subject.validate_host(hosts, options)
 
     end
+
+    it 'skips validation on cisco hosts' do
+      @platform = 'cisco-5-x86_64'
+      expect( subject ).to receive( :check_and_install_packages_if_needed ).never
+      subject.validate_host(hosts, options)
+    end
   end
 
   context 'get_domain_name' do
@@ -567,12 +573,32 @@ describe Beaker do
         :env1_key => :env1_value,
         :env2_key => :env2_value
       }
+      allow( host ).to receive( :skip_set_env? ).and_return('f5 say NO' )
 
       expect( subject ).to receive( :construct_env ).exactly(0).times
-
-      expect( Beaker::Command ).to receive( :new ).exactly(0).times
-      expect( Beaker::Command ).to receive( :new ).exactly(0).times
       expect( Beaker::Command ).to receive( :new ).exactly(0).times
+      expect( host ).to receive( :add_env_var ).exactly(0).times
+      opts.each_pair do |key, value|
+        expect( host ).to receive( :add_env_var ).with( key, value ).exactly(0).times
+      end
+      expect( host ).to receive( :exec ).exactly(0).times
+
+      subject.set_env(host, options.merge( opts ))
+    end
+
+    it 'skips a cisco host correctly' do
+      host = make_host('name', {
+        :platform     => 'cisco-5-x86_64',
+        :ssh_env_file => 'ssh_env_file',
+        :is_cygwin   => true,
+      } )
+      opts = {
+        :env1_key => :env1_value,
+        :env2_key => :env2_value
+      }
+      allow( host ).to receive( :skip_set_env? ).and_return('cisco say NO' )
+
+      expect( subject ).to receive( :construct_env ).exactly(0).times
       expect( Beaker::Command ).to receive( :new ).exactly(0).times
       expect( host ).to receive( :add_env_var ).exactly(0).times
       opts.each_pair do |key, value|
@@ -602,6 +628,7 @@ describe Beaker do
         :env2_key => :env2_value
       }
 
+      allow( host ).to receive( :skip_set_env? ).and_return(nil )
       expect( subject ).to receive( :construct_env ).and_return( opts )
       expect( host ).to receive( method_call_sym )
 

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -76,6 +76,7 @@ module Beaker
       context "if :disable_iptables option set false" do
         it "does not call disable_iptables" do
           options[:disable_iptables] = false
+          allow( hypervisor ).to receive( :set_env )
           expect( hypervisor ).to receive( :disable_iptables ).never
           hypervisor.configure
         end
@@ -84,6 +85,7 @@ module Beaker
       context "if :disable_iptables option set true" do
         it "calls disable_iptables once" do
           options[:disable_iptables] = true
+          allow( hypervisor ).to receive( :set_env )
           expect( hypervisor ).to receive( :disable_iptables ).exactly( 1 ).times
           hypervisor.configure
         end
@@ -92,6 +94,7 @@ module Beaker
       context "if :disable_updates option set true" do
         it "calls disable_updates" do
           options[:disable_updates] = true
+          allow( hypervisor ).to receive( :set_env )
           expect( hypervisor ).to receive( :disable_updates ).once
           hypervisor.configure
         end
@@ -100,6 +103,7 @@ module Beaker
       context "if :disable_updates option set false" do
         it "does not call disable_updates_puppetlabs_com" do
           options[:disable_updates] = false
+          allow( hypervisor ).to receive( :set_env )
           expect( hypervisor ).to receive( :disable_updates ).never
           hypervisor.configure
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.32.1
+  version: 2.33.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -489,6 +489,8 @@ files:
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-21-x86_64.repo
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-i386.repo
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-x86_64.repo
+- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-i386.repo
+- acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-x86_64.repo
 - acceptance/lib/beaker/acceptance/install_utils.rb
 - acceptance/lib/helpers/test_helper.rb
 - acceptance/pre_suite/README.md