beaker 2.46.0 → 2.47.0

data/lib/beaker/tasks/quick_start.rb

@@ -0,0 +1,49 @@
+require 'beaker-hostgenerator'
+
+namespace :beaker_quickstart do
+
+  desc 'Generate Default Beaker Host Config File'
+  task :gen_hosts do
+    cli = BeakerHostGenerator::CLI.new(['redhat7-64default.mdcal-redhat7-64af'])
+    FileUtils.mkdir_p('acceptance/config') # -p ignores when dir already exists
+    File.open("acceptance/config/default_hosts.yaml", 'w') do |fh|
+      fh.print(cli.execute)
+    end
+  end
+
+  desc 'Generate Default Pre-Suite'
+  task :gen_pre_suite do
+    FileUtils.mkdir_p('acceptance/setup') # -p ignores when dir already exists
+    File.open("acceptance/setup/default_pre_suite.rb", 'w') do |fh|
+      fh.print('install_puppet')
+    end
+  end
+
+  desc 'Generate Default Smoke Test'
+  task :gen_smoke_test do
+    FileUtils.mkdir_p('acceptance/tests') # -p ignores when dir already exists
+    File.open("acceptance/tests/default_smoke_test.rb", 'w') do |fh|
+      fh.print("test_name 'puppet install smoketest'
+step 'puppet install smoketest: verify \\'puppet help\\' can be successfully called on
+all hosts'
+    hosts.each do |host|
+      on host, puppet('help')
+    end")
+    end
+  end
+
+  desc 'Run Default Smoke Test'
+  task :run => ['beaker_quickstart:gen_hosts', 'beaker_quickstart:gen_pre_suite', 'beaker_quickstart:gen_smoke_test'] do
+    system(beaker_command)
+  end
+
+end
+
+def beaker_command
+  cmd_parts = []
+  cmd_parts << "beaker"
+  cmd_parts << "--hosts acceptance/config/default_hosts.yaml"
+  cmd_parts << "--pre-suite acceptance/setup/default_pre_suite.rb"
+  cmd_parts << "--tests acceptance/tests/default_smoke_test.rb"
+  cmd_parts.flatten.join(" ")
+end

data/lib/beaker/tasks/rake_task.rb

@@ -97,7 +97,7 @@ module Beaker
         cmd_parts = []
         cmd_parts << "beaker"
         cmd_parts << "--keyfile #{@keyfile}" if @keyfile
-        cmd_parts << "--hosts #{@hosts}" if @hosts
+        cmd_parts << "--hosts #{@hosts}" if (@hosts!=nil && !@hosts.empty?)
         cmd_parts << "--tests #{tests}" if @tests
         cmd_parts << "--options-file #{@options_file}" if @options_file
         cmd_parts << "--type #{@type}" if @type

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.46.0'
+    STRING = '2.47.0'
   end
 end

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

@@ -77,6 +77,22 @@ describe ClassMixedWithDSLHelpers do
       subject.on( :master, 'echo hello')
     end
 
+    it 'executes in parallel if run_in_parallel=true' do
+      InParallel::InParallelExecutor.logger = logger
+      FakeFS.deactivate!
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      expected = []
+      hosts.each_with_index do |host, i|
+        expected << i
+        allow( host ).to receive( :exec ).and_return( i )
+      end
+
+      # This will only get hit if forking processes is supported and at least 2 items are being submitted to run in parallel
+      expect( InParallel::InParallelExecutor ).to receive(:_execute_in_parallel).with(any_args).and_call_original.exactly(5).times
+      results = subject.on( hosts, command, {:run_in_parallel => true})
+      expect( results ).to be == expected
+    end
+
     it 'delegates to itself for each host passed' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
       expected = []

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

@@ -109,6 +109,28 @@ describe ClassMixedWithDSLHelpers do
       expect(result).to be_an(Array)
     end
 
+    it 'operates on an array of hosts in parallel' do
+      InParallel::InParallelExecutor.logger = logger
+      FakeFS.deactivate!
+      # This will only get hit if forking processes is supported and at least 2 items are being submitted to run in parallel
+      expect( InParallel::InParallelExecutor ).to receive(:_execute_in_parallel).with(any_args).and_call_original.exactly(2).times
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      the_hosts = [master, agent]
+
+      allow( subject ).to receive( :create_remote_file ).and_return( true )
+      the_hosts.each do |host|
+        allow( subject ).to receive( :puppet ).
+            and_return( 'puppet_command' )
+
+        allow( subject ).to receive( :on ).
+            with( host, 'puppet_command', :acceptable_exit_codes => [0] )
+      end
+
+      result = nil
+      result = subject.apply_manifest_on( the_hosts, 'include foobar', { :run_in_parallel => true } )
+      expect(result).to be_an(Array)
+    end
+
     it 'adds acceptable exit codes with :catch_failures' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
       expect( subject ).to receive( :create_remote_file ).and_return( true )
@@ -402,6 +424,46 @@ describe ClassMixedWithDSLHelpers do
       subject.stop_agent_on( el_agent )
     end
 
+    it 'can run on an array of hosts' do
+      vardir = '/var'
+      el_agent = make_host( 'el', :platform => 'el-5-x86_64', :pe_ver => '4.0' )
+      el_agent2 = make_host( 'el', :platform => 'el-5-x86_64', :pe_ver => '4.0' )
+
+      allow( el_agent ).to receive( :puppet_configprint ).and_return( { 'vardir' => vardir } )
+
+      expect( el_agent ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
+
+      allow( el_agent2 ).to receive( :puppet_configprint ).and_return( { 'vardir' => vardir } )
+
+      expect( el_agent2 ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
+
+      expect( subject ).to receive( :puppet_resource ).with( "service", "puppet", "ensure=stopped").twice
+      expect( subject ).to receive( :on ).twice
+
+      subject.stop_agent_on( [el_agent, el_agent2] )
+    end
+
+    it 'runs in parallel with run_in_parallel=true' do
+      InParallel::InParallelExecutor.logger = logger
+      FakeFS.deactivate!
+      vardir = '/var'
+      el_agent = make_host( 'el', :platform => 'el-5-x86_64', :pe_ver => '4.0' )
+      el_agent2 = make_host( 'el', :platform => 'el-5-x86_64', :pe_ver => '4.0' )
+
+      allow( el_agent ).to receive( :puppet_configprint ).and_return( { 'vardir' => vardir } )
+
+      allow( el_agent ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
+
+      allow( el_agent2 ).to receive( :puppet_configprint ).and_return( { 'vardir' => vardir } )
+
+      allow( el_agent2 ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
+
+      # This will only get hit if forking processes is supported and at least 2 items are being submitted to run in parallel
+      expect( InParallel::InParallelExecutor ).to receive(:_execute_in_parallel).with(any_args).and_call_original.exactly(2).times
+
+      subject.stop_agent_on( [el_agent, el_agent2], { :run_in_parallel => true} )
+    end
+
   end
 
   describe "#stop_agent" do
@@ -449,6 +511,22 @@ describe ClassMixedWithDSLHelpers do
       subject.sign_certificate_for( agent )
     end
 
+    it 'accepts an array of hosts to validate' do
+      allow( subject ).to receive( :sleep ).and_return( true )
+
+      result.stdout = "+ \"#{agent}\" + \"#{custom}\""
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+
+      allow( subject ).to receive( :puppet ) do |arg|
+        arg
+      end
+      expect( subject ).to receive( :on ).with( master, "agent -t", :acceptable_exit_codes => [0, 1, 2]).once
+      expect( subject ).to receive( :on ).with( master, "cert --allow-dns-alt-names sign master", :acceptable_exit_codes => [0, 24]).once
+      expect( subject ).to receive( :on ).with( master, "cert --sign --all --allow-dns-alt-names", :acceptable_exit_codes => [0,24]).once
+      expect( subject ).to receive( :on ).with( master, "cert --list --all").once.and_return( result )
+
+      subject.sign_certificate_for( [master, agent, custom] )
+    end
   end
 
   describe "#sign_certificate" do

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

@@ -427,6 +427,18 @@ describe ClassMixedWithDSLInstallUtils do
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
+      it 'installs in parallel' do
+        InParallel::InParallelExecutor.logger = logger
+        FakeFS.deactivate!
+        hosts.each{ |host|
+          allow(host).to receive(:install_package_with_rpm).with(/puppetlabs-release-el-6\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
+          allow(host).to receive(:install_package).with('puppet')
+        }
+        opts[:run_in_parallel] = true
+        # This will only get hit if forking processes is supported and at least 2 items are being submitted to run in parallel
+        expect( InParallel::InParallelExecutor ).to receive(:_execute_in_parallel).with(any_args).and_call_original.exactly(3).times
+        subject.install_puppet(opts)
+      end
       it 'installs specific version of puppet when passed :version' do
         expect(hosts[0]).to receive(:install_package).with('puppet-3')
         subject.install_puppet( :version => '3' )

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -89,7 +89,7 @@ describe Beaker do
     it "can sync time on unix hosts" do
       hosts = make_hosts( { :platform => 'unix' } )
 
-      expect( Beaker::Command ).to receive( :new ).with("ntpdate -t 20 #{ntpserver}").exactly( 3 ).times
+      expect( Beaker::Command ).to receive( :new ).with("ntpdate -u -t 20 #{ntpserver}").exactly( 3 ).times
 
       subject.timesync( hosts, options )
     end
@@ -98,7 +98,7 @@ describe Beaker do
       hosts = make_hosts( { :platform => 'unix', :exit_code => [1, 0] } )
       allow( subject ).to receive( :sleep ).and_return(true)
 
-      expect( Beaker::Command ).to receive( :new ).with("ntpdate -t 20 #{ntpserver}").exactly( 6 ).times
+      expect( Beaker::Command ).to receive( :new ).with("ntpdate -u -t 20 #{ntpserver}").exactly( 6 ).times
 
       subject.timesync( hosts, options )
     end
@@ -107,7 +107,7 @@ describe Beaker do
       hosts = make_hosts( { :platform => 'unix', :exit_code => 1 } )
       allow( subject ).to receive( :sleep ).and_return(true)
 
-      expect( Beaker::Command ).to receive( :new ).with("ntpdate -t 20 #{ntpserver}").exactly( 5 ).times
+      expect( Beaker::Command ).to receive( :new ).with("ntpdate -u -t 20 #{ntpserver}").exactly( 5 ).times
 
       expect{ subject.timesync( hosts, options ) }.to raise_error(/NTP date was not successful after/)
     end
@@ -136,7 +136,7 @@ describe Beaker do
     it "can set time server on unix hosts" do
       hosts = make_hosts( { :platform => 'unix' } )
 
-      expect( Beaker::Command ).to receive( :new ).with("ntpdate -t 20 #{ntpserver_set}").exactly( 3 ).times
+      expect( Beaker::Command ).to receive( :new ).with("ntpdate -u -t 20 #{ntpserver_set}").exactly( 3 ).times
 
       subject.timesync( hosts, options_ntp )
     end

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -75,7 +75,7 @@ module Beaker
 
       context 'if :timesync option set true on host' do
         it 'does call timesync for host' do
-          hosts[0][:timesync] = true
+          hosts[0].options[:timesync] = true
           allow( hypervisor ).to receive( :set_env )
           expect( hypervisor ).to receive( :timesync ).once
           hypervisor.configure
@@ -85,13 +85,29 @@ module Beaker
       context 'if :timesync option set true but false on host' do
         it 'does not call timesync for host' do
           options[:timesync] = true
-          hosts[0][:timesync] = false
+          hosts[0].options[:timesync] = false
           allow( hypervisor ).to receive( :set_env )
           expect( hypervisor ).to_not receive( :timesync )
           hypervisor.configure
         end
       end
 
+      context 'if :run_in_parallel option includes configure' do
+        it 'timesync is run in parallel' do
+          InParallel::InParallelExecutor.logger = logger
+          # Need to deactivate FakeFS since the child processes write STDOUT to file.
+          FakeFS.deactivate!
+          hosts[0].options[:timesync] = true
+          hosts[1].options[:timesync] = true
+          hosts[2].options[:timesync] = true
+          options[:run_in_parallel] = ['configure']
+          allow( hypervisor ).to receive( :set_env )
+          # This will only get hit if forking processes is supported and at least 2 items are being submitted to run in parallel
+          expect( InParallel::InParallelExecutor ).to receive(:_execute_in_parallel).with(any_args).and_call_original.exactly(3).times
+          hypervisor.configure
+        end
+      end
+
       context "if :disable_iptables option set false" do
         it "does not call disable_iptables" do
           options[:disable_iptables] = false

data/spec/beaker/options/presets_spec.rb

@@ -18,6 +18,12 @@ module Beaker
          ENV.delete('q_puppet_cloud_install')
       end
 
+      it "correctly parses the run_in_parallel array" do
+        ENV['BEAKER_RUN_IN_PARALLEL'] = "install,configure"
+        env = presets.env_vars
+        expect(env[:run_in_parallel]).to eq(['install', 'configure'])
+      end
+
       it "removes all empty/nil entries in env_vars" do
         expect(presets.env_vars.has_value?(nil)).to be === false
         expect(presets.env_vars.has_value?({})).to be === false

data/spec/beaker/shared/host_manager_spec.rb

@@ -2,7 +2,14 @@ require 'spec_helper'
 
 module Beaker
   module Shared
+
+    config = RSpec::Mocks.configuration
+
+    config.patch_marshal_to_support_partial_doubles = true
+
     describe HostManager do
+      # The logger double as nil object doesn't work with marshal.load and marshal.unload needed for run_in_parallel.
+      let( :logger )         { double('logger') }
       let( :host_handler )   { Beaker::Shared::HostManager }
       let( :spec_block )     { Proc.new { |arr| arr } }
       let( :platform )       { @platform || 'unix' }
@@ -135,6 +142,36 @@ module Beaker
           expect( myhosts ).to be  === hosts
         end
 
+        it "can execute a block against an array of hosts in parallel" do
+          InParallel::InParallelExecutor.logger = Logger.new(STDOUT)
+          FakeFS.deactivate!
+
+          expect( InParallel::InParallelExecutor ).to receive(:_execute_in_parallel).with(any_args).and_call_original.exactly(3).times
+
+          myhosts = host_handler.run_block_on( hosts, nil, { :run_in_parallel => true } ) do |host|
+            # kind of hacky workaround to remove logger which contains a singleton method injected by rspec
+
+            host.instance_eval("remove_instance_variable(:@logger)")
+            host
+          end
+
+          # After marshal load and marshal unload, the logger option (an rspec double) is no longer 'equal' to the original.
+          # Array of results can be in different order.
+          new_host = myhosts.select{ |host| host.name == hosts[0].name}.first
+          hosts[0].options.each { |option|
+            expect(option[1]).to eq(new_host.options[option[0]]) unless option[0] == :logger
+          }
+        end
+
+        it "does not run in parallel if there is only 1 host in the array" do
+          myhosts = host_handler.run_block_on( [hosts[0]], nil, { :run_in_parallel => true } ) do |host|
+            puts host
+            host
+          end
+
+          expect( myhosts ).to be  === [hosts[0]]
+        end
+
         it "receives an ArgumentError on empty host" do
           expect { host_handler.run_block_on( [], role0 ) }.to raise_error(ArgumentError)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.46.0
+  version: 2.47.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: beaker-hostgenerator
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: markdown
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -137,19 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +276,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: in-parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: beaker-answers
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +346,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: beaker-hostgenerator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -615,6 +657,7 @@ files:
 - docs/hypervisors/vsphere.md
 - docs/meta/README.md
 - docs/meta/ticket_process.md
+- docs/runner/run_in_parallel.md
 - docs/runner/test_run.md
 - docs/runner/test_suites.md
 - ext/completion/beaker-completion.bash
@@ -723,6 +766,7 @@ files:
 - lib/beaker/shared/semvar.rb
 - lib/beaker/shared/timed.rb
 - lib/beaker/ssh_connection.rb
+- lib/beaker/tasks/quick_start.rb
 - lib/beaker/tasks/rake_task.rb
 - lib/beaker/tasks/test.rb
 - lib/beaker/test_case.rb