beaker 2.14.1 → 2.15.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI1NWRkYzBiZmZlOWEwMTY0NjRlNGJjYzcwMDM5MzZhNWFlNDk0Mg==
+    ZTY1NWMyYTg5NGI2MTgzYzYyMDczZDJkMWU3ZTQwMDNhN2MyMDJhZQ==
   data.tar.gz: !binary |-
-    OTg5MjdmOTFlZjY0NjVhZGYxNjQ3M2QwYzg5ZGQ0MzA0MTAyNjdjNQ==
+    M2ZmNDUxZWZlZDY2NzI1NTlhNjRhNmNkYzM1YjBmZTgzN2U0NWQzYg==
 SHA512:
   metadata.gz: !binary |-
-    NzUyZTA5Mzc1MjgyODA1ODg1ZjNjYThjZWY2YTg4NDgwYmM4NGQ2M2RiNTVh
-    NTAyYzEyZGY0ODlhY2Y5ZTRiZjVmNjJkOGRmZDE4ZjhhYTY4NTQwOTBlOGY4
-    MzEyMGU0OTUyZmEyZmMzYTRkYWEyYTljZGIxMjk2MWVlNDM2OWY=
+    ODUwOThkOTM1YzQ1MjEzYjk4NmRhOTFlZGNhZjFkYWRjNDBjZmYxMjUyOTY1
+    YTliOGZiMzQ3MTA0ZjExYTMwOGFlOGJjMjA5YTM1OWE1M2UzZDA5MGRmODNm
+    ZTJiN2NjNzkxMDhmYjlkY2FkMmNjZjk1NGNjMGE5N2I3ODAzZDI=
   data.tar.gz: !binary |-
-    MWU2YmQ1N2M5OWExZjVlZmUyZTYwOWU0MDkwYTFiZTIxYmVmODBhOTI3ZWM5
-    M2RhN2M1ZDMwNjg5Mjc1ZDAyMWFiZDBlMDVlMTUwYWE4YTQzYTM0NDBhMmZl
-    YTAxNjllMjcwMGE3NjhhNDJmNDA0OWNkMGY3NzFkYTYzNDQzYjg=
+    NjBjOTA4NTdlYjdiNzlkMzY3ZDA4OTg5OGYyNmZlOTljMzk0ZTEzYWY1Njdh
+    YWYxODM4MmYwZDc0MjYxYmQ5Y2I0ZDA2YWE1ZjVkODhlOTNhMmExNTNjMjQx
+    OGMyOTdmMGNkZDBkNzNkMjYyYzBjOTlkMWQwYTE1YjlkZWFiNzI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 5 Jun, 2015 (8539687f)](#LATEST)
+* [LATEST - 1 Jul, 2015 (4b71df0e)](#LATEST)
+* [2.14.1 - 5 Jun, 2015 (35026603)](#2.14.1)
 * [2.14.0 - 4 Jun, 2015 (c0ebcd16)](#2.14.0)
 * [2.13.0 - 29 May, 2015 (dd70aa66)](#2.13.0)
 * [2.12.0 - 20 May, 2015 (62845ce9)](#2.12.0)
@@ -78,12 +79,294 @@
 * [pe2.0.3 - 21 Feb, 2012 (492ff756)](#pe2.0.3)
 * [pe2.0.2 - 3 Feb, 2012 (e36f0d22)](#pe2.0.2)
 * [pe2.0.1 - 31 Jan, 2012 (3a118201)](#pe2.0.1)
-* [pe2.0.0 - 31 Jan, 2012 (8d064e33)](#pe2.0.0)
 * [pe2.0 - 11 Nov, 2011 (4d7b65b6)](#pe2.0)
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 5 Jun, 2015 (8539687f)
+### <a name = "LATEST">LATEST - 1 Jul, 2015 (4b71df0e)
+
+* (GEM) update beaker version to 2.15.0 (4b71df0e)
+
+* Merge pull request #869 from kevpl/bkr253_installpe_pe_aio_url (b243648e)
+
+
+```
+Merge pull request #869 from kevpl/bkr253_installpe_pe_aio_url
+
+(BKR-253) install_pe_on uses pe_promoted puppet-agent for 4.0+
+```
+* (BKR-253) install_pe_on uses pe_promoted puppet-agent for 4.0+ (c0d47643)
+
+* Merge pull request #860 from anodelman/shallow (11f9a9ba)
+
+
+```
+Merge pull request #860 from anodelman/shallow
+
+(BKR-323) Allow install_puppet_agent_on to support "pe only" platforms
+```
+* Merge pull request #862 from anodelman/support-date-version (dbc4b535)
+
+
+```
+Merge pull request #862 from anodelman/support-date-version
+
+(BKR-344) Support year.release versioning (e.g. 2015.2)
+```
+* Merge pull request #863 from anodelman/maint (b444c507)
+
+
+```
+Merge pull request #863 from anodelman/maint
+
+(MAINT) add spec testing to option parsing prioritization
+```
+* (BKR-352) Beaker install_puppet_agent_on helper does not... (521e4791)
+
+
+```
+(BKR-352) Beaker install_puppet_agent_on helper does not...
+
+...respect the host install_32 or ruby_arch setting on Windows
+
+- install x86 msi when
+  * host['install_32'] == true
+  * opts['install_32'] == true
+  * host['ruby_arch'] == 'x86'
+  * host.is_x86_64? == false
+- install x64 msi when
+  * (host.is_x86_64? == true) && !host['install_32'] &&
+      !opts['install_32'] && !(host['ruby_arch'] == 'x86')
+```
+* (MAINT) add spec testing to option parsing prioritization (701c5aed)
+
+
+```
+(MAINT) add spec testing to option parsing prioritization
+
+- make sure that we are sorting through env variables, command line
+  arguments, host file options, options file argument and presets
+  correctly
+```
+* (BKR-344) Support year.release versioning (e.g. 2015.2) (048e6708)
+
+
+```
+(BKR-344) Support year.release versioning (e.g. 2015.2)
+
+- update semver matching to understand that 3.0.0 < 2015.3.0.0
+- update answer file generation to provide 4.0 answers for version 2015+
+```
+* Merge pull request #855 from bstopp/bug/copy_module_to_mv_fix (9631b55a)
+
+
+```
+Merge pull request #855 from bstopp/bug/copy_module_to_mv_fix
+
+(BKR-339) Remove the target module directory on host during copy_module_to
+```
+* Merge pull request #853 from kevpl/bkr319_installpe_puppetagent (6ddec170)
+
+
+```
+Merge pull request #853 from kevpl/bkr319_installpe_puppetagent
+
+(BKR-319) added puppet-agent install for install_pe for versions over 4.0
+```
+* Merge pull request #851 from madAndroid/BKR-314-idempotent-EL-install-release-repo (d7fccf8f)
+
+
+```
+Merge pull request #851 from madAndroid/BKR-314-idempotent-EL-install-release-repo
+
+(BKR-314) Ensure install_puppetlabs_release_repo is idempotent for EL
+```
+* (BKR-319) review feedback refactor (4b7235ec)
+
+* (BKR-323) Allow install_puppet_agent_on to support "pe only" platforms (cc906f1d)
+
+
+```
+(BKR-323) Allow install_puppet_agent_on to support "pe only" platforms
+
+- support both pm.puppetlabs.com and builds.puppetlabs.com for
+  downloading puppet-agent
+- use install_puppet_agent_on for yum|apt.puppetlabs.com
+- use install_puppet_agent_dev_repo_on for builds.puppetlabs.com
+- use install_puppet_agent_pe_promoted_repo_on for pm.puppetlabs.com
+
+example usage:
+  install_puppet_agent_on(host, { :version => '1.1.0', :default_action => 'gem_install'})
+  install_puppet_agent_dev_repo_on(host, { :sha => 'd3377feaeac173aada3a2c2cedd141eb610960a7', :version => '1.1.1.225.gd3377fe'  })
+  install_puppet_agent_pe_promoted_repo_on(host, { :sha => '1.1.0.227', :version => '1.1.0.227.g1d8334c', :pe_ver => '4.0.0-rc1'})
+```
+* Merge pull request #844 from kevpl/bkr53_withpuppetrunningon_restart (36c9ae20)
+
+
+```
+Merge pull request #844 from kevpl/bkr53_withpuppetrunningon_restart
+
+(BKR-53) with_puppet_running_on only restarts before yielding
+```
+* (BKR-339) Remove the target module directory on host during copy_module_to (1d1d7eb6)
+
+
+```
+(BKR-339) Remove the target module directory on host during copy_module_to
+
+Without this patch, the copy_module_to function will not work correctly to copy updated module files into the target directory on the hosts. Instead accpetance test spec files can be updated, but not module sources. Additionally the module copy will fail on the second non-provisioning run.
+
+The patch simply executes a delete of the target directory on the host, ensuring it does not exist prior to the mv command.
+```
+* Merge pull request #847 from anodelman/fail-fast (923c7857)
+
+
+```
+Merge pull request #847 from anodelman/fail-fast
+
+(BKR-322) --fail-mode fast doesn't seem to be failing fast
+```
+* (BKR-319) added puppet-agent install for install_pe for versions over 4.0 (2749c051)
+
+* Merge pull request #850 from anodelman/aio-paths (19511298)
+
+
+```
+Merge pull request #850 from anodelman/aio-paths
+
+(BKR-325) AIO detection for install_puppet() and install_pe()
+```
+* Merge pull request #846 from anodelman/shallow (b00942f0)
+
+
+```
+Merge pull request #846 from anodelman/shallow
+
+(BKR-317) More usable configure_foss_defaults_on
+```
+* Merge pull request #848 from petems/BKR-326-fix_freebsd_ssh_root_setup (3491f13d)
+
+
+```
+Merge pull request #848 from petems/BKR-326-fix_freebsd_ssh_root_setup
+
+(BKR-326) Fixes enabling user environments
+```
+* Merge pull request #839 from vindir/feature/aws_ip_failover (837b2673)
+
+
+```
+Merge pull request #839 from vindir/feature/aws_ip_failover
+
+(BKR-311) Allow AWS IP Fallback
+```
+* (BKR-326) Adds requirement of perl for FreeBSD (476b3860)
+
+
+```
+(BKR-326) Adds requirement of perl for FreeBSD
+
+Makes regex sed replacement easier
+```
+* BKR-314 - expect more explicit rpm command - with --replacepkgs (cca0046e)
+
+* BKR-314 - Use --replacepkgs to ensure repo install is idempotent (dd73ca21)
+
+* (BKR-325) AIO detection for install_puppet() and install_pe() (8e6347ab)
+
+
+```
+(BKR-325) AIO detection for install_puppet() and install_pe()
+
+- check the pe_ver/version to see if aio pathing should be installed
+  instead of foss/pe
+```
+* (BKR-326) Adds FreeBSD specs for root login enable (a8ffadbe)
+
+* (BKR-326) Fixes enabling user environments (e5bc2451)
+
+
+```
+(BKR-326) Fixes enabling user environments
+
+Currently this step uses `echo_to_file`, which actually overwrites the file with the one line. This changes it to use the perl regex instead.
+```
+* (BKR-322) --fail-mode fast doesn't seem to be failing fast (7dfb56e0)
+
+
+```
+(BKR-322) --fail-mode fast doesn't seem to be failing fast
+
+- was using the default value instead of the setting value
+```
+* (BKR-317) More usable configure_foss_defaults_on (74df91d1)
+
+
+```
+(BKR-317) More usable configure_foss_defaults_on
+
+- add support for remove_defaults_on
+- add some spec test coverage
+```
+* Merge pull request #828 from kevpl/bkr220_tagging_add (5f71cdb3)
+
+
+```
+Merge pull request #828 from kevpl/bkr220_tagging_add
+
+(BKR-220) test tagging implemented
+```
+* (BKR-317) More usable configure_foss_defaults_on (12c51454)
+
+
+```
+(BKR-317) More usable configure_foss_defaults_on
+
+- create configure_defaults_on that provided a type sets the correct
+  defaults per-host, will also remove any existing defaults
+```
+* Merge pull request #845 from kevpl/bkr320_answers_40nilproblems (56fbc872)
+
+
+```
+Merge pull request #845 from kevpl/bkr320_answers_40nilproblems
+
+(BKR-320) added nil-check so we don't call methods on empty answer maps
+```
+* (BKR-320) added nil-check so we don't call methods on empty answer maps (2d38a720)
+
+* (BKR-53) with_puppet_running_on can not restart after yielding (9da3b99f)
+
+
+```
+(BKR-53) with_puppet_running_on can not restart after yielding
+
+Before, with_puppet_running_on bounced the puppet service before and after runs.
+This was causing us a lot of pain as the last restart proved unnecessary for the
+most part, and added 30 seconds to each test run on avg in our CI.
+
+We've decided to improve this by adding the ability to remove the second bounce.
+Mosts tests use `with_puppet_running_on`, so they'll be setup accordingly before
+yielding, so that second one is unnecessary.
+```
+* (BKR-311) Allow AWS IP Fallback (098daef0)
+
+
+```
+(BKR-311) Allow AWS IP Fallback
+
+When bringing up an instance in a VPC there won't always be a public address.
+This allows the AWS hypervisor to fallback and assign an instance's private
+ip to host['ip'] for new instances without a public address.
+
+This PR includes tests for the .AwsSdk#populate_dns method to verify this new
+behavior persists in the future.
+```
+* (BKR-220) test tagging implemented (f41c29f9)
+
+### <a name = "2.14.1">2.14.1 - 5 Jun, 2015 (35026603)
+
+* (HISTORY) update beaker history for gem release 2.14.1 (35026603)
 
 * (GEM) update beaker version to 2.14.1 (8539687f)
 
@@ -19158,30 +19441,6 @@ effect a dhcp lease renewal after ntpdate is run
 
 Some VMs, after reverting to snapshot, are renewing their dhcp lease after our tests are running, causing apparent network errors. This test will renew the lease early so it's good for a day (or whatever is configured at the dhcp server), rather than just a few seconds.
 ```
-### <a name = "pe2.0.0">pe2.0.0 - 31 Jan, 2012 (8d064e33)
-
-* (maint) remove version checking for --pe-version option (8d064e33)
-
-
-```
-(maint) remove version checking for --pe-version option
-
-Checking for a specific PE version serves no real purpose; if
-an invalid version is passed the hassness will halt with an
-apporiate error indicating the vesrion needed is not found.
-```
-* (maint) Add support to install alt versions of PE (15bfaeed)
-
-
-```
-(maint) Add support to install alt versions of PE
-
-Need the ability to install more than just the LASTEST tarball
-of PE; passing --pe-version 2.0.0 will install PE 2.0.0 from
-/opt/enterptise/dists/pe2.0.0
-If --pe-version is ommited, version is derived from LATEST and
-/opt/enterprise/dist is used for the path.
-```
 ### <a name = "pe2.0">pe2.0 - 11 Nov, 2011 (4d7b65b6)
 
 * Merge pull request #81 from djm68/add_cert_sign_master_dashboard (4d7b65b6)

data/beaker.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'net-scp', '~> 1.2'
   s.add_runtime_dependency 'inifile', '~> 2.0'
   s.add_runtime_dependency 'rsync', '~> 1.0.9'
+  s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.8'

data/lib/beaker/answers.rb

@@ -49,7 +49,7 @@ module Beaker
     #   data.
     def self.create version, hosts, options
       case version
-      when /\A4\.0/
+      when /\A(4\.0|2015)/
         return Version40.new(version, hosts, options)
       when /\A3\.99/
         return Version40.new(version, hosts, options)

data/lib/beaker/answers/version40.rb

@@ -20,10 +20,12 @@ module Beaker
       # - q_puppet_enterpriseconsole_database_user
 
       the_answers.map do |vm, as|
-        as.delete_if do |key, value|
-          key =~ /q_puppet_cloud_install/
-          #to be deleted in the future
-          #|q_puppet_enterpriseconsole_database_name|q_puppet_enterpriseconsole_database_password|q_puppet_enterpriseconsole_database_user/
+        if as
+          as.delete_if do |key, value|
+            key =~ /q_puppet_cloud_install/
+            #to be deleted in the future
+            #|q_puppet_enterpriseconsole_database_name|q_puppet_enterpriseconsole_database_password|q_puppet_enterpriseconsole_database_user/
+          end
         end
       end
 
@@ -32,7 +34,7 @@ module Beaker
       install_update_server = answer_for(@options, :q_install_update_server, 'y')
 
       the_answers.map do |key, value|
-        the_answers[key][:q_update_server_host] = update_server_host
+        the_answers[key][:q_update_server_host] = update_server_host if the_answers[key]
       end
       the_answers[master.name][:q_install_update_server] = install_update_server
 

data/lib/beaker/cli.rb

@@ -90,7 +90,7 @@ module Beaker
 
         #testing phase
         begin
-          run_suite(:tests)
+          run_suite(:tests, @options[:fail_mode])
         #post acceptance phase
         rescue => e
           #post acceptance on failure
@@ -143,7 +143,7 @@ module Beaker
     #@param [Symbol] suite_name The test suite to execute
     #@param [String] failure_strategy How to proceed after a test failure, 'fast' = stop running tests immediately, 'slow' =
     #                                 continue to execute tests.
-    def run_suite(suite_name, failure_strategy = :slow)
+    def run_suite(suite_name, failure_strategy = nil)
       if (@options[suite_name].empty?)
         @logger.notify("No tests to run for suite '#{suite_name.to_s}'")
         return

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

@@ -60,6 +60,14 @@ module Beaker
         # 6. Revert Puppet to the pre-test state
         # 7. Testing artifacts are saved in a folder named for the test
         #
+        # @note Whether Puppet is started or restarted depends on what kind of
+        #   server you're running.  Passenger and puppetserver are restarted before.
+        #   Webrick is started before and stopped after yielding, unless you're using
+        #   service scripts, then it'll behave like passenger & puppetserver.
+        #   Passenger and puppetserver (or webrick using service scripts)
+        #   restart after yielding by default.  You can stop this from happening
+        #   by setting the :restart_when_done flag of the conf_opts argument.
+        #
         # @param [Host] host        One object that act like Host
         #
         # @param [Hash{Symbol=>String}] conf_opts  Represents puppet settings.
@@ -85,6 +93,13 @@ module Beaker
         #                            even if it seems the host has passenger.
         #                            This is needed in FOSS tests to initialize
         #                            SSL.
+        # @option conf_opts [Boolean] :restart_when_done  determines whether a restart
+        #                            should be run after the test has been yielded to.
+        #                            Will stop puppet if false. Default behavior
+        #                            is to restart, but you can override this on the
+        #                            host or with this option.
+        #                            (Note: only works for passenger & puppetserver
+        #                            masters (or webrick using the service scripts))
         # @param [File] testdir      The temporary directory which will hold backup
         #                            configuration, and other test artifacts.
         #
@@ -110,7 +125,10 @@ module Beaker
           raise(ArgumentError, "with_puppet_running_on's conf_opts must be a Hash. You provided a #{conf_opts.class}: '#{conf_opts}'") if !conf_opts.kind_of?(Hash)
           cmdline_args = conf_opts[:__commandline_args__]
           service_args = conf_opts[:__service_args__] || {}
-          conf_opts = conf_opts.reject { |k,v| [:__commandline_args__, :__service_args__].include?(k) }
+          restart_when_done = true
+          restart_when_done = host[:restart_when_done] if host[:restart_when_done]
+          restart_when_done = conf_opts.fetch(:restart_when_done, restart_when_done)
+          conf_opts = conf_opts.reject { |k,v| [:__commandline_args__, :__service_args__, :restart_when_done].include?(k) }
 
           curl_retries = host['master-start-curl-retries'] || options['master-start-curl-retries']
           logger.debug "Setting curl retries to #{curl_retries}"
@@ -163,7 +181,11 @@ module Beaker
 
               if host.use_service_scripts? && !service_args[:bypass_service_script]
                 restore_puppet_conf_from_backup( host, backup_file )
-                bounce_service( host, host['puppetservice'], curl_retries )
+                if restart_when_done
+                  bounce_service( host, host['puppetservice'], curl_retries )
+                else
+                  host.exec puppet_resource('service', host['puppetservice'], 'ensure=stopped')
+                end
               else
                 if puppet_master_started
                   stop_puppet_from_source_on( host )