beaker 2.15.1 → 2.16.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDhkOTYxNGU4YTM4MjkyNTMyNzlkMmIzNTJlN2NmOWNhNzkwODE0Mg==
+    NDFkMzY5NTRmMTYyNWI3NzhhZTBkNDUyZDQwNDE4ZGQ4ZTYzOWE0MA==
   data.tar.gz: !binary |-
-    M2JmM2Q3ZWM0ZjJiYjAyNDYzMDMwMWU1MWYwYzIyOWQ3OTQ4MGNlMQ==
+    MmYyODFjZTYzNGM1NmRhYzRiZjNiZDIzMDEzOTdkMmI3ZDI5Y2JiZg==
 SHA512:
   metadata.gz: !binary |-
-    ZWFhMTg3NGRiZDBkNjA5M2JkMjEyY2EzYWNlZDgyMWI4YzMzMWExMzU4MjRl
-    ZWNkNGUwYmNkY2U0NTRiNTY1MGM3MDZkMzM3ZTM1Mjg1MmU4Y2YxNjQxN2Qw
-    OWI5ZGZmOWVlOTMxMGVlYWU2NTg2ZDViMzYyM2VmZTk5NTY2ZWE=
+    YjAyZTMxYjQ5YTZhOWQwZjM4N2NlYTVjYmEzMDg4MGZjNzgyYTYzNGUwNDk2
+    MDliNmY1NjYzMGY0MDE5YjE1NTc2YjdjZTRkNjk1ZmYyNWJmMzQ0ZDkxNTJh
+    NWMyMjBjYWMzY2I1MzVhYzYyNDQ1ZmI2MDFkOTI0YTEyYTFiNGM=
   data.tar.gz: !binary |-
-    Y2IwNzk2YjI3OTQ0NTZhMzZhOThkZjlmYjdhNWMwY2JlZWE0ODBhYmQyZTIy
-    MjQ1YzQ2MjRmNjY1N2UxNGQ2MWVlZjU0NmNlNzhmNjNhZThkN2Y0MDc5ZjM2
-    NzU1ODc3YmI4N2FkOTJjZTU2YjkzMDIxMDJmY2MzODViMGViOGM=
+    Yzc2NWU5OTQ3OWZlNGU2MzhlYTNhM2I0NThmOGU0NWRkZTgwM2EzMTQxYmMz
+    ODQwOTEwYWFiYWEzYzQ5MWJiY2NjZTk2NDRlZjk3YTg1MzFjMDQ0OTViM2Ey
+    YTY0YTdkMTYwMDhhYzFlNjkyM2VlOWRiMzBhOTlmODRhZjVkNWY=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 1 Jul, 2015 (eb1f373a)](#LATEST)
+* [LATEST - 6 Jul, 2015 (6b0a9ca2)](#LATEST)
+* [2.15.1 - 1 Jul, 2015 (cd6f0bab)](#2.15.1)
 * [2.15.0 - 1 Jul, 2015 (07c416fb)](#2.15.0)
 * [2.14.1 - 5 Jun, 2015 (35026603)](#2.14.1)
 * [2.14.0 - 4 Jun, 2015 (c0ebcd16)](#2.14.0)
@@ -84,7 +85,242 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 1 Jul, 2015 (eb1f373a)
+### <a name = "LATEST">LATEST - 6 Jul, 2015 (6b0a9ca2)
+
+* (GEM) update beaker version to 2.16.0 (6b0a9ca2)
+
+* Merge pull request #876 from anodelman/shallow (6edc61fe)
+
+
+```
+Merge pull request #876 from anodelman/shallow
+
+(BKR-383) puppet-agent dmg installation doesn't work for anything...
+```
+* Merge pull request #877 from anodelman/osx (35d266b0)
+
+
+```
+Merge pull request #877 from anodelman/osx
+
+(BKR-384) & (BKR-385) support for dev puppet-agent installation on osx
+```
+* Merge pull request #878 from anodelman/maint (c011ff05)
+
+
+```
+Merge pull request #878 from anodelman/maint
+
+(MAINT) bad hardcoded 'debian' in puppet-agent promoted installation
+```
+* Merge pull request #856 from kevpl/bkr336_executiontime_add (fbe5b300)
+
+
+```
+Merge pull request #856 from kevpl/bkr336_executiontime_add
+
+(BKR-336) added command-line arg to get test results in timing order
+```
+* (MAINT) bad hardcoded 'debian' in puppet-agent promoted installation (441de9ea)
+
+
+```
+(MAINT) bad hardcoded 'debian' in puppet-agent promoted installation
+
+- should use #{variant} and not hardcoded debian, otherwise pukes on
+  ubuntu
+```
+* (BKR-384) install_puppet_agent_dev_repo needs to support osx (9772fcfb)
+
+
+```
+(BKR-384) install_puppet_agent_dev_repo needs to support osx
+
+- able to install dev puppet-agent on osx
+
+example:
+
+install_puppet_agent_dev_repo_on(host,
+   { :puppet_agent_sha => 'c2946821d1bcd7e43a34bd1f9cd2f86160ca4fe0',
+     :puppet_agent_version => '1.2.1.23.gc294682'    })
+```
+* (BKR-385) beaker needs to be able to convert mac codename to... (dee9b7c6)
+
+
+```
+(BKR-385) beaker needs to be able to convert mac codename to...
+
+...version number
+
+- add support to the platform object to handle yosemite -> 10.10 and
+  mavericks -> 10.9 conversions for osx variant
+```
+* Merge pull request #875 from anodelman/puppet-agent (0a4318a2)
+
+
+```
+Merge pull request #875 from anodelman/puppet-agent
+
+(BKR-377) Installing the Latest Puppet Agent Package
+```
+* (BKR-383) puppet-agent dmg installation doesn't work for anything... (6361cd78)
+
+
+```
+(BKR-383) puppet-agent dmg installation doesn't work for anything...
+
+... other than 'latest'
+
+- fix up the url construction for downloading a release mac puppet-agent
+- tested locally
+- there currently is not puppet-agent-latest.dmg file, so that won't
+  work until that is posted
+```
+* Merge pull request #861 from logicminds/BKR-365 (c6bcdc9c)
+
+
+```
+Merge pull request #861 from logicminds/BKR-365
+
+BKR-365 - allow beaker to use ssh config with rsync
+```
+* Merge pull request #867 from anodelman/hypervisor-acceptance (20e12ca7)
+
+
+```
+Merge pull request #867 from anodelman/hypervisor-acceptance
+
+(BKR-367) create beaker ec2 smoketest
+```
+* Merge pull request #866 from kevpl/bkr318_f5_added (2cedf59a)
+
+
+```
+Merge pull request #866 from kevpl/bkr318_f5_added
+
+(BKR-318) added platform support for f5
+```
+* Merge pull request #871 from anodelman/answers (66b3d8e1)
+
+
+```
+Merge pull request #871 from anodelman/answers
+
+(BKR-370) beaker doesn't use answers set as env vars
+```
+* (BKR-377) Installing the Latest Puppet Agent Package (ffaada1e)
+
+
+```
+(BKR-377) Installing the Latest Puppet Agent Package
+
+- support 'latest' as puppet_agent_version in
+  install_puppet_agent_pe_promoted_on
+- default to 'latest' for
+  install_puppet_agent_pe_promoted_on::puppet_agent_version
+```
+* Merge pull request #873 from anodelman/shallow (a14f1624)
+
+
+```
+Merge pull request #873 from anodelman/shallow
+
+(BKR-376) better interface to install puppet-agent through install_pe
+```
+* Merge pull request #874 from anodelman/maint (a0959a20)
+
+
+```
+Merge pull request #874 from anodelman/maint
+
+(BKR-378) RHEL4 runs fail due to the absence of yum
+```
+* (BKR-378) RHEL4 runs fail due to the absence of yum (e7276d32)
+
+
+```
+(BKR-378) RHEL4 runs fail due to the absence of yum
+
+- regression: accidentally changed as a ride along to puppet-agent installation
+  work, return to correct state
+```
+* (BKR-376) better interface to install puppet-agent through install_pe (bfb9f006)
+
+
+```
+(BKR-376) better interface to install puppet-agent through install_pe
+
+- standardize on parameter names puppet_agent_version, puppet_agent_sha
+- if no puppet_agent_sha is provided default to puppet_agent_version
+- support new env vars
+  * BEAKER_PUPPET_AGENT_VERSION
+  * BEAKER_PUPPET_AGENT_SHA
+  * BEAKER_PUPPET_COLLECTION
+
+- examples (puppet-agent installation):
+  install_puppet_agent_on(host, { :version => '1.1.0', :default_action => 'gem_install'})
+  install_puppet_agent_dev_repo_on(host, { :puppet_agent_sha => 'd3377feaeac173aada3a2c2cedd141eb610960a7', :puppet_agent_version => '1.1.1.225.gd3
+377fe'  })
+  install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_sha => '1.1.0.227', :puppet_agent_version => '1.1.0.227.g1d8334c', :pe_ver => '4.0
+.0-rc1'})
+
+- using install_pe/install_pe_on (for versions of PE > 4.0)
+set the puppet-agent version through an env var:
+  export BEAKER_PUPPET_AGENT_VERSION=1.2.0
+can then just call:
+  install_pe or install_pe_on(hosts, options)
+
+set the puppet-agent version through the options hash
+  options[:puppet_agent_version] = '1.2.0'
+  install_pe
+```
+* (BKR-370) beaker doesn't use answers set as env vars (521780ec)
+
+
+```
+(BKR-370) beaker doesn't use answers set as env vars
+
+- not correctly using 'answer_for' to determine if there is a provided
+  value for all questions
+- fixed up some variable naming for clarity
+```
+* (BKR-367) create beaker ec2 smoketest (56aa9438)
+
+
+```
+(BKR-367) create beaker ec2 smoketest
+
+- add acceptance/tests/hypervisor/communication.rb, checks to ensure
+  that hosts can ping each other
+- enable ping for aws ec2 instances created by beaker
+- create host.ping method to ping from host to a second host, return
+  'true' when ping is successful, 'false' otherwise
+```
+* (BKR-318) added platform support for f5 (308cb672)
+
+* BKR-365 - allow beaker to use ssh config with rsync (691823fc)
+
+
+```
+BKR-365 - allow beaker to use ssh config with rsync
+
+   * fixes a bug that vagrant introduced when using dynamic ssh configs
+```
+* (BKR-336) added command-line arg to get test results in timing order (806ff012)
+
+
+```
+(BKR-336) added command-line arg to get test results in timing order
+
+The new argument will allow a second beaker_*.xml file to be
+created next to the first one in timing order.
+
+Conflicts:
+	lib/beaker/options/command_line_parser.rb
+```
+### <a name = "2.15.1">2.15.1 - 1 Jul, 2015 (cd6f0bab)
+
+* (HISTORY) update beaker history for gem release 2.15.1 (cd6f0bab)
 
 * (GEM) update beaker version to 2.15.1 (eb1f373a)
 

data/acceptance/tests/hypervisor/communication.rb

@@ -0,0 +1,7 @@
+# hosts should be able to talk to each other by name
+step "hosts can ping each other"
+hosts.each do |one|
+  hosts.each do |two|
+    assert_equal(one.ping(two), true)
+  end
+end

data/lib/beaker/answers/version30.rb

@@ -19,33 +19,33 @@ module Beaker
 
       # Everything's an agent
       agent_a = {
-        :q_puppetagent_install => 'y',
-        :q_puppet_cloud_install => 'y',
+        :q_puppetagent_install => answer_for(options, :q_puppetagent_install, 'y'),
+        :q_puppet_cloud_install => answer_for(options, :q_puppet_cloud_install, 'y'),
         :q_verify_packages => answer_for(options, :q_verify_packages, 'y'),
-        :q_puppet_symlinks_install => 'y',
-        :q_puppetagent_certname => host.to_s,
+        :q_puppet_symlinks_install => answer_for(options, :q_puppet_symlinks_install, 'y'),
+        :q_puppetagent_certname => answer_for(options, :q_puppetagent_certname, host.to_s),
 
         # Disable database, console, and master by default
         # This will be overridden by other blocks being merged in.
-        :q_puppetmaster_install => 'n',
-        :q_all_in_one_install => 'n',
-        :q_puppet_enterpriseconsole_install => 'n',
-        :q_puppetdb_install => 'n',
-        :q_database_install => 'n',
+        :q_puppetmaster_install => answer_for(options, :q_puppetmaster_install, 'n'),
+        :q_all_in_one_install => answer_for(options, :q_all_in_one_install, 'n'),
+        :q_puppet_enterpriseconsole_install => answer_for(options, :q_puppet_enterpriseconsole_install, 'n'),
+        :q_puppetdb_install => answer_for(options, :q_puppetdb_install, 'n'),
+        :q_database_install => answer_for(options, :q_database_install, 'n'),
       }
       agent_a[:q_puppetagent_server] = masterless ? host.to_s : master.to_s
       agent_a[:q_continue_or_reenter_master_hostname] = 'c' if masterless
 
       # These base answers are needed by all
       common_a = {
-        :q_install => 'y',
-        :q_vendor_packages_install => 'y',
+        :q_install => answer_for(options, :q_install, 'y'),
+        :q_vendor_packages_install => answer_for(options, :q_vendor_packages_install, 'y'),
       }
 
       unless masterless
         # master/database answers
         master_database_a = {
-          :q_puppetmaster_certname => master.to_s
+          :q_puppetmaster_certname => answer_for(options, :q_puppetmaster_certname, master.to_s)
         }
 
         # Master/dashboard answers
@@ -57,79 +57,84 @@ module Beaker
         # Master only answers
         master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
         master_a = {
-          :q_puppetmaster_install => 'y',
+          :q_puppetmaster_install => answer_for(options, :q_puppetmaster_install, 'y'),
           :q_puppetmaster_dnsaltnames => master_dns_altnames,
-          :q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
+          :q_puppetmaster_enterpriseconsole_hostname => answer_for(options, :q_puppetmaster_enterpriseconsole_hostname, dashboard.to_s),
           :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
         }
 
         # Common answers for console and database
-        database_name = answer_for(options, :q_puppetdb_database_name, 'pe-puppetdb')
-        database_user = answer_for(options, :q_puppetdb_database_user, 'mYpdBu3r')
-        dashboard_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
-        puppetdb_password = "'#{answer_for(options, :q_puppetdb_password)}'"
-        auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
-        auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
+        console_auth_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
+        puppetdb_database_name = answer_for(options, :q_puppetdb_database_name, 'pe-puppetdb')
+        puppetdb_database_user = answer_for(options, :q_puppetdb_database_user, 'mYpdBu3r')
+        puppetdb_database_password = answer_for(options, :q_puppetdb_database_password, "'#{answer_for(options, :q_puppetdb_password)}'")
+        console_auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
+        console_auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
+        console_auth_database_password = answer_for(options, :q_puppet_enterpriseconsole_auth_database_password, console_auth_password)
         console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
         console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
-        database_port = answer_for(options, :q_database_port, 5432)
+        console_database_host = answer_for(options, :q_database_host, database.to_s)
+        console_database_port = answer_for(options, :q_database_port, 5432)
+        console_database_password = answer_for(options, :q_puppet_enterpriseconsole_database_password, console_auth_password)
 
         console_database_a = {
-          :q_puppetdb_database_name => database_name,
-          :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 => answer_for(options, :q_puppet_enterpriseconsole_auth_database_password, dashboard_password),
+          :q_puppetdb_database_name => puppetdb_database_name,
+          :q_puppetdb_database_user => puppetdb_database_user,
+          :q_puppetdb_database_password => puppetdb_database_password,
+          :q_puppet_enterpriseconsole_auth_database_name => console_auth_database_name,
+          :q_puppet_enterpriseconsole_auth_database_user => console_auth_database_user,
+          :q_puppet_enterpriseconsole_auth_database_password => console_auth_database_password,
           :q_puppet_enterpriseconsole_database_name => console_database_name,
-          :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 => answer_for(options, :q_database_host, database.to_s),
-          :q_database_port => database_port,
+          :q_puppet_enterpriseconsole_database_user => console_database_user,
+          :q_puppet_enterpriseconsole_database_password => console_database_password,
+          :q_database_host => console_database_host,
+          :q_database_port => console_database_port,
         }
 
         # Console only answers
         dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
 
 
+        console_install = answer_for(options, :q_puppet_enterpriseconsole_install, 'y')
+        console_inventory_hostname = answer_for(options, :q_puppet_enterpriseconsole_inventory_hostname, host.to_s)
+        console_inventory_certname = answer_for(options, :q_puppet_enterpriseconsole_inventory_certname, host.to_s)
+        console_inventory_dnsaltnames = answer_for(options, :q_puppet_enterpriseconsole_inventory_dnsaltnames, dashboard.to_s)
         smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
         smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
         smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
         smtp_password = answer_for(options, :q_puppet_enterpriseconsole_smtp_password)
         smtp_use_tls = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_use_tls)}'"
         console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
+        master_hostname = answer_for(options, :q_puppet_enterpriseconsole_master_hostname, master.to_s)
         console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
 
         console_a = {
-          :q_puppet_enterpriseconsole_install => 'y',
-          :q_puppet_enterpriseconsole_inventory_hostname => host.to_s,
-          :q_puppet_enterpriseconsole_inventory_certname => host.to_s,
-          :q_puppet_enterpriseconsole_inventory_dnsaltnames => dashboard.to_s,
+          :q_puppet_enterpriseconsole_install => console_install,
+          :q_puppet_enterpriseconsole_inventory_hostname => console_inventory_hostname,
+          :q_puppet_enterpriseconsole_inventory_certname => console_inventory_certname,
+          :q_puppet_enterpriseconsole_inventory_dnsaltnames => console_inventory_dnsaltnames,
           :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-          :q_puppet_enterpriseconsole_master_hostname => master.to_s,
-
+          :q_puppet_enterpriseconsole_master_hostname => master_hostname,
           :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
-          :q_puppet_enterpriseconsole_auth_password => dashboard_password,
-
+          :q_puppet_enterpriseconsole_auth_password => console_auth_password,
           :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
-
           :q_puppet_enterpriseconsole_smtp_host => smtp_host,
           :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
           :q_puppet_enterpriseconsole_smtp_port => smtp_port,
         }
 
         if smtp_password and smtp_username
+          console_smtp_user_auth = answer_for(options, :q_puppet_enterpriseconsole_smtp_user_auth, 'y')
           console_a.merge!({
                              :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
                              :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
-                             :q_puppet_enterpriseconsole_smtp_user_auth => 'y'
+                             :q_puppet_enterpriseconsole_smtp_user_auth => console_smtp_user_auth
                            })
         end
 
         # Database only answers
         database_a = {
-          :q_puppetdb_install => 'y',
+          :q_puppetdb_install => answer_for(options, :q_puppetdb_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'),
@@ -138,7 +143,7 @@ module Beaker
 
       # Special answers for special hosts
       aix_a = {
-        :q_run_updtvpkg => 'y',
+        :q_run_updtvpkg => answer_for(options, :q_run_updtvpkg, 'y'),
       }
 
       answers = common_a.dup
@@ -205,8 +210,8 @@ module Beaker
         if @options[:type] == :upgrade and h[:pe_ver] =~ /\A3.0/
           # 3.0.x to 3.0.x should require no answers
           the_answers[h.name] = {
-            :q_install => 'y',
-            :q_install_vendor_packages => 'y',
+            :q_install => answer_for(@options, :q_install, 'y'),
+            :q_install_vendor_packages => answer_for(@options, :q_install_vendor_packages, 'y'),
           }
         else
           the_answers[h.name] = host_answers(h, master, database, dashboard, @options)