beaker 2.24.0 → 2.25.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2JhMzVjZDBiMDlmZmY5YTMwMmQwODI4OWE5OWEwOWEzM2Y0OWM0NA==
+    MjM3NjhmMGI2NTg3NDQ3ODViNWRjM2Q3ZTg2MTg0ODQ0NGYzMmIzZg==
   data.tar.gz: !binary |-
-    NmVkNDllNTg5ZDU2MzAyMGRkNmU4NTI2NDcyMGE4NDA3MzUyNDFlNg==
+    MDhmOTFkMTVmOTYxN2VlYTEyMzcwZTZlNDYwNTIxM2E1MTk5MTRlNQ==
 SHA512:
   metadata.gz: !binary |-
-    MTNjYmZmZGYyZTQyMjlkZDk5OWZlYWViNDc1MTYwNTg2NDg5MWQ2ZTQxNTJh
-    MWU0MGYwMzgwMWU2MjU5OWIxMTlkMDAwMjVmZjM0ODNiNmEyYWMyNzczMzkz
-    N2FiYzA2Mjc3ZTdkODMwNjlkYmRjOGZkZDk2MThiZWJiMTQ0Zjk=
+    ODM4ODhjYzZiYWI3YmUyYWUwOTk0ZWYwYTI2OTQ5MWIyZjRlMzIyNzk1MDAw
+    ZDA2OTgzZmZjODRlYjM2ZDFkMmVlODc5MzZjOTVlZjNiZmFjZWQ5Y2I5OWU4
+    MTRiMWExYWIwYWRiYmJhOTQ2ZjIwMDk2YjA3N2Q4NzJjOWIyYjU=
   data.tar.gz: !binary |-
-    ZWFiMjRiMGRkMzA0YTE2YjA2ZWY5YjcxOTQzMmE0MDIxMzQwZWFiYTEyMmJm
-    NTY4YmNiZDU1NWEyNzkzNjg5YThkMDdjN2YyMjNiMjBlZmNjNWZhMGE1YzQy
-    YjZiMGNkNWIwMjZkMjcyODhhMmE5YjQ2ZGNmYWE4NzA5ZGJjNTI=
+    ZWMwN2MxNDIxNDY0YWRkZjYwNzhmMTBmMDdmOWY4NDliNGI4ZmUwYWNkZjUz
+    YTJlMDgyZjQxZWNhYjJlMzk3OTc0ODc2ZjNiYjhmYjg2ZTQ1YzkzZDhjMDZm
+    YTdiMjQ0M2VkOTZkM2E1MWUyZTYxOTM2NTI0MWEyNmE4MmNiYWU=

data/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Getting Started
 
-* If it is accessible to you, create a [Jira account](http://tickets.puppetlabs.com)
+* Create a [Jira account](http://tickets.puppetlabs.com)
 * Make sure you have a [GitHub account](https://github.com/signup/free)
 * Submit a ticket for your issue, assuming one does not already exist.
   * Clearly describe the issue including steps to reproduce when it is a bug.
@@ -46,13 +46,8 @@
 
 ### Maintenance
 
-For changes of a trivial nature, it is not always necessary to create a new ticket in Jira. In this case, it is appropriate to start the first line of a commit with `(MAINT)` instead of a ticket/issue number. 
+**We are no longer accepting PRs marked as `(MAINT)` - all PRs must be associated with a Beaker Jira ticket number for book keeping purposes.**
 
-````
-    (MAINT) Fix whitespace 
-
-    - remove additional spaces that appear at EOL
-````
 ### Version Bump For Gem Release
 
 To prepare for a new gem release of Beaker the `version.rb` file is updated with the upcoming gem version number.  This is submitted with `(GEM)` instead of a ticket/issue number.

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 15 Sep, 2015 (96d9104d)](#LATEST)
+* [LATEST - 1 Oct, 2015 (e21f5581)](#LATEST)
+* [2.24.0 - 15 Sep, 2015 (c12e9054)](#2.24.0)
 * [2.23.0 - 9 Sep, 2015 (2532324a)](#2.23.0)
 * [2.22.0 - 1 Sep, 2015 (96ec20a7)](#2.22.0)
 * [2.21.0 - 26 Aug, 2015 (40281eb2)](#2.21.0)
@@ -96,7 +97,242 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 15 Sep, 2015 (96d9104d)
+### <a name = "LATEST">LATEST - 1 Oct, 2015 (e21f5581)
+
+* (GEM) update beaker version to 2.25.0 (e21f5581)
+
+* Merge pull request #974 from anodelman/maint (65664e45)
+
+
+```
+Merge pull request #974 from anodelman/maint
+
+(BKR-568) no longer accept PRs marked as "(MAINT)"
+```
+* Merge pull request #964 from kevpl/bkr522_ec2_nocachedkeys (3ec3e14d)
+
+
+```
+Merge pull request #964 from kevpl/bkr522_ec2_nocachedkeys
+
+(BKR-522) now creates new ec2 keys per run
+```
+* (BKR-568) no longer accept PRs marked as "(MAINT)" (47d9d1ba)
+
+
+```
+(BKR-568) no longer accept PRs marked as "(MAINT)"
+
+- update CONTRIBUTING.md to indicate change in policy
+```
+* Merge pull request #973 from anodelman/ruby-test (9b52fe4e)
+
+
+```
+Merge pull request #973 from anodelman/ruby-test
+
+(BKR-564) beaker no longer works on ruby 1.9.3
+```
+* (BKR-564) beaker no longer works on ruby 1.9.3 (4f94d048)
+
+
+```
+(BKR-564) beaker no longer works on ruby 1.9.3
+
+- pin fog-google to 0.0.9, 0.1 release removed ruby 1.9 support
+```
+* Merge pull request #970 from johnduarte/bkr-545-frozen-string (deb4377f)
+
+
+```
+Merge pull request #970 from johnduarte/bkr-545-frozen-string
+
+(BKR-545) Dup solaris puppet_agent_version
+```
+* (BKR-545) Dup solaris puppet_agent_version (f1d2068b)
+
+
+```
+(BKR-545) Dup solaris puppet_agent_version
+
+This commit dups the `opts[:puppet_agent_version]` in the foss_utils to
+prevent a `RuntimeError: can't modify frozen String` error
+```
+* Merge pull request #963 from johnduarte/p5p-for-sol11 (b9e6a23e)
+
+
+```
+Merge pull request #963 from johnduarte/p5p-for-sol11
+
+(BKR-545) Use p5p for Solaris 11 puppet-agent pkgs
+```
+* Merge pull request #969 from johnduarte/aix-repo-install (a7280515)
+
+
+```
+Merge pull request #969 from johnduarte/aix-repo-install
+
+(BKR-554) Install AIX packages via install repo
+```
+* (BKR-554) Install AIX packages via install repo (973ff502)
+
+
+```
+(BKR-554) Install AIX packages via install repo
+
+This commit adds support for installing AIX 'packages' via the
+install repo logic. AIX does not support repository management
+and can only install 'RPM' files directly. Since this logic
+is contained in the install repo logic in Beaker, we can use
+this to install a package that has been mirrored to the standard
+repo location.
+
+This assumes that the package is mirrored to the repo location.
+In other words, that the following files are the same.
+  * http://builds.delivery.puppetlabs.net/puppet-agent/1214e51d63b84a82df0c55cab99abc2a3f90a597/artifacts/aix/7.1/PC1/ppc/puppet-agent-1.2.5.49.g1214e51-1.aix7.1.ppc.rpm
+  * http://builds.delivery.puppetlabs.net/puppet-agent/1214e51d63b84a82df0c55cab99abc2a3f90a597/repos/aix/7.1/PC1/ppc/puppet-agent-1.2.5.49.g1214e51-1.aix7.1.ppc.rpm
+
+It also assumes that the desired package is not defined for AIX
+in the acceptance pre-suite for the project.
+```
+* Merge pull request #967 from bkero/master (7852e6b3)
+
+
+```
+Merge pull request #967 from bkero/master
+
+(BKR-327) Add support for EL7 to epel_info_for and add_el_extras method
+```
+* fix spec tests to match ArgumentError for epel_info_for (d78a8de4)
+
+* Raise ArgumentErrors instead of generic errors (839b75e4)
+
+* (BKR-327) add epel7 support to get_el_info and el_install (0e5a0257)
+
+
+```
+(BKR-327) add epel7 support to get_el_info and el_install
+
+Base work courtesy of Andrew Stangl <andrewstangl@gmail.com>
+```
+* (BKR-327) add epel_7_pkg preset (0e9485d3)
+
+* (BKR-327) add tests for retrieving epel el7 url (41730085)
+
+* Merge pull request #960 from kevpl/bkr351_indent_add (7e91e61e)
+
+
+```
+Merge pull request #960 from kevpl/bkr351_indent_add
+
+(BKR-351) added indentation based on test/step nesting level
+```
+* Merge pull request #959 from anodelman/subset-hosts (1810fae0)
+
+
+```
+Merge pull request #959 from anodelman/subset-hosts
+
+(BKR-535) Regression: confine_block does not skip tests...
+```
+* Merge pull request #957 from anodelman/confine (8de4ee64)
+
+
+```
+Merge pull request #957 from anodelman/confine
+
+(BKR-533) Beaker's `confine` overwrites the array of all hosts
+```
+* (BKR-522) now creates new ec2 keys per run (07bb7405)
+
+
+```
+(BKR-522) now creates new ec2 keys per run
+
+Before, ec2 keys would only be created if this was the first run for
+a particular user/coordinator. This is a problem for F5 testing, in
+which F5 hosts needed to be created with a particular key. We were
+using cached keys, which weren't the ones being used in ec2.
+
+The original solution was to delete the keys in ec2, so that they'd
+be recreated as if this was the first run by a user. @justinstoller
+brought up the good point that if this were to happen, certain
+Beaker runs would have their keys deleted from a new F5 run. The
+solution became that each Beaker run would generate its own key,
+deleting it on cleanup.
+```
+* (BKR-545) Use p5p for Solaris 11 puppet-agent pkgs (831b0bb5)
+
+
+```
+(BKR-545) Use p5p for Solaris 11 puppet-agent pkgs
+
+This commit updates install_utils/foss_utils to use `p5p` as
+the expected package suffix for puppet-agent when the platform
+is Solaris 11. Solaris 10 will continue to use `pkg.gz` as its
+expected suffix.
+
+The `p5p` package naming format is much more stringent. See
+http://www.oracle.com/technetwork/articles/servers-storage-admin/ips-package-versioning-2232906.html
+for details.
+```
+* Merge pull request #955 from kevpl/bkr532_beakerhiera_merge (b181c059)
+
+
+```
+Merge pull request #955 from kevpl/bkr532_beakerhiera_merge
+
+(BKR-532) added beaker-hiera library usage
+```
+* (BKR-535) Regression: confine_block does not skip tests... (72955d58)
+
+
+```
+(BKR-535) Regression: confine_block does not skip tests...
+
+...with beaker 2.24.0
+
+- allow users to include skip_test in block parameter for confine_block
+- added acceptance test to ensure correct behavior
+```
+* (BKR-533) Beaker's `confine` overwrites the array of all hosts (be1cc5dc)
+
+
+```
+(BKR-533) Beaker's `confine` overwrites the array of all hosts
+
+- make it possible to confine to a subset of hosts + all hosts not in
+  the subset.
+
+  To confine to only windows agents + any non-agent hosts
+
+    confine :to, { :platform => 'windows' }, agents
+
+  To confine to non-windows agents + any non-agent hosts
+
+    confine :except, { :platform => 'windows' }, agent
+
+- Useful for cases where you want to use your master, but only operate
+  on a subset of agents
+```
+* (BKR-351) added indentation based on test/step nesting level (cec66d21)
+
+
+```
+(BKR-351) added indentation based on test/step nesting level
+
+This will only affect tests where `test_name` or `step` has
+been passed a block to execute.
+
+The only exception to that statement is `host.exec`'s
+logic, as it's more presentable to nest command output one
+level under the command itself.
+```
+* (BKR-532) added beaker-hiera library usage (127aa3de)
+
+### <a name = "2.24.0">2.24.0 - 15 Sep, 2015 (c12e9054)
+
+* (HISTORY) update beaker history for gem release 2.24.0 (c12e9054)
 
 * (GEM) update beaker version to 2.24.0 (96d9104d)
 

data/acceptance/tests/base/dsl/structure_test.rb

@@ -60,4 +60,20 @@ test_name "dsl::structure" do
       fail "#confine_block raised unexpected SkipTest exception: #{e}"
     end
   end
+
+  step "#confine_block allows blocks to raise skip_test" do
+    previous_hosts = hosts.dup
+
+    begin
+      @in_confine = 0
+      confine_block :to, :platform => default["platform"] do
+        @in_confine +=1
+        skip_test "this block raises a skip"
+      end
+    rescue Beaker::DSL::Outcomes::SkipTest => e
+      assert_match /this block raises a skip/, e.message, "#confine_block raised an unexpected skip_test"
+      assert_equal 1, @in_confine, "#confine_block did not execute supplied block"
+      assert_equal hosts.dup, hosts, "#confine_block did not preserve the hosts array"
+    end
+  end
 end

data/beaker.gemspec

@@ -39,8 +39,11 @@ Gem::Specification.new do |s|
   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'
+
+  # Run time dependencies that are Beaker libraries
   s.add_runtime_dependency 'beaker-answers', '~> 0.0'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0'
+  s.add_runtime_dependency 'beaker-hiera', '~> 0.0'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.8'
@@ -48,6 +51,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'google-api-client', '~> 0.8'
   s.add_runtime_dependency 'aws-sdk', '~> 1.57'
   s.add_runtime_dependency 'docker-api'
+  s.add_runtime_dependency 'fog-google', '~> 0.0.9' # dropped ruby 1.9 support in 0.1
   s.add_runtime_dependency 'fog', '~> 1.25'
 
   # So fog doesn't always complain of unmet AWS dependencies

data/lib/beaker/dsl/helpers.rb

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-[ 'facter', 'hiera', 'host', 'puppet', 'test', 'tk', 'web' ].each do |lib|
+[ 'facter', 'host', 'puppet', 'test', 'tk', 'web' ].each do |lib|
       require "beaker/dsl/helpers/#{lib}_helpers"
 end
 
+require "beaker-hiera"
 module Beaker
   module DSL
 
@@ -23,12 +24,12 @@ module Beaker
     #
     module Helpers
       include Beaker::DSL::Helpers::FacterHelpers
-      include Beaker::DSL::Helpers::HieraHelpers
       include Beaker::DSL::Helpers::HostHelpers
       include Beaker::DSL::Helpers::PuppetHelpers
       include Beaker::DSL::Helpers::TestHelpers
       include Beaker::DSL::Helpers::TKHelpers
       include Beaker::DSL::Helpers::WebHelpers
+      include Beaker::DSL::Helpers::Hiera
     end
   end
 end

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -1111,6 +1111,10 @@ module Beaker
               variant = ((variant == 'centos') ? 'el' : variant)
               release_path << "#{variant}/#{version}/#{opts[:puppet_collection]}/#{arch}"
               release_file = "puppet-agent-#{opts[:puppet_agent_version]}-1.#{variant}#{version}.#{arch}.rpm"
+            when /^(aix)$/
+              if arch == 'power' then arch = 'ppc' end
+              release_path << "#{variant}/#{version}/#{opts[:puppet_collection]}/#{arch}"
+              release_file = "puppet-agent-#{opts[:puppet_agent_version]}-1.#{variant}#{version}.#{arch}.rpm"
             when /^(debian|ubuntu|cumulus)$/
               if arch == 'x86_64'
                 arch = 'amd64'
@@ -1153,14 +1157,36 @@ module Beaker
               if arch == 'x86_64'
                 arch = 'i386'
               end
+              release_path << "solaris/#{version}/#{opts[:puppet_collection]}"
+              solaris_revision_conjunction = '-'
+              revision = '1'
               if version == '10'
                 # Solaris 10 uses / as the root user directory. Solaris 11 uses /root.
                 onhost_copy_base = '/'
+                solaris_release_version = ''
+                pkg_suffix = 'pkg.gz'
+                solaris_name_conjunction = '-'
+                component_version = opts[:puppet_agent_version]
+              elsif version == '11'
+                # Ref:
+                # http://www.oracle.com/technetwork/articles/servers-storage-admin/ips-package-versioning-2232906.html
+                #
+                # Example to show package name components:
+                #   Full package name: puppet-agent@1.2.5.38.6813,5.11-1.sparc.p5p
+                #   Schema: <component-name><solaris_name_conjunction><component_version><solaris_release_version><solaris_revision_conjunction><revision>.<arch>.<pkg_suffix>
+                solaris_release_version = ',5.11' # injecting comma to prevent from adding another var
+                pkg_suffix = 'p5p'
+                solaris_name_conjunction = '@'
+                component_version = opts[:puppet_agent_version].dup
+                component_version.gsub!(/[a-zA-Z]/, '')
+                component_version.gsub!(/(^-)|(-$)/, '')
+                # Here we strip leading 0 from version components but leave
+                # singular 0 on their own.
+                component_version = component_version.split('.').map(&:to_i).join('.')
               end
-              release_path << "solaris/#{version}/#{opts[:puppet_collection]}"
-              release_file = "puppet-agent-#{opts[:puppet_agent_version]}-1.#{arch}.pkg.gz"
+              release_file = "puppet-agent#{solaris_name_conjunction}#{component_version}#{solaris_release_version}#{solaris_revision_conjunction}#{revision}.#{arch}.#{pkg_suffix}"
               if not link_exists?("#{release_path}/#{release_file}")
-                release_file = "puppet-agent-#{opts[:puppet_agent_version]}.#{arch}.pkg.gz"
+                release_file = "puppet-agent#{solaris_name_conjunction}#{component_version}#{solaris_release_version}.#{arch}.#{pkg_suffix}"
               end
             else
               raise "No repository installation step for #{variant} yet..."
@@ -1173,6 +1199,25 @@ module Beaker
             case variant
             when /^(fedora|el|centos|sles)$/
               on host, "rpm -ivh #{onhost_copied_file}"
+            when /^(aix)$/
+              # NOTE: AIX does not support repo management. This block assumes
+              # that the desired rpm has been mirrored to the 'repos' location.
+              #
+              # NOTE: tar is a dependency for puppet packages on AIX. So,
+              # we install it prior to the 'repo' file.
+              tar_pkg_path = "ftp://ftp.software.ibm.com/aix/freeSoftware/aixtoolbox/RPMS/ppc/tar"
+              if version == "5.3" then
+                tar_pkg_file = "tar-1.14-2.aix5.1.ppc.rpm"
+              else
+                tar_pkg_file = "tar-1.22-1.aix6.1.ppc.rpm"
+              end
+              fetch_http_file( tar_pkg_path, tar_pkg_file, copy_dir_local)
+              scp_to host, File.join(copy_dir_local, tar_pkg_file), onhost_copy_base
+              onhost_copied_tar_file = File.join(onhost_copy_base, tar_pkg_file)
+              on host, "rpm -ivh #{onhost_copied_tar_file}"
+
+              # install the repo file
+              on host, "rpm -ivh #{onhost_copied_file}"
             when /^(debian|ubuntu|cumulus)$/
               on host, "dpkg -i --force-all #{onhost_copied_file}"
               on host, "apt-get update"
@@ -1184,7 +1229,8 @@ module Beaker
             when /^osx$/
               host.install_package("#{mac_pkg_name}*")
             when /^solaris$/
-              noask = <<NOASK
+              if version == '10'
+                noask = <<NOASK
 # Write the noask file to a temporary directory
 # please see man -s 4 admin for details about this file:
 # http://www.opensolarisforum.org/man/man4/admin.html
@@ -1214,8 +1260,11 @@ action=nocheck
 # Install to the default base directory.
 basedir=default
 NOASK
-              create_remote_file host, File.join(onhost_copy_base, 'noask'), noask
-              on host, "gunzip -c #{release_file} | pkgadd -d /dev/stdin -a noask -n all"
+                create_remote_file host, File.join(onhost_copy_base, 'noask'), noask
+                on host, "gunzip -c #{release_file} | pkgadd -d /dev/stdin -a noask -n all"
+              elsif version == '11'
+                on host, "pkg install -g #{release_file} puppet-agent"
+              end
             end
             configure_type_defaults_on( host )
           end