beaker 2.34.0 → 2.35.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmU2OTY2MTQ3ZWU5Y2U4NDk1ZjRlYTY3MWRiYWZkZmVlMWUyODhlOQ==
+    MzUxMTk0ODg1NjgxNDFkYzQ2ZDMzZTc5MjYxMDNkOTg1ODc1YmZlMg==
   data.tar.gz: !binary |-
-    ZTlkNzcxYjc0YTMxMzgwODhiOGZhZDQ3Mzg5NjZlNTViMTFkZDI5YQ==
+    M2Q4ZTQ3MjcyZmE3ZTA5YTdlMmYyYjdkMzFjZTAxMDMxMTRkMDUwNw==
 SHA512:
   metadata.gz: !binary |-
-    MmI5N2ViNjA2MWU4M2VkNzJlNzJhMjU5NWFjMGJjNTM2ZTI4MGU4Mzc5YWEx
-    OGVkMjM1NDlhOGI1Y2Q0OTYwNjBiNGQ3NWE1Nzg2M2IxNmJmM2NhYzNjOWU4
-    MzRlNGVmZDkwNWFlYTFmODM4NTAyY2RmZjkyNmYxNDQ3MjY3MmE=
+    NDljNGJlOWRkNTI2NDkyM2JiZGI0ODY2YWVjYWZmZWEyYjRjMGIyMDE2YTZm
+    OTMwYzJkOTQ4M2VmNmExYzQ5ZTI3YzkwMTkwMDMwZDIxOTFlYWI3Y2RmZDky
+    ZGEzNTcxMWUzODljODA1MTA0YTFkMDZhMzczZjE3MjE0ZjVjZDY=
   data.tar.gz: !binary |-
-    MWU3MmI2ZjM0OWQ4M2M3NTQ1OTg4MTcyYTg0Nzc1MjBjMGQzZjdkZWVhN2Fm
-    NDkxMjJjNjg3NWVmZTQzMWRmZTBjOTgyMWU3YWY3ODM1YmQ4YjY4N2ExNGE0
-    ZDVjMjRiZGVhODU2MDBiMWU4Y2FmY2Y4YmQ2N2U5ZTllYWVmYjE=
+    YjE1MDQxMWYyYmMzMWM2NjdlZjFmYzQ5ZmU4YWE5YWEyNDQ4MzRkZGYzZTcw
+    NDAxM2YxZTdjYTZjYmIwYjBkMmI5NWE0OGM3N2IwYzljZDgwMzJlZTc3NGIx
+    YzJjNzI1ZDJhMDVlY2FmZGRiNDcwNTRmNGE3ZDgwNGUzMDc2MWU=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 10 Feb, 2016 (78b7dd79)](#LATEST)
+* [LATEST - 24 Feb, 2016 (e714b1eb)](#LATEST)
+* [2.34.0 - 10 Feb, 2016 (b897a98a)](#2.34.0)
 * [2.33.0 - 27 Jan, 2016 (0dd8505a)](#2.33.0)
 * [2.32.1 - 14 Jan, 2016 (8c394fdb)](#2.32.1)
 * [2.32.0 - 12 Jan, 2016 (80e153cc)](#2.32.0)
@@ -109,7 +110,99 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 10 Feb, 2016 (78b7dd79)
+### <a name = "LATEST">LATEST - 24 Feb, 2016 (e714b1eb)
+
+* (GEM) update beaker version to 2.35.0 (e714b1eb)
+
+* Merge pull request #1067 from kevpl/bkr693_solaris_install (539de014)
+
+
+```
+Merge pull request #1067 from kevpl/bkr693_solaris_install
+
+(BKR-693) solaris install puppet-agent from PE promoted repo fix
+```
+* Merge pull request #1069 from pinkypie/BKR-99 (875f984f)
+
+
+```
+Merge pull request #1069 from pinkypie/BKR-99
+
+(BKR-99) - Populate host[:timesync] with host configured value.
+```
+* Merge pull request #1065 from op-ct/BKR-704_relative_docker_mount_folders (70805173)
+
+
+```
+Merge pull request #1065 from op-ct/BKR-704_relative_docker_mount_folders
+
+(BKR-704) Allow relative `mount_folders` in docker
+```
+* Merge pull request #1059 from jordane/master (28047b44)
+
+
+```
+Merge pull request #1059 from jordane/master
+
+point install link to docs/
+```
+* (BKR-99) - Populate host[:timesync] with host configured value if it has been set. (d1454372)
+
+
+```
+(BKR-99) - Populate host[:timesync] with host configured value if it has been set.
+Add spec tests.
+```
+* (BKR-693) refactored duplicate install logic into separate method (0a1075dc)
+
+* (BKR-693) refactored pe promoted puppet-agent install (0370c4b5)
+
+* Merge pull request #1063 from pinkypie/BKR-48 (b2b9ad6e)
+
+
+```
+Merge pull request #1063 from pinkypie/BKR-48
+
+(BKR-48) Change how --dry_run is defined - should not be global variable.
+```
+* (BKR-693) fixed solaris 10/11 install_puppet_agent_pe_promoted_repo_on (8f1f3a58)
+
+* (BKR-48) implementing Null object pattern for Beaker::NullResult (7499df05)
+
+
+```
+(BKR-48) implementing Null object pattern for Beaker::NullResult
+ This is so that calling methods can handle a dry-run more gracefully.
+```
+* (BKR-704) Allow relative `mount_folders` in docker (2a30987c)
+
+
+```
+(BKR-704) Allow relative `mount_folders` in docker
+
+Without this patch, a nodeset using relative `from:` paths under
+`mount_folders:` with the `docker` hypervisor will encounter a
+test-halting `Docker::Error::ClientError`.  This is a problem because
+it forces docker-based nodesets to specify host-side mounts with
+absolute paths, which isn't portable.
+
+This patch fixes the issue by using Ruby's `File.expand_path()` method to
+translate any relative `mount_folders:`/`from:` entries into absolute
+paths before passing them on to docker.
+```
+* (BKR-48) Change how --dry_run is defined (f27e4803)
+
+
+```
+(BKR-48) Change how --dry_run is defined
+ We should not be using a global variable, and we should make it possible to overide the value from calling methods (as per other options).
+ Also returning result before we attempt a host connection.
+```
+* (MAINT) point install link to docs/ (0348b29a)
+
+### <a name = "2.34.0">2.34.0 - 10 Feb, 2016 (b897a98a)
+
+* (HISTORY) update beaker history for gem release 2.34.0 (b897a98a)
 
 * (GEM) update beaker version to 2.34.0 (78b7dd79)
 

data/README.md

@@ -4,7 +4,7 @@ Puppet Labs cloud enabled acceptance testing tool.
 
 # Installation
 
-See [Beaker Installation](https://github.com/puppetlabs/beaker/wiki/Beaker-Installation) wiki page.
+See [Beaker Installation](docs/Beaker-Installation.md).
 
 #Documentation
 

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

@@ -1068,13 +1068,7 @@ module Beaker
             when /^osx$/
               host.install_package("puppet-agent-#{opts[:puppet_agent_version]}*")
             when /^solaris$/
-              if version == '10'
-                noask_text = host.noask_file_text
-                create_remote_file host, File.join(onhost_copy_base, 'noask'), noask_text
-                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
+              host.solaris_install_local_package( release_file, onhost_copy_base )
             end
             configure_type_defaults_on( host )
           end
@@ -1110,7 +1104,6 @@ module Beaker
 
           block_on hosts do |host|
             pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0.0-rc1'
-            variant, version, arch, codename = host['platform'].to_array
             opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
             opts[:download_url] = "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{ pe_ver }/#{ opts[:puppet_agent_version] }/repos"
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
@@ -1122,70 +1115,30 @@ module Beaker
             copy_dir_local = File.join(opts[:copy_base_local], variant)
             onhost_copy_base = opts[:copy_dir_external]
 
-            case variant
-            when /^(fedora|el|centos|sles)$/
-              variant = ((variant == 'centos') ? 'el' : variant)
-              release_file = "/repos/#{variant}/#{version}/#{opts[:puppet_collection]}/#{arch}/puppet-agent-*.rpm"
-              download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
-            when /^(debian|ubuntu|cumulus)$/
-              if arch == 'x86_64'
-                arch = 'amd64'
-              end
-              version = version[0,2] + '.' + version[2,2] if (variant =~ /ubuntu/ && !version.include?("."))
-              release_file = "/repos/apt/#{codename}/pool/#{opts[:puppet_collection]}/p/puppet-agent/puppet-agent*#{arch}.deb"
-              download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
-            when /^windows$/
-              is_config_32 = host['ruby_arch'] == 'x86' || host['install_32'] || opts['install_32']
-              should_install_64bit = host.is_x86_64? && !is_config_32
-              # only install 64bit builds if
-              # - we do not have install_32 set on host
-              # - we do not have install_32 set globally
-              arch_suffix = should_install_64bit ? '64' : '86'
-              release_path += "/windows"
-              release_file = "/puppet-agent-x#{arch_suffix}.msi"
-              download_file = "puppet-agent-x#{arch_suffix}.msi"
-            when /^osx$/
-              release_file = "/repos/apple/#{opts[:puppet_collection]}/puppet-agent-*"
-              download_file = "puppet-agent-#{variant}-#{version}.tar.gz"
-            when /^solaris$/
-              if arch == 'x86_64'
-                arch = 'i386'
-              end
-              release_file = "/repos/solaris/#{version}/#{opts[:puppet_collection]}/puppet-agent-*#{arch}.pkg.gz"
-              download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
-            else
-              raise "No pe-promoted installation step for #{variant} yet..."
-            end
+            release_path_end, release_file, download_file =
+              host.pe_puppet_agent_promoted_package_info(
+                opts[:puppet_collection], opts
+              )
+            release_path << release_path_end
 
             onhost_copied_download = File.join(onhost_copy_base, download_file)
             onhost_copied_file = File.join(onhost_copy_base, release_file)
             fetch_http_file( release_path, download_file, copy_dir_local)
             scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
 
-            case variant
-            when /^(fedora-22)$/
-              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
-              on host, "dnf --nogpgcheck localinstall -y #{onhost_copied_file}"
-            when /^(fedora|el|centos)$/
-              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
-              on host, "yum --nogpgcheck localinstall -y #{onhost_copied_file}"
-            when /^(sles)$/
-              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
-              on host, "rpm -ihv #{onhost_copied_file}"
-            when /^(debian|ubuntu|cumulus)$/
-              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
-              on host, "dpkg -i --force-all #{onhost_copied_file}"
-              on host, "apt-get update"
-            when /^windows$/
+            if variant == 'windows'
               result = on host, "echo #{onhost_copied_file}"
               onhost_copied_file = result.raw_output.chomp
               opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
+              # couldn't pull this out, because it's relying on
+              # {Beaker::DSL::InstallUtils::WindowsUtils} methods,
+              # which I didn't want to attack right now. TODO
               install_msi_on(host, onhost_copied_file, {}, opts)
-            when /^osx$/
-              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
-              # move to better location
-              on host, "mv #{onhost_copied_file}.dmg ."
-              host.install_package("puppet-agent-*")
+            else
+              host.pe_puppet_agent_promoted_package_install(
+                onhost_copy_base, onhost_copied_download,
+                onhost_copied_file, download_file, opts
+              )
             end
             configure_type_defaults_on( host )
           end

data/lib/beaker/host.rb

@@ -265,9 +265,20 @@ module Beaker
     end
 
     def exec command, options={}
+      result = nil
       # I've always found this confusing
       cmdline = command.cmd_line(self)
 
+      # use the value of :dry_run passed to the method unless
+      # undefined, then use parsed @options hash.
+      options[:dry_run] ||= @options[:dry_run]
+
+      if options[:dry_run]
+        @logger.debug "\n Running in :dry_run mode. Command #{cmdline} not executed."
+        result = Beaker::NullResult.new(self, command)
+        return result
+      end
+
       if options[:silent]
         output_callback = nil
       else
@@ -279,11 +290,10 @@ module Beaker
         end
       end
 
-      unless $dry_run
+      unless options[:dry_run]
         # is this returning a result object?
         # the options should come at the end of the method signature (rubyism)
         # and they shouldn't be ssh specific
-        result = nil
 
         @logger.step_in()
         seconds = Benchmark.realtime {
@@ -320,9 +330,8 @@ module Beaker
             raise CommandFailure, "Host '#{self}' exited with #{result.exit_code} running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"
           end
         end
-        # Danger, so we have to return this result?
-        result
       end
+      result
     end
 
     # scp files from the localhost to this test host, if a directory is provided it is recursively copied.
@@ -344,6 +353,17 @@ module Beaker
     #   -> will result in not files copyed to the host, all are ignored
     def do_scp_to source, target_path, options
       target = self.scp_path( target_path )
+
+      # use the value of :dry_run passed to the method unless
+      # undefined, then use parsed @options hash.
+      options[:dry_run] ||= @options[:dry_run]
+
+      if options[:dry_run]
+        scp_cmd = "scp #{source} #{@name}:#{target}"
+        @logger.debug "\n Running in :dry_run mode. localhost $ #{scp_cmd} not executed."
+        return NullResult.new(self, scp_cmd)
+      end
+
       @logger.notify "localhost $ scp #{source} #{@name}:#{target} {:ignore => #{options[:ignore]}}"
 
       result = Result.new(@name, [source, target])
@@ -371,7 +391,7 @@ module Beaker
           result.exit_code = 1
         end
         if source_file
-          result = connection.scp_to(source_file, target, options, $dry_run)
+          result = connection.scp_to(source_file, target, options)
           @logger.trace result.stdout
         end
       else # a directory with ignores
@@ -406,7 +426,7 @@ module Beaker
           else
             file_path = File.join(target, File.dirname(s))
           end
-          result = connection.scp_to(s, file_path, options, $dry_run)
+          result = connection.scp_to(s, file_path, options)
           @logger.trace result.stdout
         end
       end
@@ -416,9 +436,18 @@ module Beaker
     end
 
     def do_scp_from source, target, options
+      # use the value of :dry_run passed to the method unless
+      # undefined, then use parsed @options hash.
+      options[:dry_run] ||= @options[:dry_run]
+
+      if options[:dry_run]
+        scp_cmd = "scp #{@name}:#{source} #{target}"
+        @logger.debug "\n Running in :dry_run mode. localhost $ #{scp_cmd} not executed."
+        return  NullResult.new(self, scp_cmd)
+      end
 
       @logger.debug "localhost $ scp #{@name}:#{source} #{target}"
-      result = connection.scp_from(source, target, options, $dry_run)
+      result = connection.scp_from(source, target, options)
       @logger.debug result.stdout
       return result
     end

data/lib/beaker/host/mac.rb

@@ -23,48 +23,6 @@ module Mac
       })
     end
 
-    # Gets the path & file name for the puppet agent dev package on OSX
-    #
-    # @param [String] puppet_collection Name of the puppet collection to use
-    # @param [String] puppet_agent_version Version of puppet agent to get
-    # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
-    #
-    # @note OSX doesn't use any additional options at this time, but does require
-    #   both puppet_collection & puppet_agent_version, & will fail without them
-    #
-    # @raise [ArgumentError] If one of the two required parameters (puppet_collection,
-    #   puppet_agent_version) is either not passed or set to nil
-    #
-    # @return [String, String] Path to the directory and filename of the package, respectively
-    def puppet_agent_dev_package_info( puppet_collection = nil, puppet_agent_version = nil, opts = {} )
-      error_message = "Must provide %s argument to get puppet agent dev package information"
-      raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
-      raise ArgumentError, error_message % "puppet_agent_version" unless puppet_agent_version
-
-      variant, version, arch, codename = self['platform'].to_array
-
-      mac_pkg_name = "puppet-agent-#{puppet_agent_version}"
-      version = version[0,2] + '.' + version[2,2] unless version.include?(".")
-      # newest hotness
-      path_chunk = "apple/#{version}/#{puppet_collection}/#{arch}"
-      release_path_end = path_chunk
-      # moved to doing this when 'el capitan' came out & the objection was
-      # raised that the code name wasn't a fact, & as such can be hard to script
-      # example: puppet-agent-0.1.0-1.osx10.9.dmg
-      release_file = "#{mac_pkg_name}-1.osx#{version}.dmg"
-      if not link_exists?("#{opts[:download_url]}/#{release_path_end}/#{release_file}") # new hotness
-        # little older change involved the code name as only difference from above
-        # example: puppet-agent-0.1.0-1.mavericks.dmg
-        release_file = "#{mac_pkg_name}-1.#{codename}.dmg"
-      end
-      if not link_exists?("#{opts[:download_url]}/#{release_path_end}/#{release_file}") # oops, try the old stuff
-        release_path_end = "apple/#{puppet_collection}"
-        # example: puppet-agent-0.1.0-osx-10.9-x86_64.dmg
-        release_file = "#{mac_pkg_name}-#{variant}-#{version}-x86_64.dmg"
-      end
-      return release_path_end, release_file
-    end
-
     attr_reader :external_copy_base
     def initialize name, host_hash, options
       super

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

@@ -41,4 +41,84 @@ module Mac::Pkg
     result.exit_code == 0
   end
 
+  # Gets the path & file name for the puppet agent dev package on OSX
+  #
+  # @param [String] puppet_collection Name of the puppet collection to use
+  # @param [String] puppet_agent_version Version of puppet agent to get
+  # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
+  #
+  # @note OSX doesn't use any additional options at this time, but does require
+  #   both puppet_collection & puppet_agent_version, & will fail without them
+  #
+  # @raise [ArgumentError] If one of the two required parameters (puppet_collection,
+  #   puppet_agent_version) is either not passed or set to nil
+  #
+  # @return [String, String] Path to the directory and filename of the package, respectively
+  def puppet_agent_dev_package_info( puppet_collection = nil, puppet_agent_version = nil, opts = {} )
+    error_message = "Must provide %s argument to get puppet agent dev package information"
+    raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
+    raise ArgumentError, error_message % "puppet_agent_version" unless puppet_agent_version
+
+    variant, version, arch, codename = self['platform'].to_array
+
+    mac_pkg_name = "puppet-agent-#{puppet_agent_version}"
+    version = version[0,2] + '.' + version[2,2] unless version.include?(".")
+    # newest hotness
+    path_chunk = "apple/#{version}/#{puppet_collection}/#{arch}"
+    release_path_end = path_chunk
+    # moved to doing this when 'el capitan' came out & the objection was
+    # raised that the code name wasn't a fact, & as such can be hard to script
+    # example: puppet-agent-0.1.0-1.osx10.9.dmg
+    release_file = "#{mac_pkg_name}-1.osx#{version}.dmg"
+    if not link_exists?("#{opts[:download_url]}/#{release_path_end}/#{release_file}") # new hotness
+      # little older change involved the code name as only difference from above
+      # example: puppet-agent-0.1.0-1.mavericks.dmg
+      release_file = "#{mac_pkg_name}-1.#{codename}.dmg"
+    end
+    if not link_exists?("#{opts[:download_url]}/#{release_path_end}/#{release_file}") # oops, try the old stuff
+      release_path_end = "apple/#{puppet_collection}"
+      # example: puppet-agent-0.1.0-osx-10.9-x86_64.dmg
+      release_file = "#{mac_pkg_name}-#{variant}-#{version}-x86_64.dmg"
+    end
+    return release_path_end, release_file
+  end
+
+  # Gets host-specific information for PE promoted puppet-agent packages
+  #
+  # @param [String] puppet_collection Name of the puppet collection to use
+  # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
+  #
+  # @return [String, String, String] Host-specific information for packages
+  #   1. release_path_end Suffix for the release_path. Used on Windows. Check
+  #   {Windows::Pkg#pe_puppet_agent_promoted_package_info} to see usage.
+  #   2. release_file Path to the file on release build servers
+  #   3. download_file Filename for the package itself
+  def pe_puppet_agent_promoted_package_info( puppet_collection = nil, opts = {} )
+    error_message = "Must provide %s argument to get puppet agent dev package information"
+    raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
+
+    variant, version, arch, codename = self['platform'].to_array
+    release_file = "/repos/apple/#{puppet_collection}/puppet-agent-*"
+    download_file = "puppet-agent-#{variant}-#{version}.tar.gz"
+    return '', release_file, download_file
+  end
+
+  # Installs a given PE promoted package on a host
+  #
+  # @param [String] onhost_copy_base Base copy directory on the host
+  # @param [String] onhost_copied_download Downloaded file path on the host
+  # @param [String] onhost_copied_file Copied file path once un-compressed
+  # @param [String] download_file File name of the downloaded file
+  # @param [Hash{Symbol=>String}] opts additional options
+  #
+  # @return nil
+  def pe_puppet_agent_promoted_package_install(
+    onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, opts
+  )
+    execute("tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}")
+    # move to better location
+    execute("mv #{onhost_copied_file}.dmg .")
+    self.install_package("puppet-agent-*")
+  end
+
 end