beaker 2.10.0 → 2.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmY2Mjc5OTAyMTE2ODI4ZWNkMGYwMTkyMjE2NDVjNTRmM2FiYzA5Nw==
+    YjcxZmM2NGE2YTM1ZjAwZmU4MDI4M2U0NzZmOTk4MzMxZDg3NDRiOQ==
   data.tar.gz: !binary |-
-    MzMyODZhZDIwMzJkNzYwZjdlYmVjNTNlODdjODg5NmJjNjdkNGJiNQ==
+    Y2M3MmViODg0MTdiZDIxZWZjNjIyYmExMWMwMGFkMzA4OTViZmQxOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjRmYmIzOGJmMzE2YWNiYjVmMWUzMGQyYjgwNTg3NzU0NDdmNGQ4ZDhiNThl
-    MmE2NmU3MWU3OWRhMGYwZjQ0ZDQ2ZTc2M2U1NGVjNDJhNDZhYTI4MzkzOWEz
-    N2JiNmVhNjRiYmJmM2U2NzM1Mjg0NDA5ZTg2MGFjYTA4NGM5ZmI=
+    N2VjY2E2NmM2N2E3MGUyOTBkY2FlZTM3MjUwZjY5YjE0OGU4N2JjYTI1OWNi
+    MWM1YzIyYzgzOWM2ZWJhNjdjNmIxMzAyMmZkMzk3Njk3Mzc4ZWQwM2ZjYWZj
+    MzhiZTVmYTQ0NzE0YTU2MTVhZjg4NDBjYjlhNTk0YTQ4ZGNjMDk=
   data.tar.gz: !binary |-
-    YTk0ZThhMGRkYzEwMWRjNjdkNTBkZmE3NzI0Y2E3YjcyOWI5NmYwOTExYjg4
-    MDA1MzY5YzE4NDVjMWE5N2MzYTczZjdhMjRlOWQwZGUzMGUxZmJhNWM4N2E2
-    YTU2YjFmN2JiNmZlMjgyNmRiYzMyYWE3ZDZiNzJlMjY0MTQ1NDg=
+    ZmRjZDhkNjU5ODQyMjY3YjZlNTc2NTIyYmYwMzNlOTA1YmJhZmFhZmQ2Y2Y3
+    ODEyODVkMzZhMjcxMTQ0NTYzYjNmYmVlZThjZWMzNmQwNWJkMTAyY2RlYzVk
+    MTNkYmQ3NjE5OTNkMTJkODk5ZGE0ZWFmNjVlODI4YjYyMTUyNzk=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 22 Apr, 2015 (2f834676)](#LATEST)
+* [LATEST - 6 May, 2015 (50128ac0)](#LATEST)
+* [2.10.0 - 22 Apr, 2015 (c4f37479)](#2.10.0)
 * [2.9.0 - 9 Apr, 2015 (b161d325)](#2.9.0)
 * [beaker2.8.0 - 26 Mar, 2015 (2d25d06d)](#beaker2.8.0)
 * [beaker2.7.1 - 19 Mar, 2015 (45b2bf10)](#beaker2.7.1)
@@ -78,7 +79,294 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 22 Apr, 2015 (2f834676)
+### <a name = "LATEST">LATEST - 6 May, 2015 (50128ac0)
+
+* (GEM) update beaker version to 2.11.0 (50128ac0)
+
+* Merge pull request #806 from kevpl/bkr240_windows_rebootfix (7455593a)
+
+
+```
+Merge pull request #806 from kevpl/bkr240_windows_rebootfix
+
+(BKR-240) added a reason code on reboot for windows
+```
+* Merge pull request #803 from puppetlabs/fix/qeng-2009_3.99_windows_msi_name (4098e30c)
+
+
+```
+Merge pull request #803 from puppetlabs/fix/qeng-2009_3.99_windows_msi_name
+
+(QENG-2009) Fix windows MSI name for 3.99
+```
+* Merge pull request #804 from davemcdonnell/fix_pty_typo_el7 (0de90408)
+
+
+```
+Merge pull request #804 from davemcdonnell/fix_pty_typo_el7
+
+Fix typo ptry => pty, sudo failing on el7
+```
+* Merge pull request #802 from anodelman/win-fix (d17a309e)
+
+
+```
+Merge pull request #802 from anodelman/win-fix
+
+(BKR-191) replace is_cygwin? with a more understandable name
+```
+* Merge pull request #808 from kevpl/bkr235_answers_puppetdbcustomize (441bf997)
+
+
+```
+Merge pull request #808 from kevpl/bkr235_answers_puppetdbcustomize
+
+(BKR-235) Added Customization for External Postgres
+```
+* Merge pull request #807 from kevpl/bkr241_windows_install32bitpuppetagent (cacb37e0)
+
+
+```
+Merge pull request #807 from kevpl/bkr241_windows_install32bitpuppetagent
+
+Bkr241 windows install32bitpuppetagent
+```
+* Merge pull request #809 from kevpl/bkr243_preservedhosts_v2 (5d74773c)
+
+
+```
+Merge pull request #809 from kevpl/bkr243_preservedhosts_v2
+
+(BKR-243) improved preserved-hosts file saving
+```
+* (BKR-243) improved preserved-hosts file saving (282bb9e4)
+
+* (BKR-240) added a reason code on reboot for windows (24fc8038)
+
+* Merge pull request #791 from rbrw/ticket/master/bkr-217-rotate-ec2-subnets (61b3b1bd)
+
+
+```
+Merge pull request #791 from rbrw/ticket/master/bkr-217-rotate-ec2-subnets
+
+(BKR-217) aws_sdk: given CONFIG subnet_ids, try each in turn
+```
+* Merge pull request #793 from kevpl/bkr180_install_middleman (90eb818e)
+
+
+```
+Merge pull request #793 from kevpl/bkr180_install_middleman
+
+(BKR-180) added ability to use Beaker machine as scp middle-man for PE
+```
+* Merge pull request #797 from anodelman/sweep (f40ed598)
+
+
+```
+Merge pull request #797 from anodelman/sweep
+
+(BKR-224) on(node, 'puppet agent -t') raises no warning when node = []
+```
+* Merge pull request #798 from fiddyspence/bug/move_round_openstack_address_assignments (30019ce0)
+
+
+```
+Merge pull request #798 from fiddyspence/bug/move_round_openstack_address_assignments
+
+(BKR-223) Change order of how we assign IPs to openstack instances
+```
+* Merge pull request #801 from anodelman/maint (40b18ed0)
+
+
+```
+Merge pull request #801 from anodelman/maint
+
+(BKR-215) Document all of the options to #on and friends
+```
+* BKR-245 Fix typo ptry => pty, restart sshd failing on el7 when running sudo (07f69955)
+
+* (QENG-2009) Update beaker specs for 3.99 windows msi fix (8b5401f7)
+
+* (QENG-2009) Fix windows MSI name for 3.99 (cd07eb83)
+
+
+```
+(QENG-2009) Fix windows MSI name for 3.99
+
+We were only using puppet-agent for 4.0, this
+commit bumps that down to 3.99.
+```
+* (BKR-235) all necessary answers to use an external postgres host are now customizable (493fea00)
+
+* (BKR-191) replace is_cygwin? with a more understandable name (2c67d735)
+
+
+```
+(BKR-191) replace is_cygwin? with a more understandable name
+
+- create is_powershell?, update usages of is_cygwin as appropriate
+- move powershell only code into pswindows host object
+- fixes related to breakages discovered when this code was moved
+```
+* (BKR-215) Document all of the options to #on and friends (1dda76e3)
+
+
+```
+(BKR-215) Document all of the options to #on and friends
+
+- updates shared options to be current (with info for
+  accept_all_exit_codes and friends)
+- yard doc does a single pass and you can't guarantee file ordering, so
+  you have to have the common options macro in each file that needs it -
+  duplication yay!
+```
+* (MAINT) update acceptable_exit_codes usage to accept_all_exit_codes (402b4d85)
+
+
+```
+(MAINT) update acceptable_exit_codes usage to accept_all_exit_codes
+
+- we are abusing acceptable_exit_codes all over the place by giving it a
+  mega-array, basically recreating the functionality of
+  accept_all_exit_codes
+```
+* (BKR-235) added ability to customize puppetdb_hostname answer (3d5d5b64)
+
+* (BKR-223) Change order of how we assign IPs to openstack instances (f6d2c521)
+
+* (BKR-224) on(node, 'puppet agent -t') raises no warning when node = [] (69315874)
+
+
+```
+(BKR-224) on(node, 'puppet agent -t') raises no warning when node = []
+
+- if a logger is defined then send a warning message if attempting to
+  run a command against an array of 0 nodes
+```
+* Merge pull request #794 from kevpl/bkr199_cumulus_packageupdate (4e556c5b)
+
+
+```
+Merge pull request #794 from kevpl/bkr199_cumulus_packageupdate
+
+(BKR-199) updated cumulus packages required to reflect current package structure
+```
+* Merge pull request #795 from fiddyspence/bug/rsync_source_always_nil (7bc2c62e)
+
+
+```
+Merge pull request #795 from fiddyspence/bug/rsync_source_always_nil
+
+(BKR-225) rsync module_utils method source is always nil
+```
+* Merge pull request #788 from fiddyspence/feature/do_you_want_openstack_region_support_this_time (c35ec983)
+
+
+```
+Merge pull request #788 from fiddyspence/feature/do_you_want_openstack_region_support_this_time
+
+[openstack] enable support for multiple regions
+```
+* (BKR-225) rsync module_utils method source is always nil (e3db6871)
+
+
+```
+(BKR-225) rsync module_utils method source is always nil
+
+sadfs
+```
+* (BKR-199) updated cumulus packages required to reflect current package structure (790c5d44)
+
+* (BKR-180) added ability to use Beaker machine as scp middle-man for PE (b97640c0)
+
+* (BKR-217) aws_sdk: given CONFIG subnet_ids, try each in turn (08e4f79d)
+
+
+```
+(BKR-217) aws_sdk: given CONFIG subnet_ids, try each in turn
+
+This should help alleviate the EC2 InsufficientInstanceCapacity.
+
+The new policy will only be applied to a host if there isn't a CONFIG
+subnet_id and there isn't a host-specific subnet_id.  When it does
+apply, try each subnet in subnet_ids once for each relevant host.
+
+The new option can be used like this:
+
+  CONFIG
+    vpc_id: foo
+    subnet_ids:
+      - x
+      - y
+      - z
+```
+* (BKR-27)[openstack] enable support for multiple regions (e32e0b54)
+
+* (BKR-217) aws_sdk: Kill EC2 instances on exception (6b0cf490)
+
+
+```
+(BKR-217) aws_sdk: Kill EC2 instances on exception
+
+Move EC2 cleanup code to kill_instances() and call that from cleanup(),
+and from a new exception handler in launch_all_nodes(), to be sure we
+don't leave instances running when something goes wrong.
+
+Adjust wait_for_status() to handle a specific list of hosts rather than
+just @hosts.
+```
+* (BKR-217) aws_sdk: add create_instance() (d4d6521d)
+
+
+```
+(BKR-217) aws_sdk: add create_instance()
+
+Move the per-host core of launch_all_nodes() to create_instance() to
+prepare for the addition of launch exception
+handlers (InsufficientCapacity, etc.).
+```
+* (BKR-217) aws_sdk: move wait_for_status() to launch_all_nodes() (023437e1)
+
+* (maint) Allow :ruby_arch to select Windows builds (a0d76866)
+
+
+```
+(maint) Allow :ruby_arch to select Windows builds
+
+ - Puppet puppetlabs/puppet@92c539f8626467690321c875d5f2746f56fec6ac
+   added :ruby_arch to support the notion of choosing a Windows
+   installer architecture.  A node could set :ruby_arch to either
+   x64 or x86 to choose to install a 64-bit or 32-bit Ruby MSI on a
+   64-bit version of Windows.
+
+   When similar behavior was introduced to Beaker, it didn't follow
+   prior art, and a new setting called :install_32 was introduced to
+   manage this functionality in 6f8deb7dbc7bc75b8624df754c261f4d2b58b999
+
+   This commit adds in :ruby_arch, with the hope that :install_32 will
+   be deprecated on a future major version boundary to simplify the
+   logic around settings evaluation here.
+```
+* (maint) Allow installing 32-bit Puppet Agent (23c06fa9)
+
+
+```
+(maint) Allow installing 32-bit Puppet Agent
+
+ - Previously, install_utils was modified to be able to install PE
+   based on a configuration switch called `install_32` in
+   6f8deb7dbc7bc75b8624df754c261f4d2b58b999
+
+   This allows a 64-bit Windows OS to ask to install a 32-bit Ruby /
+   Puppet version.  This is important given 64-bit support wasn't
+   added to Puppet or PE until 3.7.
+
+   When installing the puppet-agent through install_puppetagent_dev_repo
+   helper, allow for selecting the build in a similar fashion.
+```
+### <a name = "2.10.0">2.10.0 - 22 Apr, 2015 (c4f37479)
+
+* (HISTORY) update beaker history for gem release 2.10.0 (c4f37479)
 
 * (GEM) update beaker version to 2.10.0 (2f834676)
 
@@ -250,8 +538,6 @@ Further reading if interested:
 http://www.secnetix.de/olli/FreeBSD/mnamelen.hawk
 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=167105
 ```
-* (MAINT) Changes msi install commands run when on non-cygwin (89dabc69)
-
 * (MAINT) Changes msi install commands ran... (effcde41)
 
 
@@ -260,6 +546,8 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=167105
 
 When on non-cygwin Windows, use `start` not cmd
 ```
+* (MAINT) Changes msi install commands run when on non-cygwin (89dabc69)
+
 * (gh-732) Better Openstack IP address assignment (e1fcd580)
 
 * (gh-687) [openstack] Previously, the method attemped to set root on all nodes, even if the node was not up yet (802db0e9)

data/acceptance/tests/base/host.rb

@@ -27,6 +27,7 @@ end
 
 step "#add_env_var : can add an environment variable"
 hosts.each do |host|
+  host.clear_env_var("test")
   logger.debug("add TEST=1")
   host.add_env_var("TEST", "1")
   logger.debug("add TEST=1 again (shouldn't create duplicate entry)")

data/lib/beaker/answers/version30.rb

@@ -50,8 +50,8 @@ module Beaker
 
         # Master/dashboard answers
         master_console_a = {
-          :q_puppetdb_hostname => database,
-          :q_puppetdb_port => answer_for(options, :q_puppetdb_port, 8081)
+          :q_puppetdb_hostname  => answer_for(options, :q_puppetdb_hostname, database),
+          :q_puppetdb_port      => answer_for(options, :q_puppetdb_port, 8081)
         }
 
         # Master only answers
@@ -76,16 +76,16 @@ module Beaker
 
         console_database_a = {
           :q_puppetdb_database_name => database_name,
-          :q_puppetdb_database_user => database_user,
-          :q_puppetdb_database_password => puppetdb_password,
+          :q_puppetdb_database_user => answer_for(options, :q_puppetdb_database_user, database_user),
+          :q_puppetdb_database_password => answer_for(options, :q_puppetdb_database_password, puppetdb_password),
           :q_puppet_enterpriseconsole_auth_database_name => auth_database_name,
           :q_puppet_enterpriseconsole_auth_database_user => auth_database_user,
-          :q_puppet_enterpriseconsole_auth_database_password => dashboard_password,
+          :q_puppet_enterpriseconsole_auth_database_password => answer_for(options, :q_puppet_enterpriseconsole_auth_database_password, dashboard_password),
           :q_puppet_enterpriseconsole_database_name => console_database_name,
-          :q_puppet_enterpriseconsole_database_user => console_database_user,
-          :q_puppet_enterpriseconsole_database_password => dashboard_password,
+          :q_puppet_enterpriseconsole_database_user => answer_for(options, :q_puppet_enterpriseconsole_database_user, console_database_user),
+          :q_puppet_enterpriseconsole_database_password => answer_for(options, :q_puppet_enterpriseconsole_database_password, dashboard_password),
 
-          :q_database_host => database,
+          :q_database_host => answer_for(options, :q_database_host, database),
           :q_database_port => database_port,
         }
 
@@ -130,7 +130,7 @@ module Beaker
         # Database only answers
         database_a = {
           :q_puppetdb_install => 'y',
-          :q_database_install => 'y',
+          :q_database_install => answer_for(options, :q_database_install, 'y'),
           :q_database_root_password => "'#{answer_for(options, :q_database_root_password, '=ZYdjiP3jCwV5eo9s1MBd')}'",
           :q_database_root_user => answer_for(options, :q_database_root_user, 'pe-postgres'),
         }
@@ -158,7 +158,7 @@ module Beaker
       if host == dashboard
         answers.merge! master_console_a
         answers.merge! console_database_a
-        answers[:q_pe_database] = 'y'
+        answers[:q_pe_database] = answer_for(options, :q_pe_database, 'y')
         unless options[:type] == :upgrade
           answers.merge! console_a
         else

data/lib/beaker/cli.rb

@@ -111,6 +111,8 @@ module Beaker
           if @network_manager
             @network_manager.cleanup
           end
+        else
+          preserve_hosts_file
         end
 
         @perf.print_perf_info if @options[:collect_perf_data]
@@ -127,7 +129,7 @@ module Beaker
             @network_manager.cleanup
           end
         else
-          preserve_hosts_file if @options[:provision]
+          preserve_hosts_file
         end
 
         if @logger.is_debug?
@@ -159,7 +161,7 @@ module Beaker
     #
     # @return nil
     def preserve_hosts_file
-      preserved_hosts_filename = File.join(@options[:log_dated_dir], File.basename(@options[:hosts_file]))
+      preserved_hosts_filename = File.join(@options[:log_dated_dir], 'hosts_preserved.yml')
       FileUtils.cp(@options[:hosts_file], preserved_hosts_filename)
       hosts_yaml = YAML.load_file(preserved_hosts_filename)
       newly_keyed_hosts_entries = {}
@@ -172,6 +174,8 @@ module Beaker
         end
       end
       hosts_yaml['HOSTS'] = newly_keyed_hosts_entries
+      hosts_yaml['CONFIG'] ||= {}
+      hosts_yaml['CONFIG']['provision'] = false
       File.open(preserved_hosts_filename, 'w') do |file|
         YAML.dump(hosts_yaml, file)
       end
@@ -253,8 +257,9 @@ module Beaker
 
     # provides a new version of the command given, edited for re-use with a
     # preserved host.  It does this by swapping the hosts file out for the
-    # new_hostsfile argument and setting the --no-provision flag, removing
-    # any previously set provisioning flags that it finds.
+    # new_hostsfile argument and removing any previously set provisioning
+    # flags that it finds
+    # (we add +:provision => false+ in the new_hostsfile itself).
     #
     # @param [String] command Command line parameters to edit.
     # @param [String] new_hostsfile Path to the new hosts file to use.
@@ -262,7 +267,6 @@ module Beaker
     # @return [String] The command line parameters edited for re-use
     def build_hosts_preserved_reproducing_command(command, new_hostsfile)
       command_parts = command.split(' ')
-      has_no_provision_flag = false
       replace_hosts_file_next = false
       reproducing_command = []
       command_parts.each do |part|
@@ -271,14 +275,12 @@ module Beaker
           replace_hosts_file_next = false
           next
         elsif part == '--provision' || part == '--no-provision'
-          has_no_provision_flag = true
-          next
+          next # skip any provisioning flag.  This is handled in the new_hostsfile itself
         elsif part == '--hosts'
           replace_hosts_file_next = true
         end
         reproducing_command << part
       end
-      reproducing_command << '--no-provision' unless has_no_provision_flag
       reproducing_command.join(' ')
     end
   end