beaker 3.35.0 → 3.36.0

data/docs/tutorials/the_command_line.md

@@ -1,13 +1,19 @@
 # The Command Line
+
 * Using the gem
 
-        $ beaker --log-level debug --hosts sample.cfg --tests test.rb
+```console
+    $ beaker --log-level debug --hosts sample.cfg --tests test.rb
+```
 
 * Using latest git
 
-        $ bundle exec beaker --log-level debug --hosts sample.cfg --tests test.rb
+```console
+    $ bundle exec beaker --log-level debug --hosts sample.cfg --tests test.rb
+```
 
 ## Useful options
+
 * `-h, --hosts FILE `, the hosts that you are going to be testing with
 * `--log-level debug`, for providing verbose logging and full stacktraces on failure
 * `--[no-]provision`, indicates if beaker should provision new boxes upon test execution. If `no` is selected then beaker will attempt to connect to the hosts as defined in `--hosts FILE` without first creating/running them through their hypervisors
@@ -15,11 +21,17 @@
 * `--parse-only`, read and parse all command line options, environment options and file options; report the parsed options and exit.
 
 ## The Rest
+
 See all options with
+
 * Using the gem
 
+```console
         $ beaker --help
+```
 
 * Using latest git
 
+```console
         $ bundle exec beaker --help
+```

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

@@ -417,8 +417,15 @@ module Unix::Pkg
         puppet_collection, puppet_agent_version, opts )
     when /^(sles|aix|el|centos|oracle|redhat|scientific)$/
       variant = 'el' if variant.match(/(?:el|centos|oracle|redhat|scientific)/)
-      arch = 'ppc' if variant == 'aix' && arch == 'power'
-      version = '7.1' if variant == 'aix' && version == '7.2'
+      if variant == 'aix'
+        arch = 'ppc' if arch == 'power'
+        version_x, version_y = /^(\d+)\.(\d+)/.match(puppet_agent_version).captures.map(&:to_i)
+        if version_x < 5 || version_x == 5 && version_y < 99 # 5.99.z indicates pre-release puppet6
+          version = '7.1' if version == '7.2'
+        else
+          version = '6.1'
+        end
+      end
       release_path_end = "#{variant}/#{version}/#{puppet_collection}/#{arch}"
       release_file = "puppet-agent-#{puppet_agent_version}-1.#{variant}#{version}.#{arch}.rpm"
     else

data/lib/beaker/host_prebuilt_steps.rb

@@ -258,7 +258,7 @@ module Beaker
           if result.exit_code == 1
             url_base = opts[:epel_url]
             url_base = opts[:epel_url_archive] if host['platform'].version == '5'
-            host.exec(Command.new("rpm -i#{debug_opt} #{url_base}/epel-release-latest-#{host['platform'].version}.noarch.rpm"))
+            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"))
             #remove mirrorlist

data/lib/beaker/shared/host_manager.rb

@@ -33,9 +33,10 @@ module Beaker
       #@param [Array<Host>] hosts The hosts to examine
       #@param [String] role The host returned will have this role in its role list
       #@return [Host] The single host with the desired role in its roles list
-      #@raise [ArgumentError] Raised if more than one host has the given role defined, or if no host has the
-      #                       role defined.
+      #@raise [ArgumentError] Raised if more than one host has the given role defined, if no host has the
+      #                       role defined, or if role = nil since hosts_with_role(nil) returns all hosts.
       def only_host_with_role(hosts, role)
+        raise ArgumentError, "role cannot be nil." if role.nil?
         a_host = hosts_with_role(hosts, role)
         case
           when a_host.length == 0
@@ -53,8 +54,10 @@ module Beaker
       # @param [String] role The host returned will have this role in its role list
       # @return [Host] The single host with the desired role in its roles list
       #                     or nil if no host is found
-      # @raise [ArgumentError] Raised if more than one host has the given role defined
+      # @raise [ArgumentError] Raised if more than one host has the given role defined,
+      #   or if role = nil since hosts_with_role(nil) returns all hosts.
       def find_at_most_one_host_with_role(hosts, role)
+        raise ArgumentError, "role cannot be nil." if role.nil?
         role_hosts = hosts_with_role(hosts, role)
         host_with_role = nil
         case role_hosts.length

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.35.0'
+    STRING = '3.36.0'
   end
 end

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

@@ -288,26 +288,75 @@ module Beaker
     end
 
     describe '#puppet_agent_dev_package_info' do
-      puppet_collection = 'PC1'
-      puppet_agent_version = '1.2.3'
-      platforms = { 'solaris-10-x86_64' => ["solaris/10/#{puppet_collection}", "puppet-agent-#{puppet_agent_version}-1.i386.pkg.gz"],
-                    'solaris-11-x86_64' => ["solaris/11/#{puppet_collection}", "puppet-agent@#{puppet_agent_version},5.11-1.i386.p5p"],
-                    'sles-11-x86_64' => ["sles/11/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.sles11.x86_64.rpm"],
-                    'aix-5.3-power' => ["aix/5.3/#{puppet_collection}/ppc", "puppet-agent-#{puppet_agent_version}-1.aix5.3.ppc.rpm"],
-                    'el-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
-                    'centos-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
-                    'oracle-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
-                    'redhat-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
-                    'scientific-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"]
-                  }
-      platforms.each do |p, v|
-        it "accomodates platform #{p} without erroring" do
-          platform = Beaker::Platform.new(p)
-          @opts = {'platform' => platform}
+      let(:download_opts) {{download_url: 'http://trust.me'}}
+
+      # These platforms are consistent across puppet collections
+      shared_examples 'consistent platforms' do |puppet_collection, puppet_agent_version|
+        platforms = { 'solaris-10-x86_64' => ["solaris/10/#{puppet_collection}", "puppet-agent-#{puppet_agent_version}-1.i386.pkg.gz"],
+                      'solaris-11-x86_64' => ["solaris/11/#{puppet_collection}", "puppet-agent@#{puppet_agent_version},5.11-1.i386.p5p"],
+                      'sles-11-x86_64' => ["sles/11/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.sles11.x86_64.rpm"],
+                      'aix-6.1-power' => ["aix/6.1/#{puppet_collection}/ppc", "puppet-agent-#{puppet_agent_version}-1.aix6.1.ppc.rpm"],
+                      'el-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                      'centos-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                      'oracle-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                      'redhat-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                      'scientific-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                    }
+        platforms.each do |p, v|
+          it "accomodates platform #{p} without erroring" do
+            @opts = {'platform' => Beaker::Platform.new(p)}
+            allow( instance ).to receive(:link_exists?).and_return(true)
+            expect( instance.puppet_agent_dev_package_info(puppet_collection, puppet_agent_version, download_opts) ).to eq(v)
+          end
+        end
+      end
+
+      # AIX platform/package pairs differ accross collections
+      shared_examples 'aix platform' do |package_version, platform_version, puppet_collection, puppet_agent_version|
+        it "selects AIX #{package_version} packages for AIX #{platform_version}" do
+          @opts = { 'platform' => Beaker::Platform.new("aix-#{platform_version}-power") }
           allow( instance ).to receive(:link_exists?).and_return(true)
-          expect( instance.puppet_agent_dev_package_info( puppet_collection, puppet_agent_version, { :download_url => 'http://trust.me' } )).to eq(v)
+          expect( instance.puppet_agent_dev_package_info(puppet_collection, puppet_agent_version, download_opts) )
+            .to eq(["aix/#{package_version}/#{puppet_collection}/ppc", "puppet-agent-#{puppet_agent_version}-1.aix#{package_version}.ppc.rpm"])
         end
       end
+
+      context 'with puppet-agent 1.y.z' do
+        puppet_collection = 'PC1'
+        puppet_agent_version = '1.2.3'
+
+        include_examples 'consistent platforms', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '5.3', '5.3', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '7.1', '7.1', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '7.1', '7.2', puppet_collection, puppet_agent_version
+      end
+
+      context 'with puppet-agent 5.y.z' do
+        puppet_collection = 'puppet5'
+        puppet_agent_version = '5.4.3'
+
+        include_examples 'consistent platforms', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '7.1', '7.1', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '7.1', '7.2', puppet_collection, puppet_agent_version
+      end
+
+      context 'with puppet-agent 5.99.z' do
+        puppet_collection = 'puppet6'
+        puppet_agent_version = '5.99.0'
+
+        include_examples 'consistent platforms', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '6.1', '7.1', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '6.1', '7.2', puppet_collection, puppet_agent_version
+      end
+
+      context 'with puppet6' do
+        puppet_collection = 'puppet6'
+        puppet_agent_version = '6.6.6'
+
+        include_examples 'consistent platforms', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '6.1', '7.1', puppet_collection, puppet_agent_version
+        include_examples 'aix platform', '6.1', '7.2', puppet_collection, puppet_agent_version
+      end
     end
 
     describe '#upgrade_package' do

data/spec/beaker/host/unix_spec.rb

@@ -171,11 +171,11 @@ module Unix
       end
 
       it 'sets the arch correctly on aix-power platforms' do
-        @platform = 'aix-14-power'
+        @platform = 'aix-6.1-power'
         release_path_end, release_file = host.puppet_agent_dev_package_info(
-          'pa_collection', 'pa_version2' )
-        expect( release_path_end ).to be === "aix/14/pa_collection/ppc"
-        expect( release_file ).to be === "puppet-agent-pa_version2-1.aix14.ppc.rpm"
+          'pa_collection', '6.0.0' )
+        expect( release_path_end ).to be === "aix/6.1/pa_collection/ppc"
+        expect( release_file ).to be === "puppet-agent-6.0.0-1.aix6.1.ppc.rpm"
       end
     end
 

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -318,9 +318,11 @@ describe Beaker do
       expect( Beaker::Command ).to receive( :new ).with(
         "rpm -qa | grep epel-release"
       ).exactly( 2 ).times
-      expect( Beaker::Command ).to receive( :new ).with(
-        "rpm -i http://archive.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm"
-      ).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
@@ -345,9 +347,11 @@ describe Beaker do
       expect( Beaker::Command ).to receive( :new ).with(
         "rpm -qa | grep epel-release"
       ).exactly( 4 ).times
-      expect( Beaker::Command ).to receive( :new ).with(
-        "rpm -i http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
-      ).exactly( 4 ).times
+      hosts.each do |host|
+        expect(host).to receive( :install_package_with_rpm ).with(
+          "http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm", "--replacepkgs", {:package_proxy => false}
+        ).once
+      end
       expect( Beaker::Command ).to receive( :new ).with(
         "sed -i -e 's;#baseurl.*$;baseurl=http://dl\\.fedoraproject\\.org/pub/epel/6/$basearch;' /etc/yum.repos.d/epel.repo"
       ).exactly( 4 ).times

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -30,11 +30,11 @@ module Beaker
       end
 
       it "gives highest precedence to preference specified in host file followed by hypervisor" do
-        hosts[0].options[:ssh_preference] = ['set', 'in', 'hostfile']
+        hosts[0].options[:ssh_preference] = [:set, :in, :hostfile]
         hypervisor.create('none', hosts, make_opts())
         allow(hypervisor).to receive(:connection_preference).and_return([:hypervisor, :pref])
         hypervisor.set_ssh_connection_preference(hosts, hypervisor)
-        expect(hosts[0][:ssh_connection_preference]).to eq(['set', 'in', 'hostfile', :hypervisor, :pref, :ip, :vmhostname, :hostname])
+        expect(hosts[0][:ssh_connection_preference]).to eq([:set, :in, :hostfile, :hypervisor, :pref, :ip, :vmhostname, :hostname])
       end
 
     end

data/spec/beaker/shared/host_manager_spec.rb

@@ -98,6 +98,10 @@ module Beaker
           expect{ host_handler.only_host_with_role( hosts, 'surprise' ) }.to raise_error(ArgumentError)
 
         end
+
+        it "throws an error when role = nil" do
+          expect{ host_handler.find_at_most_one_host_with_role( hosts, nil ) }.to raise_error(ArgumentError)
+        end
       end
 
       context "#find_at_most_one_host_with_role" do
@@ -118,6 +122,10 @@ module Beaker
           expect( host_handler.find_at_most_one_host_with_role( hosts, 'surprise' ) ).to be_nil
 
         end
+
+        it "throws an error when role = nil" do
+          expect{ host_handler.find_at_most_one_host_with_role( hosts, nil ) }.to raise_error(ArgumentError)
+        end
       end
 
       context "#run_block_on" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.35.0
+  version: 3.36.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -579,6 +585,7 @@ files:
 - docs/concepts/argument_processing_and_precedence.md
 - docs/concepts/beaker_libraries.md
 - docs/concepts/beaker_vs_beaker_rspec.md
+- docs/concepts/glossary.md
 - docs/concepts/masterless_puppet.md
 - docs/concepts/roles_what_are_they.md
 - docs/concepts/shared_options_for_executing_beaker_commands.md