beaker 1.17.7 → 1.18.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTRlMGQ5MWEzMDc0ZjUyZmJjZmJiMzBjMzU4N2NkOWVkMDAwOGVhYQ==
+    MzQxM2VhODU1MzlmN2Q3NjRmYmU0Y2ExM2QyMDBiYWNlNjg0ODAwMg==
   data.tar.gz: !binary |-
-    MWEwMGQ0ZDY2MDUzODU2ZWJmYTY5YTk4OTc5Y2U0NjI4YmI4YWJhNg==
+    NjQ1YjA0NzYxMTllZDMxYWE1Yjk1MzVjNzY4NzA2NzQ5N2MyNjU2Ng==
 SHA512:
   metadata.gz: !binary |-
-    MTIxZWJmNDgxMDg4NTAzOWFlZWZhNDk2ZWY5ZDY3NGUzOTc5ZTJiODQ1MWY0
-    MTQ4Njk4ZDYyZTc0NmQ5OTBmNTkyNDdkMGE3ZWVkMzMzNzE5MzQ1M2E5ZjFj
-    MDcxNDBmZjYxNTI1ZjAzZTFhZjk0NWQwMTYxMDM2MmUyMDkwZjA=
+    NjViZjlhMDg2OWVmNzkzMTUwYmFkODc5MjBhNDJmNGZiNGFlZmMwZGFmMTY4
+    NDkwMWMzMGMzYTE1NmFhMDllYjA4MTUzZmJlOGZhMzkxNjNhZDFjYjdkNDQ2
+    NjRiMjNiZTBjMGI0Y2ZiY2E1NzViM2VmODE2ZGZjMGI5ZmY5OWU=
   data.tar.gz: !binary |-
-    YmI4MWQ5N2YzNzJlYTQ4ZDk2YzlkNDU0MjhiN2M3ZjUwZDdjMTlmYWQxNzRm
-    ZmRjNmMxNzI1NGFmMmExODNiOTFkNmU0YmRmNTEyYmZmMzk2NDE3MDEzZmY5
-    ODE5YjExZTE5ODU3MTU3NDc4NjQ1MzdhOTBjMmZjNTA5MTFjMzU=
+    YTU0NWUzMDAyZjM0ODkzNzNlODU0MjZlMGQwZDVmZDA3MmFjOGYwMjA0OTI4
+    ZTdmOGY5NjY5OTQ2OTU4NjI0NmEzYzFlNzRkZmI5YjEyYzNkNmUwODY1MTgy
+    MTZkZjUwZGIxMzZlY2RjZDhkMjM4NDc3Y2JiNzg4OTNhMjM2YzA=

data/HISTORY.md

@@ -1,6 +1,8 @@
 # beaker - History
 ## Tags
-* [LATEST - 27 Aug, 2014 (71be2050)](#LATEST)
+* [LATEST - 18 Sep, 2014 (116ecd2e)](#LATEST)
+* [beaker1.17.7 - 2 Sep, 2014 (e47881f0)](#beaker1.17.7)
+* [beaker1.17.6 - 27 Aug, 2014 (bfb257bf)](#beaker1.17.6)
 * [beaker1.17.5 - 22 Aug, 2014 (7e553089)](#beaker1.17.5)
 * [beaker1.17.4 - 21 Aug, 2014 (8e6d070f)](#beaker1.17.4)
 * [beaker1.17.3 - 20 Aug, 2014 (f8a536c1)](#beaker1.17.3)
@@ -58,7 +60,317 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 27 Aug, 2014 (71be2050)
+### <a name = "LATEST">LATEST - 18 Sep, 2014 (116ecd2e)
+
+* (GEM) version bump for beaker 1.18.0 (116ecd2e)
+
+* Merge pull request #450 from anodelman/scp-repair (ee03903b)
+
+
+```
+Merge pull request #450 from anodelman/scp-repair
+
+(QENG-1128) Beaker no long auto recursively scps directories to systems under test
+```
+* Merge pull request #361 from anodelman/openstack (2e15cdaa)
+
+
+```
+Merge pull request #361 from anodelman/openstack
+
+(QENG-15) support openstack in beaker
+```
+* Merge pull request #388 from ferventcoder/ticket/master/allow-git-depth (4d4120a3)
+
+
+```
+Merge pull request #388 from ferventcoder/ticket/master/allow-git-depth
+
+(QENG-1037) Install from git should accept depth
+```
+* Merge pull request #435 from leoc/add-prebuilt-packages-to-docker (c0a20691)
+
+
+```
+Merge pull request #435 from leoc/add-prebuilt-packages-to-docker
+
+(gh-426) Add prebuild packages to Dockerfile
+```
+* Merge pull request #439 from doug-rosser/perf_fixes (7c68e4da)
+
+
+```
+Merge pull request #439 from doug-rosser/perf_fixes
+
+(QENG-1033) Don't modify constants and properly support all Linux platforms in Perf
+```
+* Merge pull request #416 from anodelman/ec2 (de3b3f9d)
+
+
+```
+Merge pull request #416 from anodelman/ec2
+
+(MAINT) add ability to list all instances associated with an ec2 keyname
+```
+* (QENG-1033) Remove dead rspec code (c713fdb1)
+
+* Merge pull request #451 from anodelman/maint (34db9711)
+
+
+```
+Merge pull request #451 from anodelman/maint
+
+(MAINT) broken spec fixes (docker + copy_module_to)
+```
+* (MAINT) broken spec fixes (docker + copy_module_to) (98454e51)
+
+
+```
+(MAINT) broken spec fixes (docker + copy_module_to)
+
+- docker spec was still allowing sleeps to execute making things run
+  slow
+- update copy_module_to spec test to use correct ignore list
+```
+* (QENG-1128) Beaker no long auto recursively scps directories... (c89fae53)
+
+
+```
+(QENG-1128) Beaker no long auto recursively scps directories...
+
+to systems under test
+
+- issue was :recursive variable was being carried over successive calls
+  to scp_to.  To prevent this, just set it based upon the file type
+  being called
+```
+* Merge pull request #440 from colinPL/qeng989_solaris_gem (34e6474f)
+
+
+```
+Merge pull request #440 from colinPL/qeng989_solaris_gem
+
+(QENG-989) install_puppet_from_gem fails on Solaris
+```
+* Merge pull request #412 from anodelman/maint (8e991e18)
+
+
+```
+Merge pull request #412 from anodelman/maint
+
+(QENG-1018) default dev_builds_url in Beaker needs to be updated
+```
+* Merge pull request #448 from cyberious/AddIgnores (eb5a99c5)
+
+
+```
+Merge pull request #448 from cyberious/AddIgnores
+
+QENG-1199 add .bundle to ignore list
+```
+* QENG-1199 add .bundle to ignore list (314d85ce)
+
+* (QENG-1033) Move all functionality into the Perf module and sync the rspec tests (64e69a17)
+
+* Merge pull request #445 from waynr/fix/qeng-1186-beaker-dsl-helpers-puppet-mixup (cbff4759)
+
+
+```
+Merge pull request #445 from waynr/fix/qeng-1186-beaker-dsl-helpers-puppet-mixup
+
+(QENG-1186) Fix Beaker::DSL:Helpers.puppet_{user,group}
+```
+* Merge pull request #425 from jtopper/avoid_docker_clean_race (c40c37de)
+
+
+```
+Merge pull request #425 from jtopper/avoid_docker_clean_race
+
+(GH-425) Sleep briefly after killing processes - Docker
+```
+* Merge pull request #436 from anodelman/win-fix (de316e3a)
+
+
+```
+Merge pull request #436 from anodelman/win-fix
+
+(QENG-797) Enhance Beaker to look for x64 installers for Windows
+```
+* (QENG-1033) Reset additional_pkgs in a way supported by all Ruby versions (9e6b5283)
+
+* (QENG-1033) additional_pkgs should be a module level variable (6623ec0e)
+
+* (QENG-1186) Fix Beaker::DSL:Helpers.puppet_{user,group} (5bb6ee4e)
+
+
+```
+(QENG-1186) Fix Beaker::DSL:Helpers.puppet_{user,group}
+
+Looks like the contents of these methods were mixed upwhen originally written.
+Luckily the puppet user is usually the same as the puppet group.
+
+Signed-off-by: Wayne <wayne@puppetlabs.com>
+```
+* (QENG-1033) combine two conditionals into a single statement (e2e91ccc)
+
+* (QENG-989) install_puppet_from_gem fails on Solaris (45ac614e)
+
+
+```
+(QENG-989) install_puppet_from_gem fails on Solaris
+
+Trying to install puppet from gems would fail on both Solaris 10 and
+11. Solaris 10 now has pkgutil and gem symlinked (ln -s) to /usr/bin.
+Both Solaris versions have puppet-related gems symlinked to /usr/bin
+after installation. This is to avoid clobbering the PATH.
+```
+* (QENG-1129) support win64 open source builds (47bf159f)
+
+
+```
+(QENG-1129) support win64 open source builds
+
+- add ability to install 64 bit windows builds
+- supported when puppet version is 3.7+ or pe is 3.4+, and install_32 is not set for
+  host or globally
+- correctly update path post pe/puppet installation
+```
+* (QENG-1026) Add support for x64 PE windows to Beaker (59a39bd7)
+
+
+```
+(QENG-1026) Add support for x64 PE windows to Beaker
+
+- default to installing 64 bit builds on 64 bit windows
+- support install_32 host option, true = install 32 bit no matter the
+  arch, false/unset = install 64 bit on 64 bit, otherwise 32 bit
+```
+* (QENG-797) Enhance Beaker to look for x64 installers for Windows (066dae5d)
+
+
+```
+(QENG-797) Enhance Beaker to look for x64 installers for Windows
+
+- add ability to install 64 bit pe builds (available for pe 3.4)
+- add is_x86_64? method to host, convenience method for determining arch
+  of host
+```
+* (gh-426) Add prebuild packages to Dockerfile (f4085aca)
+
+
+```
+(gh-426) Add prebuild packages to Dockerfile
+
+Without this patch every time the specs run, prebuilt packages are
+installed to the new docker image. Even when preserving the image.
+To increase the speed of the test suite we install those packages when
+creating the Docker image. The `HostPrebuiltSteps` checks whether those
+are installed and does not do anything directly starting to execute the
+specs inside the image.
+```
+* (GH-425) Sleep after killing processes (18699dc4)
+
+
+```
+(GH-425) Sleep after killing processes
+
+This avoids a race condition in which the killed processes haven't
+exited by the time we try and unmount the root fs and the call to
+container.delete errors.
+```
+* (MAINT) add ability to list all instances associated with an ec2 keyname (d5ad9e35)
+
+
+```
+(MAINT) add ability to list all instances associated with an ec2 keyname
+
+- convenience function for listing all instances associated with a
+  provided keyname, useful for tracking what's happening in ec2
+```
+* (QENG-1018) default dev_builds_url in Beaker needs to be updated (1b2a935f)
+
+
+```
+(QENG-1018) default dev_builds_url in Beaker needs to be updated
+
+- update to builds.delivery.puppetlabs.net
+```
+* (QENG-1037) Install from git should accept depth (ffcddcc0)
+
+
+```
+(QENG-1037) Install from git should accept depth
+
+When installing from larger repositories, being able to specify depth can cut
+the time of git checkout in half. This becomes especially helpful when you are
+checking out multiple repositories.
+Due to the older git on some of the templates, this provides the older
+--branch name --depth 1 commands, which means when using depth, one should
+ensure the rev passed is a branch and not a single commit. Alternatively one
+can add depth_branch => 'name' to repository and have that used instead of rev.
+```
+* (maint) formatting (239d8054)
+
+
+```
+(maint) formatting
+
+This removes trailing whitespaces in install_utils.rb
+```
+* Add Enterprise Linux (el) (3f2bb69b)
+
+* (QENG-15) beaker openstack support (EXPERIMENTAL) (745f1a4a)
+
+
+```
+(QENG-15) beaker openstack support (EXPERIMENTAL)
+
+- experimental code to support openstack, may be missing configuration
+  steps or otherwise be incomplete
+- should be used as a basis for further beaker openstack infrastructure
+```
+### <a name = "beaker1.17.7">beaker1.17.7 - 2 Sep, 2014 (e47881f0)
+
+* Merge pull request #444 from branan/ship_1_17_7 (e47881f0)
+
+
+```
+Merge pull request #444 from branan/ship_1_17_7
+
+(maint) Bump version for 1.17.7 release
+```
+* (maint) Bump version for 1.17.7 release (0cb30f18)
+
+* Merge pull request #443 from briancain/maint/master/add-node-to-classifier (701f81c2)
+
+
+```
+Merge pull request #443 from briancain/maint/master/add-node-to-classifier
+
+(QENG-1182) Add node to classifier prior to adding pe_repo class
+```
+* (QENG-1182) Add node to classifier prior to adding pe_repo class (00b2f458)
+
+
+```
+(QENG-1182) Add node to classifier prior to adding pe_repo class
+
+Prior to this commit, beaker would make the assumption that a node had
+already checked into the classifier. This commit changes that by
+ensuring that the node is in the classifier before giving it the pe_repo
+class.
+```
+### <a name = "beaker1.17.6">beaker1.17.6 - 27 Aug, 2014 (bfb257bf)
+
+* Merge pull request #441 from anodelman/make-gem (bfb257bf)
+
+
+```
+Merge pull request #441 from anodelman/make-gem
+
+create beaker 1.17.6 gem
+```
+* (HISTORY) update history for 1.17.6 gem (a7ee6c69)
 
 * (GEM) version bump for 1.17.6 gem (71be2050)
 

data/beaker.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'google-api-client', '~> 0.7.1'
   s.add_runtime_dependency 'aws-sdk', '1.42.0'
   s.add_runtime_dependency 'docker-api' unless RUBY_VERSION < '1.9'
+  s.add_runtime_dependency 'fog', '~> 1.22.1'
 
   # These are transitive dependencies that we include or pin to because...
   # Ruby 1.8 compatibility

data/lib/beaker/dsl/helpers.rb

@@ -28,7 +28,7 @@ module Beaker
     # @api dsl
     module Helpers
 
-      PUPPET_MODULE_INSTALL_IGNORE = ['.git', '.idea', '.vagrant', '.vendor', 'acceptance', 'spec', 'tests', 'log']
+      PUPPET_MODULE_INSTALL_IGNORE = ['.bundle', '.git', '.idea', '.vagrant', '.vendor', 'acceptance', 'spec', 'tests', 'log']
 
       # @!macro common_opts
       #   @param [Hash{Symbol=>String}] opts Options to alter execution.
@@ -476,7 +476,7 @@ module Beaker
       # @note This method assumes puppet is installed on the host.
       #
       def puppet_user(host)
-        return host.puppet('master')['group']
+        return host.puppet('master')['user']
       end
 
       # Return the name of the puppet group.
@@ -486,7 +486,7 @@ module Beaker
       # @note This method assumes puppet is installed on the host.
       #
       def puppet_group(host)
-        return host.puppet('master')['user']
+        return host.puppet('master')['group']
       end
 
       # @!visibility private

data/lib/beaker/dsl/install_utils.rb

@@ -101,14 +101,25 @@ module Beaker
       #
       # @see #find_git_repo_versions
       def install_from_git host, path, repository
-        name   = repository[:name]
-        repo   = repository[:path]
-        rev    = repository[:rev]
-        target = "#{path}/#{name}"
+        name          = repository[:name]
+        repo          = repository[:path]
+        rev           = repository[:rev]
+        depth         = repository[:depth]
+        depth_branch  = repository[:depth_branch]
+        target        = "#{path}/#{name}"
+
+        if (depth_branch.nil?)
+          depth_branch = rev
+        end
+
+        clone_cmd = "git clone #{repo} #{target}"
+        if (depth)
+          clone_cmd = "git clone --branch #{depth_branch} --depth #{depth} #{repo} #{target}"
+        end
 
         step "Clone #{repo} if needed" do
           on host, "test -d #{path} || mkdir -p #{path}"
-          on host, "test -d #{target} || git clone #{repo} #{target}"
+          on host, "test -d #{target} || #{clone_cmd}"
         end
 
         step "Update #{name} and check out revision #{rev}" do
@@ -152,10 +163,9 @@ module Beaker
       def installer_cmd(host, opts)
         version = host['pe_ver'] || opts[:pe_ver]
         if host['platform'] =~ /windows/
-          version = host[:pe_ver] || opts['pe_ver_win']
           log_file = "#{File.basename(host['working_dir'])}.log"
           pe_debug = host[:pe_debug] || opts[:pe_debug] ? " && cat #{log_file}" : ''
-          "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /L*V #{log_file} /i puppet-enterprise-#{version}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'#{pe_debug}"
+          "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /L*V #{log_file} /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'#{pe_debug}"
         elsif host['platform'] =~ /osx/
           version = host['pe_ver'] || opts[:pe_ver]
           pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -verboseR' : ''
@@ -307,7 +317,7 @@ module Beaker
         path = host['pe_dir'] || opts[:pe_dir]
         local = File.directory?(path)
         version = host['pe_ver'] || opts[:pe_ver_win]
-        filename = "puppet-enterprise-#{version}"
+        filename = "#{host['dist']}"
         extension = ".msi"
         if local
           if not File.exists?("#{path}/#{filename}#{extension}")
@@ -431,6 +441,17 @@ module Beaker
           elsif host['platform'] =~ /osx/
             version = host['pe_ver'] || opts[:pe_ver]
             host['dist'] = "puppet-enterprise-#{version}-#{host['platform']}"
+          elsif host['platform'] =~ /windows/
+            version = host[:pe_ver] || opts['pe_ver_win']
+            #only install 64bit builds if
+            # - we are on pe version 3.4+
+            # - we do not have install_32 set on host
+            # - we do not have install_32 set globally
+            if !(version_is_less(version, '3.4')) and host.is_x86_64? and not host['install_32'] and not opts['install_32']
+              host['dist'] = "puppet-enterprise-#{version}-x64"
+            else
+              host['dist'] = "puppet-enterprise-#{version}"
+            end
           end
           host['working_dir'] = host.tmpdir(Time.new.strftime("%Y-%m-%d_%H.%M.%S"))
         end
@@ -634,11 +655,11 @@ module Beaker
       #                                       Puppet via gem.
       # @option opts [String] :release The major release of the OS
       # @option opts [String] :family The OS family (one of 'el' or 'fedora')
-      # 
+      #
       # @return nil
       # @api private
       def install_puppet_from_rpm( host, opts )
-        release_package_string = "http://yum.puppetlabs.com/puppetlabs-release-#{opts[:family]}-#{opts[:release]}.noarch.rpm" 
+        release_package_string = "http://yum.puppetlabs.com/puppetlabs-release-#{opts[:family]}-#{opts[:release]}.noarch.rpm"
 
         on host, "rpm -ivh #{release_package_string}"
 
@@ -661,7 +682,7 @@ module Beaker
       # @option opts [String] :version The version of Puppet to install, if nil installs latest version
       # @option opts [String] :facter_version The version of Facter to install, if nil installs latest version
       # @option opts [String] :hiera_version The version of Hiera to install, if nil installs latest version
-      # 
+      #
       # @return nil
       # @api private
       def install_puppet_from_deb( host, opts )
@@ -698,20 +719,32 @@ module Beaker
       # @param [Host] host The host to install packages on
       # @param [Hash{Symbol=>String}] opts An options hash
       # @option opts [String] :version The version of Puppet to install, required
-      # 
+      #
       # @return nil
       # @api private
       def install_puppet_from_msi( host, opts )
-        on host, "curl -O http://downloads.puppetlabs.com/windows/puppet-#{opts[:version]}.msi"
-        on host, "msiexec /qn /i puppet-#{opts[:version]}.msi"
-
-        #Because the msi installer doesn't add Puppet to the environment path
-        if fact_on(host, 'architecture').eql?('x86_64')
-          install_dir = '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin'
+        #only install 64bit builds if
+        # - we are on puppet version 3.7+
+        # - we do not have install_32 set on host
+        # - we do not have install_32 set globally
+        version = opts[:version]
+        if !(version_is_less(version, '3.7')) and host.is_x86_64? and not host['install_32'] and not opts['install_32']
+          host['dist'] = "puppet-#{version}-x64"
         else
-          install_dir = '/cygdrive/c/Program Files/Puppet Labs/Puppet/bin'
+          host['dist'] = "puppet-#{version}"
         end
-        on host, %Q{ echo 'export PATH=$PATH:"#{install_dir}"' > /etc/bash.bashrc }
+        link = "http://downloads.puppetlabs.com/windows/#{host['dist']}.msi"
+        if not link_exists?( link )
+          raise "Puppet #{version} at #{link} does not exist!"
+        end
+        on host, "curl -O #{link}"
+        on host, "msiexec /qn /i #{host['dist']}.msi"
+
+        #Because the msi installer doesn't add Puppet to the environment path
+        #Add both potential paths for simplicity
+        #NOTE - this is unnecessary if the host has been correctly identified as 'foss' during set up
+        puppetbin_path = "\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\""
+        on host, %Q{ echo 'export PATH=$PATH:#{puppetbin_path}' > /etc/bash.bashrc }
       end
 
       # Installs Puppet and dependencies from dmg
@@ -721,7 +754,7 @@ module Beaker
       # @option opts [String] :version The version of Puppet to install, required
       # @option opts [String] :facter_version The version of Facter to install, required
       # @option opts [String] :hiera_version The version of Hiera to install, required
-      # 
+      #
       # @return nil
       # @api private
       def install_puppet_from_dmg( host, opts )
@@ -749,20 +782,25 @@ module Beaker
       # @option opts [String] :version The version of Puppet to install, if nil installs latest
       # @option opts [String] :facter_version The version of Facter to install, if nil installs latest
       # @option opts [String] :hiera_version The version of Hiera to install, if nil installs latest
-      # 
+      #
       # @return nil
       # @raise [StandardError] if gem does not exist on target host
       # @api private
       def install_puppet_from_gem( host, opts )
+        # There are a lot of special things to do for Solaris and Solaris 10.
+        # This is easier than checking host['platform'] every time.
+        is_solaris10 = host['platform'] =~ /solaris-10/
+        is_solaris = host['platform'] =~ /solaris/
+
         # Hosts may be provisioned with csw but pkgutil won't be in the
         # PATH by default to avoid changing the behavior for Puppet's tests
-        if host['platform'] =~ /solaris-10/
+        if is_solaris10
           on host, 'ln -s /opt/csw/bin/pkgutil /usr/bin/pkgutil'
         end
 
         # Solaris doesn't necessarily have this, but gem needs it
-        if host['platform'] =~ /solaris/
-          on host, 'mkdir -p /var/lib' 
+        if is_solaris
+          on host, 'mkdir -p /var/lib'
         end
 
         unless host.check_for_command( 'gem' )
@@ -779,6 +817,11 @@ module Beaker
           host.install_package gempkg
         end
 
+        # Link 'gem' to /usr/bin instead of adding /opt/csw/bin to PATH.
+        if is_solaris10
+          on host, 'ln -s /opt/csw/bin/gem /usr/bin/gem'
+        end
+
         if host['platform'] =~ /debian|ubuntu|solaris/
           gem_env = YAML.load( on( host, 'gem environment' ).stdout )
           gem_paths_array = gem_env['RubyGems Environment'].find {|h| h['GEM PATHS'] != nil }['GEM PATHS']
@@ -796,6 +839,21 @@ module Beaker
 
         ver_cmd = opts[:version] ? "-v#{opts[:version]}" : ''
         on host, "gem install puppet #{ver_cmd} --no-ri --no-rdoc"
+
+        # Similar to the treatment of 'gem' above.
+        # This avoids adding /opt/csw/bin to PATH.
+        if is_solaris
+          gem_env = YAML.load( on( host, 'gem environment' ).stdout )
+          # This is the section we want - this has the dir where gem executables go.
+          env_sect = 'EXECUTABLE DIRECTORY'
+          # Get the directory where 'gem' installs executables.
+          # On Solaris 10 this is usually /opt/csw/bin
+          gem_exec_dir = gem_env['RubyGems Environment'].find {|h| h[env_sect] != nil }[env_sect]
+
+          on host, "ln -s #{gem_exec_dir}/hiera /usr/bin/hiera"
+          on host, "ln -s #{gem_exec_dir}/facter /usr/bin/facter"
+          on host, "ln -s #{gem_exec_dir}/puppet /usr/bin/puppet"
+        end
       end
 
 

data/lib/beaker/host.rb

@@ -192,6 +192,18 @@ module Beaker
       self[:ip] ||= get_ip
     end
 
+    #Examine the host system to determine the architecture
+    #@return [Boolean] true if x86_64, false otherwise
+    def determine_if_x86_64
+      result = exec(Beaker::Command.new("arch | grep x86_64"), :acceptable_exit_codes => (0...127))
+      result.exit_code == 0
+    end
+
+    #@return [Boolean] true if x86_64, false otherwise
+    def is_x86_64?
+      @x86_64 ||= determine_if_x86_64
+    end
+
     def connection
       @connection ||= SshConnection.connect( reachable_name,
                                              self['user'],
@@ -251,13 +263,12 @@ module Beaker
       result.exit_code == 0
     end
 
-    # scp files from the localhost to this test host
+    # scp files from the localhost to this test host, if a directory is provided it is recursively copied
     # @param source [String] The path to the file/dir to upload
     # @param target [String] The destination path on the host
     # @param [Hash{Symbol=>String}] options Options to alter execution
-    # @option options [Boolean] :recursive Should we copy recursively?  Defaults to 'True' in case of a directory source.
     # @option options [Array<String>] :ignore An array of file/dir paths that will not be copied to the host
-    def do_scp_to source, target, options
+    def do_scp_to source, target, options = {}
       @logger.debug "localhost $ scp #{source} #{@name}:#{target}"
 
       result = Result.new(@name, [source, target])

data/lib/beaker/host/windows.rb

@@ -25,8 +25,8 @@ module Windows
         'puppetvardir'  => '`cygpath -smF 35`/PuppetLabs/puppet/var',
         'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc/modules',
         'sitemoduledir' => 'C:/usr/share/puppet/modules',
-        #if an x86 Program Files dir exists then use it, default to just Program Files
-        'puppetbindir'  => '$( [ -d "/cygdrive/c/Program Files (x86)" ] && echo "/cygdrive/c/Program Files (x86)" || echo "/cygdrive/c/Program Files" )/Puppet Labs/Puppet Enterprise/bin',
+        #if an x86 Puppet Labs dir exists then use it, default to non-x86 Program Files directory
+        'puppetbindir'  => '$( [ -d "/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/bin" ] && echo "/cygdrive/c/Program Files (x86)" || echo "/cygdrive/c/Program Files" )/Puppet Labs/Puppet Enterprise/bin',
         'pathseparator' => ';',
       })
     end
@@ -44,7 +44,7 @@ module Windows
         'hieralibdir'       => '`cygpath -w /opt/puppet-git-repos/hiera/lib`',
         'hierapuppetlibdir' => '`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`',
         # PATH related variables need to be Unix, which cygwin converts
-        'puppetbindir'  => '$( [ -d "/cygdrive/c/Program Files (x86)" ] && echo "/cygdrive/c/Program Files (x86)" || echo "/cygdrive/c/Program Files" )/Puppet Labs/Puppet/bin',
+        'puppetbindir'  => '$( [ -d "/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin" ] && echo "/cygdrive/c/Program Files (x86)" || echo "/cygdrive/c/Program Files" )/Puppet Labs/Puppet/bin',
         'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
         'pathseparator'     => ';',
       })

data/lib/beaker/host/windows/pkg.rb

@@ -35,6 +35,12 @@ module Windows::Pkg
     raise "Package #{name} cannot be uninstalled on #{self}"
   end
 
+  #Examine the host system to determine the architecture, overrides default host determine_if_x86_64 so that wmic is used
+  #@return [Boolean] true if x86_64, false otherwise
+  def determine_if_x86_64
+    identify_windows_architecture =~ /64/
+  end
+
   private
 
   # @api private

data/lib/beaker/host_prebuilt_steps.rb

@@ -77,10 +77,6 @@ module Beaker
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
     def validate_host host, opts
       logger = opts[:logger]
-      if opts[:collect_perf_data]
-        UNIX_PACKAGES << "sysstat" if !UNIX_PACKAGES.include? "sysstat"
-        SLES_PACKAGES << "sysstat" if !SLES_PACKAGES.include? "sysstat"
-      end
       block_on host do |host|
         case
         when host['platform'] =~ /sles-/

data/lib/beaker/hypervisor.rb

@@ -44,6 +44,8 @@ module Beaker
           Beaker::GoogleCompute
         when /docker/
           Beaker::Docker
+        when /openstack/
+          Beaker::OpenStack
         when /none/
           Beaker::Hypervisor
         else
@@ -108,6 +110,6 @@ module Beaker
   end
 end
 
-[ 'vsphere_helper', 'vagrant', 'fusion', 'blimper', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute' ].each do |lib|
+[ 'vsphere_helper', 'vagrant', 'fusion', 'blimper', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack' ].each do |lib|
     require "beaker/hypervisor/#{lib}"
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -88,6 +88,28 @@ module Beaker
       nil #void
     end
 
+    #Print instances to the logger.  Instances will be from all regions associated with provided key name and
+    #limited by regex compared to instance status.  Defaults to running instances.
+    #@param [String] key The key_name to match for
+    #@param [Regex] status The regular expression to match against the instance's status
+    def log_instances(key = key_name, status = /running/)
+      instances = []
+      @ec2.regions.each do |region|
+        @logger.debug "Reviewing: #{region.name}"
+        @ec2.regions[region.name].instances.each do |instance|
+          if (instance.key_name =~ /#{key}/) and (instance.status.to_s =~ status)
+            instances << instance
+          end
+        end
+      end
+      output = ""
+      instances.each do |instance|
+        output << "#{instance.id} keyname: #{instance.key_name}, dns name: #{instance.dns_name}, private ip: #{instance.private_ip_address}, ip: #{instance.ip_address}, launch time #{instance.launch_time}, status: #{instance.status}\n"
+      end
+      @logger.notify("aws-sdk: List instances (keyname: #{key})")
+      @logger.notify("#{output}")
+    end
+
     #Shutdown and destroy ec2 instances idenfitied by key that have been alive longer than ZOMBIE hours.
     #@param [Integer] max_age The age in hours that a machine needs to be older than to be considered a zombie
     #@param [String] key The key_name to match for

data/lib/beaker/hypervisor/docker.rb

@@ -64,6 +64,7 @@ module Beaker
           @logger.debug("stop container #{container.id}")
           begin
             container.stop
+            sleep 2 # avoid a race condition where the root FS can't unmount
           rescue Excon::Errors::ClientError => e
             @logger.warn("stop of container #{container.id} failed: #{e.response.body}")
           end
@@ -112,19 +113,19 @@ module Beaker
       when /ubuntu/, /debian/
         dockerfile += <<-EOF
           RUN apt-get update
-          RUN apt-get install -y openssh-server openssh-client
+          RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
         EOF
       when /^el-/, /centos/, /fedora/, /redhat/
         dockerfile += <<-EOF
           RUN yum clean all
-          RUN yum install -y sudo openssh-server openssh-clients
+          RUN yum install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
           RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
           RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
         EOF
       when /opensuse/, /sles/
         sshd_options = '-o "PermitRootLogin yes" -o "PasswordAuthentication yes" -o "UsePAM no"'
         dockerfile += <<-EOF
-          RUN zypper -n in openssh
+          RUN zypper -n in openssh #{Beaker::HostPrebuiltSteps::SLES_PACKAGES.join(' ')}
           RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
           RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
         EOF

data/lib/beaker/hypervisor/openstack.rb

@@ -0,0 +1,154 @@
+module Beaker
+  #Beaker support for OpenStack
+  #This code is EXPERIMENTAL!
+  #Please file any issues/concerns at https://github.com/puppetlabs/beaker/issues
+  class OpenStack < Beaker::Hypervisor
+
+    SLEEPWAIT = 5
+
+    #Create a new instance of the OpenStack hypervisor object
+    #@param [<Host>] openstack_hosts The array of OpenStack hosts to provision
+    #@param [Hash{Symbol=>String}] options The options hash containing configuration values
+    #@option options [String] :openstack_api_key The key to access the OpenStack instance with (required)
+    #@option options [String] :openstack_username The username to access the OpenStack instance with (required)
+    #@option options [String] :openstack_auth_url The URL to access the OpenStack instance with (required)
+    #@option options [String] :openstack_tenant The tenant to access the OpenStack instance with (required)
+    #@option options [String] :openstack_network The network that each OpenStack instance should be contacted through (required)
+    #@option options [String] :openstack_keyname The name of an existing key pair that should be auto-loaded onto each 
+    #                                            OpenStack instance (optional)
+    #@option options [String] :jenkins_build_url Added as metadata to each OpenStack instance
+    #@option options [String] :department Added as metadata to each OpenStack instance
+    #@option options [String] :project Added as metadata to each OpenStack instance
+    #@option options [Integer] :timeout The amount of time to attempt execution before quiting and exiting with failure
+    def initialize(openstack_hosts, options)
+      require 'fog'
+      @options = options
+      @logger = options[:logger]
+      @hosts = openstack_hosts
+      @vms = []
+
+      raise 'You must specify an Openstack API key (:oopenstack_api_key) for OpenStack instances!' unless @options[:openstack_api_key]
+      raise 'You must specify an Openstack username (:openstack_username) for OpenStack instances!' unless @options[:openstack_username]
+      raise 'You must specify an Openstack auth URL (:openstack_auth_url) for OpenStack instances!' unless @options[:openstack_auth_url]
+      raise 'You must specify an Openstack tenant (:openstack_tenant) for OpenStack instances!' unless @options[:openstack_tenant]
+      raise 'You must specify an Openstack network (:openstack_network) for OpenStack instances!' unless @options[:openstack_network]
+      @compute_client ||= Fog::Compute.new(:provider => :openstack,
+                                           :openstack_api_key => @options[:openstack_api_key],
+                                           :openstack_username => @options[:openstack_username],
+                                           :openstack_auth_url => @options[:openstack_auth_url],
+                                           :openstack_tenant => @options[:openstack_tenant])
+      if not @compute_client
+        raise "Unable to create OpenStack Compute instance (api key: #{@options[:openstack_api_key]}, username: #{@options[:openstack_username]}, auth_url: #{@options[:openstack_auth_url]}, tenant: #{@options[:openstack_tenant]})"
+      end
+      @network_client || Fog::Network.new(
+        :provider => :openstack,
+        :openstack_api_key => @options[:openstack_api_key],
+        :openstack_username => @options[:openstack_username],
+        :openstack_auth_url => @options[:openstack_auth_url])
+      if not @network_client
+
+        raise "Unable to create OpenStack Network instance (api_key: #{@options[:openstack_api_key]}, username: #{@options[:openstack_username]}, auth_url: #{@options[:openstack_auth_url]}, tenant: #{@options[:openstack_tenant]})"
+                                                                                                                                      end
+    end
+
+    #Provided a flavor name return the OpenStack id for that flavor
+    #@param [String] f The flavor name
+    #@return [String] Openstack id for provided flavor name
+    def flavor f
+      @logger.debug "OpenStack: Looking up flavor '#{f}'"
+      @compute_client.flavors.find { |x| x.name == f } || raise("Couldn't find flavor: #{f}")
+    end
+
+    #Provided an image name return the OpenStack id for that image
+    #@param [String] i The image name
+    #@return [String] Openstack id for provided image name
+    def image i
+      @logger.debug "OpenStack: Looking up image '#{i}'"
+      @compute_client.images.find { |x| x.name == i } || raise("Couldn't find image: #{i}")
+    end
+
+    #Provided a network name return the OpenStack id for that network
+    #@param [String] n The network name
+    #@return [String] Openstack id for provided network name
+    def network n
+      @logger.debug "OpenStack: Looking up network '#{n}'"
+      @network_client.networks.find { |x| x.name == n } || raise("Couldn't find network: #{n}")
+    end
+
+    #Create new instances in OpenStack
+    def provision
+      @logger.notify "Provisioning OpenStack"
+
+      @hosts.each do |host|
+        host[:vmhostname] = generate_host_name
+        @logger.debug "Provisioning #{host.name} (#{host[:vmhostname]})"
+        options = {
+          :flavor_ref => flavor(host[:flavor]).id,
+          :image_ref => image(host[:image]).id,
+          :nics => [ {'net_id' => network(@options[:openstack_network]).id } ],
+          :name => host[:vmhostname],
+        }
+        if @options[:openstack_keyname]
+          @logger.debug "Adding optional key_name #{@options[:openstack_keyname]} to #{host.name} (#{host[:vmhostname]})"
+          options[:key_name] = @options[:openstack_keyname]
+        end
+        vm = @compute_client.servers.create(options)
+
+        #wait for the new instance to start up
+        start = Time.now
+        try = 1
+        attempts = @options[:timeout].to_i / SLEEPWAIT
+
+        while try <= attempts
+          begin
+            vm.wait_for(5) { ready? }
+            break
+          rescue Fog::Errors::TimeoutError => e
+            if try >= attempts
+              @logger.debug "Failed to connect to new OpenStack instance #{host.name} (#{host[:vmhostname]})"
+              raise e
+            end
+            @logger.debug "Timeout connecting to instance #{host.name} (#{host[:vmhostname]}), trying again..."
+          end
+          sleep SLEEPWAIT
+          try += 1
+        end
+
+        # Associate a public IP to the server
+        # Create if there are no floating ips available
+        #
+        ip = @compute_client.addresses.find { |ip| ip.instance_id.nil? }
+        if ip.nil?
+          @logger.debug "Creating IP for #{host.name} (#{host[:vmhostname]})"
+          ip = @compute_client.addresses.create
+        end
+        ip.server = vm
+        host[:ip] = ip.ip
+        @logger.debug "OpenStack host #{host.name} (#{host[:vmhostname]}) assigned ip: #{host[:ip]}"
+
+        #set metadata
+        vm.metadata.update({:jenkins_build_url => @options[:jenkins_build_url].to_s,
+                            :department        => @options[:department].to_s,
+                            :project           => @options[:project].to_s })
+        @vms << vm
+
+      end
+    end
+
+    #Destroy any OpenStack instances
+    def cleanup
+      @logger.notify "Cleaning up OpenStack"
+      @vms.each do |vm|
+        @logger.debug "Release floating IPs for OpenStack host #{vm.name}"
+        floating_ips = vm.all_addresses # fetch and release its floating IPs
+        floating_ips.each do |address|
+          @compute_client.disassociate_address(vm.id, address['ip'])
+          @compute_client.release_address(address['id'])
+        end
+        @logger.debug "Destroying OpenStack host #{vm.name}"
+        vm.destroy
+      end
+    end
+
+  end
+end

data/lib/beaker/options/presets.rb

@@ -119,7 +119,7 @@ module Beaker
           :add_el_extras        => false,
           :release_apt_repo_url => "http://apt.puppetlabs.com",
           :release_yum_repo_url => "http://yum.puppetlabs.com",
-          :dev_builds_url       => "http://builds.puppetlabs.lan",
+          :dev_builds_url       => "http://builds.delivery.puppetlabs.net",
           :consoleport          => 443,
           :pe_dir               => '/opt/enterprise/dists',
           :pe_version_file      => 'LATEST',

data/lib/beaker/perf.rb

@@ -2,6 +2,11 @@ module Beaker
   # The Beaker Perf class. A single instance is created per Beaker run.
   class Perf
 
+    PERF_PACKAGES = ['sysstat']
+    # SLES does not treat sysstat as a service that can be started
+    PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|sles/
+    PERF_START_PLATFORMS     = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el/
+
     # Create the Perf instance and runs setup_perf_on_host on all hosts if --collect-perf-data
     # was used as an option on the Baker command line invocation. Instances of this class do not
     # hold state and its methods are helpers for remotely executing tasks for performance data
@@ -18,11 +23,22 @@ module Beaker
       @hosts.map { |h| setup_perf_on_host(h) }
     end
 
-    # Some systems need special modification to make sysstat work. This is done here.
+    # Install sysstat if required and perform any modifications needed to make sysstat work.
     # @param [Host] host The host we are working with
     # @return [void]
     def setup_perf_on_host(host)
       @logger.perf_output("Setup perf on host: " + host)
+      # Install sysstat if required
+      if host['platform'] =~ PERF_SUPPORTED_PLATFORMS
+        PERF_PACKAGES.each do |pkg|
+          if not host.check_for_package pkg
+            host.install_package pkg
+          end
+        end
+      else
+        @logger.perf_output("Perf (sysstat) not supported on host: " + host)
+      end
+
       if host['platform'] =~ /debian|ubuntu/
         @logger.perf_output("Modify /etc/default/sysstat on Debian and Ubuntu platforms")
         host.exec(Command.new('sed -i s/ENABLED=\"false\"/ENABLED=\"true\"/ /etc/default/sysstat'))
@@ -30,7 +46,7 @@ module Beaker
         @logger.perf_output("Creating symlink from /etc/sysstat/sysstat.cron to /etc/cron.d")
         host.exec(Command.new('ln -s /etc/sysstat/sysstat.cron /etc/cron.d'),:acceptable_exit_codes => [0,1])
       end
-      if host['platform'] =~ /debian|ubuntu|redhat|centos/ # SLES doesn't need this step
+      if host['platform'] =~ PERF_START_PLATFORMS # SLES doesn't need this step
         host.exec(Command.new('service sysstat start'))
       end
     end
@@ -50,8 +66,10 @@ module Beaker
     # @return [void]  The report is sent to the logging output
     def get_perf_data(host, perf_start, perf_end)
       @logger.perf_output("Getting perf data for host: " + host)
-      if host['platform'] =~ /debian|ubuntu|redhat|centos|sles/
-        host.exec(Command.new("sar -A -s #{perf_start.strftime("%H:%M:%S")} -e #{perf_end.strftime("%H:%M:%S")}"))
+      if host['platform'] =~ PERF_SUPPORTED_PLATFORMS # All flavours of Linux
+        host.exec(Command.new("sar -A -s #{perf_start.strftime("%H:%M:%S")} -e #{perf_end.strftime("%H:%M:%S")}"),:acceptable_exit_codes => [0,1,2])
+      else
+        @logger.perf_output("Perf (sysstat) not supported on host: " + host)
       end
     end
   end

data/lib/beaker/ssh_connection.rb

@@ -166,7 +166,7 @@ module Beaker
     def scp_to source, target, options = {}, dry_run = false
       return if dry_run
 
-      options[:recursive]  = File.directory?(source) if options[:recursive].nil?
+      options[:recursive]  = File.directory?(source)
       options[:chunk_size] = options[:chunk_size] || 16384
 
       result = Result.new(@hostname, [source, target])
@@ -188,7 +188,7 @@ module Beaker
     def scp_from source, target, options = {}, dry_run = false
       return if dry_run
 
-      options[:recursive] = true if options[:recursive].nil?
+      options[:recursive] = true
       options[:chunk_size] = options[:chunk_size] || 16384
 
       result = Result.new(@hostname, [source, target])

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.17.7'
+    STRING = '1.18.0'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -1232,7 +1232,7 @@ describe ClassMixedWithDSLHelpers do
   end
 
   describe 'copy_module_to' do
-    let(:ignore_list){%w(.git .idea .vagrant .vendor acceptance spec tests log . ..)}
+    let(:ignore_list) { Beaker::DSL::Helpers::PUPPET_MODULE_INSTALL_IGNORE }
     let(:source){'./'}
     let(:target){'/etc/puppetlabs/puppet/modules/testmodule'}
     let(:module_parse_name){'testmodule'}

data/spec/beaker/dsl/install_utils_spec.rb

@@ -88,6 +88,47 @@ describe ClassMixedWithDSLInstallUtils do
 
       subject.install_from_git( host, path, repo )
     end
+
+    it 'allows a checkout depth of 1' do
+      repo   = { :name => 'puppet',
+                 :path => 'git://my.server.net/puppet.git',
+                 :rev => 'master',
+                 :depth => 1 }
+
+      path   = '/path/to/repos'
+      cmd    = "test -d #{path}/#{repo[:name]} || git clone --branch #{repo[:rev]} --depth #{repo[:depth]} #{repo[:path]} #{path}/#{repo[:name]}"
+      host   = { 'platform' => 'debian' }
+      logger = double.as_null_object
+      subject.should_receive( :logger ).exactly( 3 ).times.and_return( logger )
+      subject.should_receive( :on ).with( host,"test -d #{path} || mkdir -p #{path}").exactly( 1 ).times
+      # this is the the command we want to test
+      subject.should_receive( :on ).with( host, cmd ).exactly( 1 ).times
+      subject.should_receive( :on ).with( host, "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin && git clean -fdx && git checkout -f #{repo[:rev]}" ).exactly( 1 ).times
+      subject.should_receive( :on ).with( host, "cd #{path}/#{repo[:name]} && if [ -f install.rb ]; then ruby ./install.rb ; else true; fi" ).exactly( 1 ).times
+
+      subject.install_from_git( host, path, repo )
+    end
+
+    it 'allows a checkout depth with a rev from a specific branch' do
+      repo   = { :name => 'puppet',
+                 :path => 'git://my.server.net/puppet.git',
+                 :rev => 'a2340acddadfeafd234230faf',
+                 :depth => 50,
+                 :depth_branch => 'master' }
+
+      path   = '/path/to/repos'
+      cmd    = "test -d #{path}/#{repo[:name]} || git clone --branch #{repo[:depth_branch]} --depth #{repo[:depth]} #{repo[:path]} #{path}/#{repo[:name]}"
+      host   = { 'platform' => 'debian' }
+      logger = double.as_null_object
+      subject.should_receive( :logger ).exactly( 3 ).times.and_return( logger )
+      subject.should_receive( :on ).with( host,"test -d #{path} || mkdir -p #{path}").exactly( 1 ).times
+      # this is the the command we want to test
+      subject.should_receive( :on ).with( host, cmd ).exactly( 1 ).times
+      subject.should_receive( :on ).with( host, "cd #{path}/#{repo[:name]} && git remote rm origin && git remote add origin #{repo[:path]} && git fetch origin && git clean -fdx && git checkout -f #{repo[:rev]}" ).exactly( 1 ).times
+      subject.should_receive( :on ).with( host, "cd #{path}/#{repo[:name]} && if [ -f install.rb ]; then ruby ./install.rb ; else true; fi" ).exactly( 1 ).times
+
+      subject.install_from_git( host, path, repo )
+    end
    end
 
   describe 'sorted_hosts' do
@@ -105,6 +146,7 @@ describe ClassMixedWithDSLInstallUtils do
   describe 'installer_cmd' do
 
     it 'generates a windows PE install command for a windows host' do
+      winhost['dist'] = 'puppet-enterprise-3.0'
       subject.stub( :hosts ).and_return( [ hosts[1], hosts[0], hosts[2], winhost ] )
       expect( subject.installer_cmd( winhost, {} ) ).to be === "cd /tmp && cmd /C 'start /w msiexec.exe /qn /L*V tmp.log /i puppet-enterprise-3.0.msi PUPPET_MASTER_SERVER=vm1 PUPPET_AGENT_CERTNAME=winhost'"
     end
@@ -210,6 +252,7 @@ describe ClassMixedWithDSLInstallUtils do
       File.stub( :directory? ).and_return( true ) #is local
       File.stub( :exists? ).and_return( true ) #is present
       winhost['pe_dir'] = '/local/file/path'
+      winhost['dist'] = 'puppet-enterprise-3.0'
       subject.stub( :scp_to ).and_return( true )
 
       path = winhost['pe_dir']
@@ -265,6 +308,7 @@ describe ClassMixedWithDSLInstallUtils do
       subject.stub( :sign_certificate_for ).and_return( true )
       subject.stub( :stop_agent_on ).and_return( true )
       subject.stub( :sleep_until_puppetdb_started ).and_return( true )
+      subject.stub( :version_is_less ).with('3.0', '3.4').and_return( true )
       subject.stub( :version_is_less ).with('3.0', '3.0').and_return( false )
       subject.stub( :wait_for_host_in_dashboard ).and_return( true )
       subject.stub( :puppet_agent ).and_return do |arg|
@@ -436,7 +480,7 @@ describe ClassMixedWithDSLInstallUtils do
       end
       it 'falls back to installing from gem when given :default_action => "gem_install"' do
         result = double
-        gem_env_string = '{"RubyGems Environment": [ {"GEM PATHS": [] } ] }'
+        gem_env_string = '{"RubyGems Environment": [ {"GEM PATHS": [], "EXECUTABLE DIRECTORY": "/does/not/exist" } ] }'
         allow( result ).to receive(:stdout).and_return gem_env_string
         allow(subject).to receive(:on).with(host, /gem environment/).and_return result
         expect(subject).to receive(:on).with(host, /gem install/)

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -278,22 +278,6 @@ describe Beaker do
 
     end
 
-    it "can validate unix hosts that need sysstat installed" do
-      total_pkgs = Array.new(unix_only_pkgs);
-      total_pkgs << "sysstat"
-
-      hosts.each do |host|
-        total_pkgs.each do |pkg|
-          host.should_receive( :check_for_package ).with( pkg ).once.and_return( false )
-          host.should_receive( :install_package ).with( pkg ).once
-        end
-      end
-
-      opts = options.merge({:collect_perf_data => true})
-      subject.validate_host(hosts, opts)
-
-    end
-
     it "can validate windows hosts" do
       @platform = 'windows'
 

data/spec/beaker/hypervisor/docker_spec.rb

@@ -171,21 +171,25 @@ module Beaker
       end
 
       it 'should stop the containers' do
+        docker.stub( :sleep ).and_return(true)
         container.should_receive(:stop)
         docker.cleanup
       end
 
       it 'should delete the containers' do
+        docker.stub( :sleep ).and_return(true)
         container.should_receive(:delete)
         docker.cleanup
       end
 
       it 'should delete the images' do
+        docker.stub( :sleep ).and_return(true)
         image.should_receive(:delete)
         docker.cleanup
       end
 
       it 'should not delete the image if docker_preserve_image is set to true' do
+        docker.stub( :sleep ).and_return(true)
         hosts.each do |host|
           host['docker_preserve_image']=true
         end
@@ -194,6 +198,7 @@ module Beaker
       end
 
       it 'should delete the image if docker_preserve_image is set to false' do
+        docker.stub( :sleep ).and_return(true)
         hosts.each do |host|
           host['docker_preserve_image']=false
         end

data/spec/beaker/perf_spec.rb

@@ -27,6 +27,7 @@ module Beaker
 
       it 'creates a new Perf object with a single host, :collect_perf_data = true' do
         hosts = [ make_host("myHost", @options) ]
+        hosts.each { |host| host['platform'] = "centos-6-x86_64" }
         @my_logger.remove_destination(STDOUT)
         perf = Perf.new( hosts, @options )
         expect( perf ).to be_a_kind_of Perf
@@ -35,6 +36,7 @@ module Beaker
 
       it 'creates a new Perf object with multiple hosts, :collect_perf_data = true' do
         hosts = [ make_host("myHost", @options), make_host("myOtherHost", @options) ]
+        hosts.each { |host| host['platform'] = "centos-6-x86_64" }
         @my_logger.remove_destination(STDOUT)
         perf = Perf.new( hosts, @options )
         expect( perf ).to be_a_kind_of Perf
@@ -43,7 +45,8 @@ module Beaker
 
       it 'creates a new Perf object with multiple hosts, :collect_perf_data = true, SLES' do
         hosts = [ make_host("myHost", @options), make_host("myOtherHost", @options) ]
-        hosts[0]['platform'] = "SLES"
+        hosts[0]['platform'] = "centos-6-x86_64"
+        hosts[1]['platform'] = "sles-11-x86_64"
         @my_logger.remove_destination(STDOUT)
         perf = Perf.new( hosts, @options )
         expect( perf ).to be_a_kind_of Perf
@@ -65,12 +68,12 @@ module Beaker
       end
 
       it "Does the Right Thing on Linux hosts" do
-        @hosts[0]['platform'] = "centos"
+        @hosts[0]['platform'] = "centos-6-x86_64"
         @my_logger.remove_destination(STDOUT)
         perf = Perf.new( @hosts, @options )
         expect( perf ).to be_a_kind_of Perf
         perf.print_perf_info
-        expect(@my_io.string).to match(/Setup perf on host: myHostSetup perf on host: myOtherHostGetting perf data for host: myHostGetting perf data for host: myOtherHost/)
+        expect(@my_io.string).to match(/Setup perf on host: myHostSetup perf on host: myOtherHostPerf \(sysstat\) not supported on host: myOtherHostGetting perf data for host: myHostGetting perf data for host: myOtherHostPerf \(sysstat\) not supported on host: myOtherHost/)
       end
 
       it "Does the Right Thing on non-Linux hosts" do
@@ -79,7 +82,7 @@ module Beaker
         perf = Perf.new( @hosts, @options )
         expect( perf ).to be_a_kind_of Perf
         perf.print_perf_info
-        expect(@my_io.string).to match(/Setup perf on host: myHostSetup perf on host: myOtherHostGetting perf data for host: myHostGetting perf data for host: myOtherHost/)
+        expect(@my_io.string).to match(/Setup perf on host: myHostPerf \(sysstat\) not supported on host: myHostSetup perf on host: myOtherHostPerf \(sysstat\) not supported on host: myOtherHostGetting perf data for host: myHostPerf \(sysstat\) not supported on host: myHostGetting perf data for host: myOtherHostPerf \(sysstat\) not supported on host: myOtherHost/)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.17.7
+  version: 1.18.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -304,6 +304,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.22.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.22.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -416,6 +430,7 @@ files:
 - lib/beaker/hypervisor/fusion.rb
 - lib/beaker/hypervisor/google_compute.rb
 - lib/beaker/hypervisor/google_compute_helper.rb
+- lib/beaker/hypervisor/openstack.rb
 - lib/beaker/hypervisor/solaris.rb
 - lib/beaker/hypervisor/vagrant.rb
 - lib/beaker/hypervisor/vcloud.rb