beaker-pe 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWZjMjMxMzZmYjc5ZWYzN2NiYmYwYmY2YzUyOWM3ZGM2YTZiZWI5MA==
+    ZDZkZGU0MTNmZTVjNjQ5NGM3YTk5OGFhNTNhM2IyMDFjYmQ3MmEyNg==
   data.tar.gz: !binary |-
-    YzAwOTlhOGJhMmUzYWU1Nzg0Y2RmOWNkNGY4MWU3YjlkM2Q0ZTE5OQ==
+    ODE5N2ZmYTdiYzkwOGM2MTIzY2Q0MjIwMGJlNGQ5MjIxYTk5YzEzMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGZhOTYzNzE3MDY2YzUxNTU4ODg4ZWJkM2U4NDFkYmRjYTk3ODNjODA5OTRj
-    MzM3ZGM4ODI5OWEyOTRmYjNkNTEzZmFlYTU5M2M5OTZmNTc0ZDYzZDYzZDQz
-    MjY5YTZmNDA5ZDNiZTdjZDA5MzAyZWUxNTJjMDJlYTQyYTk4MjQ=
+    ZjZhMjJjZWI4ZTE4ZmRhYjExZjNmODdmM2Q5YzAzYTZmZGE5ZWQzMjM4ZTA3
+    NzNiMGQwYzZhZGRiZjc4ZjViMWViYTI3NWMwZmJjOTA5ZTlkMTIyZjVkMDIy
+    ZDA3NzUzMzkxZDE3NGYxMGI0ZWRhNDM1OWNhOTFiZjg2Y2UxYTA=
   data.tar.gz: !binary |-
-    MTUzMzMwNzc3MzFiOTAzMzM1MDlkOWEyZTQ3NGYwNmQ3Y2JiNjNjMjE4YzNk
-    ZWY0MjljM2QyYTQ3OTUxMWQzMTk5N2M1MTEzOTI4ZjZhYjE4YmE4MzNjYzYx
-    MzVkZjdiYTlkYjgwNWMxNzAzNDQyZDkwMzA1NGM4NzZlMGQ5YjU=
+    NWI4NWFmYzA1YTdiMmQyNjIwNzY0ZjA0N2UwOTAzZGQxNjBhODFlZWI2OTFk
+    Y2I5MzY2ZWE3NDc3MTYzZTY2M2M4MGY4YzVlYjg4NmU5M2RjMzNjOTRjYTY2
+    M2UzNTE0MmM3MzdiY2I1OGI4OWQ4MjdjZTgyMGI1ZDdmMDg0YTI=

data/HISTORY.md

@@ -1,11 +1,95 @@
 # default - History
 ## Tags
-* [LATEST - 4 Apr, 2016 (b3175863)](#LATEST)
+* [LATEST - 18 May, 2016 (d9a052a4)](#LATEST)
+* [0.1.2 - 4 Apr, 2016 (a6fd7bef)](#0.1.2)
 * [0.1.1 - 4 Apr, 2016 (8203d928)](#0.1.1)
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 4 Apr, 2016 (b3175863)
+### <a name = "LATEST">LATEST - 18 May, 2016 (d9a052a4)
+
+* (GEM) update beaker-pe version to 0.2.0 (d9a052a4)
+
+* Merge pull request #1 from Renelast/fix/windows_masterless (ef4be9a2)
+
+
+```
+Merge pull request #1 from Renelast/fix/windows_masterless
+
+Fixes windows masterless installation
+```
+* Merge branch 'master' of https://github.com/puppetlabs/beaker-pe into fix/windows_masterless (f1a96fb2)
+
+* Merge pull request #7 from tvpartytonight/BKR-656 (aa566657)
+
+
+```
+Merge pull request #7 from tvpartytonight/BKR-656
+
+(maint) Remove leftover comments
+```
+* (maint) Remove leftover comments (c7ce982b)
+
+
+```
+(maint) Remove leftover comments
+
+This removes some straggling comments and adds a comment to the new
+metadata object in the `ClassMixedWithDSLInstallUtils` class.
+```
+* Merge pull request #6 from tvpartytonight/BKR-656 (c1ea366b)
+
+
+```
+Merge pull request #6 from tvpartytonight/BKR-656
+
+BKR-656
+```
+* (BKR-656) refactor pe_ver setting into independent method (0d918c46)
+
+
+```
+(BKR-656) refactor pe_ver setting into independent method
+
+Previous to this commit, transforming a host object prior to upgrading
+was handled in the upgrade_pe_on method. This change removes that logic
+from that method and allows for independent transformation to happen in
+a new prep_host_for_upgrade method.
+```
+* (BKR-656) Update spec tests for do_install (b602661f)
+
+
+```
+(BKR-656) Update spec tests for do_install
+
+Commit 7112971ac7b14b8c3e9703523bbb8526af6fdfbe introduced changes to
+the do_install method but did not have any updates for the spec tests.
+This commit adds those tests in.
+```
+* Adds type defaults and runs puppet agent on masterless windows (e7d06a3f)
+
+* Fixes windows masterless installation (9ff54261)
+
+
+```
+Fixes windows masterless installation
+
+Setting up a masterless windows client would fail with the following error:
+
+Exited: 1
+/usr/local/rvm/gems/ruby-2.2.1/gems/beaker-2.37.0/lib/beaker/host.rb:330:in `exec': Host 'sxrwjhkia9gzo03' exited with 1 running: (Beaker::Host::CommandFailure)
+ cmd.exe /c puppet config set server
+Last 10 lines of output were:
+        Error: puppet config set takes 2 arguments, but you gave 1
+        Error: Try 'puppet help config set' for usage
+
+As far as I could see this error is caused by the 'setup_defaults_and_config_helper_on' function which tries to set the master configuration setting in puppet.conf. But since there is no master varaible available this failes.
+
+This patch should fix that by only calling setup_defaults_and_config_helper_on whern we're not doing a masterless installation.
+```
+### <a name = "0.1.2">0.1.2 - 4 Apr, 2016 (a6fd7bef)
+
+* (HISTORY) update beaker-pe history for gem release 0.1.2 (a6fd7bef)
 
 * (GEM) update beaker-pe version to 0.1.2 (b3175863)
 

data/lib/beaker-pe/install/pe_utils.rb

@@ -410,7 +410,12 @@ module Beaker
 
               # 1 since no certificate found and waitforcert disabled
               acceptable_exit_codes = 1
-              setup_defaults_and_config_helper_on(host, master, acceptable_exit_codes)
+              if masterless
+                configure_type_defaults_on(host)
+                on host, puppet_agent('-t'), :acceptable_exit_codes => acceptable_exit_codes
+              else
+                setup_defaults_and_config_helper_on(host, master, acceptable_exit_codes)
+              end
             else
               # We only need answers if we're using the classic installer
               version = host['pe_ver'] || opts[:pe_ver]
@@ -634,23 +639,36 @@ module Beaker
             end
             # get new version information
             hosts.each do |host|
-              host['pe_dir'] = host['pe_upgrade_dir'] || path
-              if host['platform'] =~ /windows/
-                host['pe_ver'] = host['pe_upgrade_ver'] || opts['pe_upgrade_ver'] ||
-                  Options::PEVersionScraper.load_pe_version(host['pe_dir'], opts[:pe_version_file_win])
-              else
-                host['pe_ver'] = host['pe_upgrade_ver'] || opts['pe_upgrade_ver'] ||
-                  Options::PEVersionScraper.load_pe_version(host['pe_dir'], opts[:pe_version_file])
-              end
-              if version_is_less(host['pe_ver'], '3.0')
-                host['pe_installer'] ||= 'puppet-enterprise-upgrader'
-              end
+              prep_host_for_upgrade(host, opts, path)
             end
             do_install(sorted_hosts, opts.merge({:type => :upgrade, :set_console_password => set_console_password}))
             opts['upgrade'] = true
           end
         end
 
+        #Prep a host object for upgrade; used inside upgrade_pe_on
+        # @param [Host] host A single host object to prepare for upgrade
+        # !macro common_opts
+        # @param [String] path A path (either local directory or a URL to a listing of PE builds).
+        #                      Will contain a LATEST file indicating the latest build to install.
+        #                      This is ignored if a pe_upgrade_ver and pe_upgrade_dir are specified
+        #                      in the host configuration file.
+        # @example
+        #  prep_host_for_upgrade(master, {}, "http://neptune.puppetlabs.lan/3.0/ci-ready/")
+        def prep_host_for_upgrade(host, opts={}, path='')
+          host['pe_dir'] = host['pe_upgrade_dir'] || path
+          if host['platform'] =~ /windows/
+            host['pe_ver'] = host['pe_upgrade_ver'] || opts['pe_upgrade_ver'] ||
+              Options::PEVersionScraper.load_pe_version(host['pe_dir'], opts[:pe_version_file_win])
+          else
+            host['pe_ver'] = host['pe_upgrade_ver'] || opts['pe_upgrade_ver'] ||
+              Options::PEVersionScraper.load_pe_version(host['pe_dir'], opts[:pe_version_file])
+          end
+          if version_is_less(host['pe_ver'], '3.0')
+            host['pe_installer'] ||= 'puppet-enterprise-upgrader'
+          end
+        end
+
         #Create the Higgs install command string based upon the host and options settings.  Installation command will be run as a
         #background process.  The output of the command will be stored in the provided host['higgs_file'].
         # @param [Host] host The host that Higgs is to be installed on

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.1.2'
+        STRING = '0.2.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -12,6 +12,12 @@ class ClassMixedWithDSLInstallUtils
 
   attr_accessor :hosts
 
+  # Because some the methods now actually call out to the `step` method, we need to
+  # mock out `metadata` that is initialized in a test case.
+  def metadata
+    @metadata ||= {}
+  end
+
   def logger
     @logger ||= RSpec::Mocks::Double.new('logger').as_null_object
   end
@@ -48,6 +54,44 @@ describe ClassMixedWithDSLInstallUtils do
                                                 :type => 'pe',
                                                 :working_dir => '/tmp',
                                                 :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
+
+  context '#prep_host_for_upgrade' do
+
+    it 'sets per host options before global options' do
+      opts['pe_upgrade_ver'] = 'options-specific-var'
+      hosts.each do |host|
+        host['pe_upgrade_dir'] = 'host-specific-pe-dir'
+        host['pe_upgrade_ver'] = 'host-specific-pe-ver'
+        subject.prep_host_for_upgrade(host, opts, 'argument-specific-pe-dir')
+        expect(host['pe_dir']).to eq('host-specific-pe-dir')
+        expect(host['pe_ver']).to eq('host-specific-pe-ver')
+      end
+    end
+
+    it 'sets global options when no host options are available' do
+      opts['pe_upgrade_ver'] = 'options-specific-var'
+      hosts.each do |host|
+        host['pe_upgrade_dir'] = nil
+        host['pe_upgrade_ver'] = nil
+        subject.prep_host_for_upgrade(host, opts, 'argument-specific-pe-dir')
+        expect(host['pe_dir']).to eq('argument-specific-pe-dir')
+        expect(host['pe_ver']).to eq('options-specific-var')
+      end
+    end
+
+    it 'calls #load_pe_version when neither global or host options are present' do
+      opts['pe_upgrade_ver'] = nil
+      hosts.each do |host|
+        host['pe_upgrade_dir'] = nil
+        host['pe_upgrade_ver'] = nil
+        expect( Beaker::Options::PEVersionScraper ).to receive(:load_pe_version).and_return('file_version')
+        subject.prep_host_for_upgrade(host, opts, 'argument-specific-pe-dir')
+        expect(host['pe_ver']).to eq('file_version')
+        expect(host['pe_dir']).to eq('argument-specific-pe-dir')
+      end
+    end
+  end
+
   context '#configure_pe_defaults_on' do
     it 'uses aio paths for hosts of role aio' do
       hosts.each do |host|
@@ -355,6 +399,8 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.0').and_return( false )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.99').and_return( true )
       allow( subject ).to receive( :version_is_less ).with('3.99', '3.0').and_return( false )
+      allow( subject ).to receive( :check_puppetdb_status_endpoint ).and_return( nil )
+      allow( subject ).to receive( :version_is_less ).with('3.0', '2016.1.0').and_return( false )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -390,19 +436,16 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :stop_agent_on ).with( hosts[1] ).once
       expect( subject ).to receive( :stop_agent_on ).with( hosts[2] ).once
       expect( subject ).to receive( :stop_agent_on ).with( hosts[3] ).once
-      #wait for puppetdb to start
-      expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).once
-      #run each puppet agent once
-      expect( subject ).to receive( :on ).with( hosts[0], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
-      expect( subject ).to receive( :on ).with( hosts[1], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
-      expect( subject ).to receive( :on ).with( hosts[2], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
-      expect( subject ).to receive( :on ).with( hosts[3], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
+      # We wait for puppetdb to restart 3 times; once before the first puppet run, and then during each puppet run
+      expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times
+      # Each puppet agent runs twice, once for the initial run, and once to configure mcollective
+      expect( subject ).to receive( :on ).with( hosts[0], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
+      expect( subject ).to receive( :on ).with( hosts[1], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
+      expect( subject ).to receive( :on ).with( hosts[2], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
+      expect( subject ).to receive( :on ).with( hosts[3], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
       #run rake task on dashboard
 
       expect( subject ).to receive( :on ).with( hosts[0], /\/opt\/puppet\/bin\/rake -sf \/opt\/puppet\/share\/puppet-dashboard\/Rakefile .* RAILS_ENV=production/ ).once
-      #wait for all hosts to appear in the dashboard
-      #run puppet agent now that installation is complete
-      expect( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).once
 
       hosts.each do |host|
         allow( host ).to receive( :tmpdir )
@@ -469,6 +512,8 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :version_is_less ).with('3.99', '4.0').and_return( true )
       # pe_ver is only set on the hosts for this test, not the opt
       allow( subject ).to receive( :version_is_less ).with('4.0', '3.99').and_return( true )
+      allow( subject ).to receive( :version_is_less ).with('4.0', '2016.1.0').and_return( false )
+      allow( subject ).to receive( :check_puppetdb_status_endpoint ).and_return( nil )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -490,12 +535,11 @@ describe ClassMixedWithDSLInstallUtils do
         expect( subject ).to receive( :configure_type_defaults_on ).with( host ).once
         expect( subject ).to receive( :sign_certificate_for ).with( host ).once
         expect( subject ).to receive( :stop_agent_on ).with( host ).once
-        expect( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
+        # Each puppet agent runs twice, once for the initial run, and once to configure mcollective
+        expect( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
       end
-      #wait for puppetdb to start
-      expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).once#wait for all hosts to appear in the dashboard
-      #run puppet agent now that installation is complete
-      expect( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).once
+      # We wait for puppetdb to restart 3 times; once before the first puppet run, and then during each puppet run
+      expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times
 
       hosts.each do |host|
         allow( host ).to receive( :tmpdir )
@@ -530,6 +574,8 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :version_is_less ).with('3.99', '4.0').and_return( true )
       allow( subject ).to receive( :version_is_less ).with('3.8', '4.0').and_return( true )
       # pe_ver is only set on the hosts for this test, not the opt
+      allow( subject ).to receive( :version_is_less ).with('4.0', '2016.1.0').and_return( false )
+      allow( subject ).to receive( :check_puppetdb_status_endpoint ).and_return( nil )
       allow( subject ).to receive( :version_is_less ).with('4.0', '3.99').and_return( true )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
@@ -551,12 +597,11 @@ describe ClassMixedWithDSLInstallUtils do
         expect( subject ).to receive( :configure_type_defaults_on ).with( host ).once
         expect( subject ).to receive( :sign_certificate_for ).with( host ).once
         expect( subject ).to receive( :stop_agent_on ).with( host ).once
-        expect( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
+        # Each puppet agent runs twice, once for the initial run, and once to configure mcollective
+        expect( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
       end
-      #wait for puppetdb to start
-      expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).once#wait for all hosts to appear in the dashboard
-      #run puppet agent now that installation is complete
-      expect( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).once
+      #  We wait for puppetdb to restart 3 times; once before the first puppet run, and then during each puppet run
+      expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times
 
       hosts.each do |host|
         allow( host ).to receive( :tmpdir )
@@ -590,6 +635,8 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :version_is_less ).with('3.8', '4.0').and_return( true )
       # pe_ver is only set on the hosts for this test, not the opt
       allow( subject ).to receive( :version_is_less ).with('4.0', '3.99').and_return( true )
+      allow( subject ).to receive( :version_is_less ).with('4.0', '2016.1.0').and_return( false )
+      allow( subject ).to receive( :check_puppetdb_status_endpoint ).and_return( nil )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -610,12 +657,13 @@ describe ClassMixedWithDSLInstallUtils do
         allow( subject ).to receive( :add_pe_defaults_on ).with( host ) unless subject.aio_version?(host)
         allow( subject ).to receive( :sign_certificate_for ).with( host )
         allow( subject ).to receive( :stop_agent_on ).with( host )
+        # Each puppet agent runs twice, once for the initial run, and once to configure mcollective
         allow( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] )
       end
-      #wait for puppetdb to start
-      allow( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ) #wait for all hosts to appear in the dashboard
+      #  We wait for puppetdb to restart 3 times; once before the first puppet run, and then during each puppet run
+      allow( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times 
       #run puppet agent now that installation is complete
-      allow( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] )
+      allow( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).twice
 
       opts[:type] = :upgrade
       expect( subject ).to receive( :setup_defaults_and_config_helper_on ).with( hosts[1], hosts[0], [0, 1, 2] )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec