beaker 3.11.0 → 3.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTYxNmZjMGE0NTRhOGYxZWQ0YjI2MWI3MjgwMmU3YmI2YzE5YzRkMg==
+    MGJkNWQ2MjM2NzVmMjFiMzIzNDUwMzBhNGRkMDUzMzFlNjk1ZTk2OA==
   data.tar.gz: !binary |-
-    ODljNWVjNDQ1YzExNTU3Y2YwNWM3N2EwZTkwNWE2YTYxZGY1Mzg3YQ==
+    MTVlOGIwNTBlNmRmOTgyMjc1YzBkZWE3NzU3YzIxZTBmNjc5YWIyMA==
 SHA512:
   metadata.gz: !binary |-
-    ZWFiZGJhNTI2M2VmYTBiNWRjODllYmVmYjViYWYwNGI1NDQyY2Q3YTA2OTlh
-    NDIyMzE4MDU3MDE3YTg0OTEzYzIyZDEwMjk3ODdlZWUwZTM0OTJkNzg1ZTA1
-    OTkwZWVhYjBmNzIwODFjNGZkOGNjNTUwYzkwNTFiZDQ0MTliZDM=
+    MDhiOTc5ZWQyMDA3NWE4MmM4ZjA4MTMwOWJkODg1ZjA3N2Q1Mzk4YmEyNzIw
+    OWVhYzE3OTI2YTFiZDkxNmIzNzA2YzI4YWQ5ZTA0YzMzNTk0ZGJhMDU0NzFm
+    OTJkYmFiZjk3NzVhNTVjZGE0ZjY1Yzc3MGYxNjdjYzdhMzE4NGM=
   data.tar.gz: !binary |-
-    NjBjOGMzODJmMjVkZTZkOGU4MDVjMzkzNTI0MGUwNGVhNTU0NjViM2IzMjVk
-    NzNlMzVjNTUzOTBlMTNjZWE0MDdiOGQxZjJjZDJmMDcxZjg1ZTg1NTc0YzE2
-    NDNmNDQzYTFjZmYzOGRiOGM1ZTY3N2M1OWU5ZTZhNDQ5NzVhZjM=
+    NWYyYTNiYzgxMGY3OWIxNWMzNGViMTBlYmIyODI4MGQ3MmFiNzYzMTQzZTg3
+    NzQ5ZGJlZDExZDU0Yzc3OTY5M2RkMmEyYzQ5NDU4ZDVhM2M1Y2ExOThmMjQ5
+    NDQyNGIxOTA1YWE0YWVkMWRjMDUyY2RmMDlhZjhlYTU1ZmY1MTQ=

data/acceptance/tests/subcommands/init.rb

@@ -20,7 +20,7 @@ test_name 'use the init subcommand' do
 
     ['vmpooler', 'vagrant'].each do |hypervisor|
       result = on(default, "beaker init --hypervisor=#{hypervisor}")
-      assert_match(/Writing default host config/, result.stdout)
+      assert_match(/Writing host config.+/, result.stdout)
       assert_equal(0, result.exit_code, "`beaker init --hypervisor=#{hypervisor}` should return a zero exit code")
       step 'ensure that the Rakefile is present' do
         on(default, '[ -e "Rakefile" ]')
@@ -44,4 +44,3 @@ test_name 'use the init subcommand' do
     assert(result.stdout.include?("require 'tempfile'"), 'Rakefile should not contain prepended require')
   end
 end
-

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

@@ -676,9 +676,18 @@ module Beaker
         def sleep_until_puppetdb_started(host, nonssl_port = nil, ssl_port = nil)
           nonssl_port = options[:puppetdb_port_nonssl] if nonssl_port.nil?
           ssl_port = options[:puppetdb_port_ssl] if ssl_port.nil?
-          endpoint = 'status/v1/services/puppetdb-status'
+          pe_ver = host['pe_ver'] || '0'
+          if version_is_less(pe_ver, '2016.1.0') then
+            # the status endpoint was introduced in puppetdb 4.0. The earliest
+            # PE release with the 4.x pdb version was 2016.1.0
+            endpoint = 'pdb/meta/v1/version'
+            expected_regex = '\"version\" \{0,\}: \{0,\}\"[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\"'
+          else
+            endpoint = 'status/v1/services/puppetdb-status'
+            expected_regex = '\"state\" \{0,\}: \{0,\}\"running\"'
+          end
           retry_on(host,
-                   "curl -m 1 http://localhost:#{nonssl_port}/#{endpoint} | grep '\"state\":\"running\"'",
+                   "curl -m 1 http://localhost:#{nonssl_port}/#{endpoint} | grep '#{expected_regex}'",
                    {:max_retries => 120})
           curl_with_retries("start puppetdb (ssl)",
                             host, "https://#{host.node_name}:#{ssl_port}", [35, 60])

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -436,7 +436,11 @@ module Beaker
         # @api private
         def install_puppet_from_rpm_on( hosts, opts )
           block_on hosts do |host|
-            install_puppetlabs_release_repo(host)
+            if host[:type] == 'aio'
+              install_puppetlabs_release_repo(host,'pc1',opts)
+            else
+              install_puppetlabs_release_repo(host,nil,opts)
+            end
 
             if opts[:facter_version]
               host.install_package("facter-#{opts[:facter_version]}")
@@ -922,6 +926,7 @@ module Beaker
                 # cisco ios xr requires using yum to localinstall the repo
                 on host, "yum -y localinstall #{remote}"
               else
+                opts[:package_proxy] ||= false
                 host.install_package_with_rpm( remote, '--replacepkgs',
                   { :package_proxy => opts[:package_proxy] } )
               end

data/lib/beaker/subcommand.rb

@@ -7,14 +7,19 @@ module Beaker
     SubcommandUtil = Beaker::Subcommands::SubcommandUtil
 
     desc "init", "Initialises the beaker test environment configuration"
-    option :hypervisor, :type => :string, :required => true
+    option :hypervisor, :type => :string, :enum => %w{vagrant vmpooler}
+    option :help, :type => :boolean, :hide => true
     long_desc <<-LONGDESC
       Initialises a beaker environment configuration
     LONGDESC
     def init()
-      SubcommandUtil.verify_init_args(options)
+      if options[:help]
+        invoke :help, [], ["init"]
+        return
+      end
       SubcommandUtil.require_tasks()
       SubcommandUtil.init_hypervisor(options)
+      say "Writing host config to .beaker/acceptance/config/default_#{options[:hypervisor]}_hosts.yaml"
     end
   end
 end

data/lib/beaker/subcommands/subcommand_util.rb

@@ -1,4 +1,5 @@
 require 'rake'
+require 'stringio'
 
 module Beaker
   module Subcommands
@@ -12,8 +13,8 @@ module Beaker
     # - execute the vagrant quickstart task
     # - execute the vmpooler quickstart task
     # - exit with a specific message
-    # - verify that the init subcommand has the correct arguments
     # - execute the quick start task for the specified hypervisor
+    # - capture stdout and stderr
     module SubcommandUtil
       BEAKER_REQUIRE = "require 'beaker/tasks/quick_start'"
       HYPERVISORS = ["vagrant", "vmpooler"]
@@ -72,7 +73,7 @@ module Beaker
       # @param [String] task the rake task to execute
       def self.execute_rake_task(task)
         rake_app.load_rakefile()
-        rake_app.invoke_task(task)
+        with_captured_output { rake_app.invoke_task(task) }
       end
 
       # Execute the quick start task for vagrant
@@ -92,14 +93,6 @@ module Beaker
         exit(0)
       end
 
-      # Verify that a valid hypervisor has been specified
-      # @param [Array<Object>] options the options we want to query
-      def self.verify_init_args(options)
-        unless HYPERVISORS.include?(options[:hypervisor])
-          exit_with("Invalid hypervisor. Currently supported hypervisors are: #{HYPERVISORS.join(', ')}")
-        end
-      end
-
       # Call the quick start task for the specified hypervisor
       # @param [Array<Object>] options the options we want to query
       def self.init_hypervisor(options)
@@ -110,6 +103,20 @@ module Beaker
           init_vmpooler
         end
       end
+
+      # Execute a task but capture stdout and stderr to a buffer
+      def self.with_captured_output
+        begin
+          old_stdout = $stdout.clone
+          old_stderr = $stderr.clone
+          $stdout = StringIO.new
+          $stderr = StringIO.new
+          yield
+        ensure
+          $stdout = old_stdout
+          $stderr = old_stderr
+        end
+      end
     end
   end
 end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.11.0'
+    STRING = '3.12.0'
   end
 end

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -1115,6 +1115,27 @@ describe ClassMixedWithDSLHelpers do
       expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8085/, anything() ).once.ordered
       subject.sleep_until_puppetdb_started( host, nil, 8085 )
     end
+
+    context 'when pe_ver is less than 2016.1.0' do
+      it 'uses the version endpoint' do
+        host = hosts[0]
+        host['pe_ver'] = '2015.3.3'
+        expect( subject ).to receive( :retry_on ).with( anything(), /pdb\/meta\/v1\/version/, anything() ).once.ordered
+        expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8081/, anything() ).once.ordered
+        subject.sleep_until_puppetdb_started( host )
+      end
+    end
+
+    context 'when pe_ver is greater than 2015.9.9' do
+      it 'uses the status endpoint' do
+        host = hosts[0]
+        host['pe_ver'] = '2016.1.0'
+        expect( subject ).to receive( :retry_on ).with( anything(), /status\/v1\/services\/puppetdb-status/, anything() ).once.ordered
+        expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8081/, anything() ).once.ordered
+        subject.sleep_until_puppetdb_started( host )
+      end
+    end
+
   end
 
   describe '#sleep_until_puppetserver_started' do

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -57,6 +57,17 @@ describe ClassMixedWithDSLInstallUtils do
                                                 :working_dir => '/tmp',
                                                 :type => 'foss',
                                                 :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
+  let(:el6hostaio)    { make_host( 'el6hostaio', { :platform => Beaker::Platform.new('el-6-i386'),
+                                                 :pe_ver => '3.0',
+                                                 :working_dir => '/tmp',
+                                                :type => 'aio',
+                                                 :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-centos-6-i386' } ) }
+  let(:el6hostfoss)   { make_host( 'el6hostfoss', { :platform => Beaker::Platform.new('el-6-i386'),
+                                                 :pe_ver => '3.0',
+                                                 :working_dir => '/tmp',
+                                                :type => 'foss',
+                                                 :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-centos-6-i386' } ) }
+
   let(:win_temp)      { 'C:\\Windows\\Temp' }
 
 
@@ -257,6 +268,20 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  context 'install_puppet_from_rpm_on' do
+    it 'installs PC1 release repo when AIO' do
+      expect(subject).to receive(:install_puppetlabs_release_repo).with(el6hostaio,'pc1',{})
+
+      subject.install_puppet_from_rpm_on( el6hostaio, {}  )
+    end
+
+    it 'installs non-PC1 package when not-AIO' do
+      expect(subject).to receive(:install_puppetlabs_release_repo).with(el6hostfoss,nil,{})
+
+      subject.install_puppet_from_rpm_on( el6hostfoss, {}  )
+    end
+  end
+
   context 'install_puppet_from_freebsd_ports_on' do
     it 'installs puppet on FreeBSD 9' do
       expect(freebsdhost9).to receive(:install_package).with('puppet')

data/spec/beaker/subcommand/subcommand_util_spec.rb

@@ -108,40 +108,6 @@ module Beaker
         end
       end
 
-      describe 'verify_init_args' do
-        it "verfy the init args are valid for a vagrant run" do
-          options = {:hypervisor => "vagrant"}
-          expect(subject).to receive(:exit_with).exactly(0).times
-          subject.verify_init_args(options)
-        end
-
-        it "verfy the init args are valid for a vmpooler run" do
-          options = {:hypervisor => "vmpooler"}
-          expect(subject).to receive(:exit_with).exactly(0).times
-          subject.verify_init_args(options)
-        end
-
-        it "verify the init args are invalid for an init run" do
-          options = {}
-          expect(STDOUT).to receive(:puts).with("Invalid hypervisor. Currently supported hypervisors are: #{Beaker::Subcommands::SubcommandUtil::HYPERVISORS.join(', ')}").exactly(1).times
-          begin
-            subject.verify_init_args(options)
-          rescue SystemExit=>e
-            expect(e.status).to eq(0)
-          end
-        end
-
-        it "verify the init args are invalid for a vmpooler run" do
-          options = {:hypervisor => "thisshouldfail"}
-          expect(STDOUT).to receive(:puts).with("Invalid hypervisor. Currently supported hypervisors are: #{Beaker::Subcommands::SubcommandUtil::HYPERVISORS.join(', ')}").exactly(1).times
-          begin
-            subject.verify_init_args(options)
-          rescue SystemExit=>e
-            expect(e.status).to eq(0)
-          end
-        end
-      end
-
       describe "determine_rake_file" do
 
         it "uses Rakefile if no rakefile exists" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec