beaker 1.11.0 → 1.11.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI2MDZhMzFhYTIwNGMwNzViMzQ4MjU5NjczOWJhMmY3OGNmOWU2ZQ==
+    MGQ0YzFjMDg1ZWEzZmIxNTgzOWQ0NmM4MmIyODM1NmNiZjA2YzBjZg==
   data.tar.gz: !binary |-
-    MWM4MTYyNjdlYzM2NWNhYmU2OWFkMjc1NjhlZTZkNjI4MzRlOTNkNA==
+    NzMxOTllOGEwMWRjZDQ0MzMxY2VkMDI4ZDBmZWExZGE4NGVhZTgwNw==
 SHA512:
   metadata.gz: !binary |-
-    MjY3ZDE5N2MwYjEzMzYxYzk0ZGE3YTA1MzE4NjBjY2UyMzU0OTA3YjFjNzYw
-    NWUxZDJlYWM1N2JjYWM2YWU5YjJlMzRjZTNiMGViNjQ3ZTUzNzI1MTUxNGVk
-    ZmRjYzIzMDZlOGU5M2M5NzEzNmI5MTM1NGEyN2VmMDc3MGM1M2U=
+    ZmFiYjE3ODI1NWRiZDc0ZDg0ODJmYjdmOTU0ZjczYmE3YTc2OTdkNDY2ZTQx
+    MjJkYTRjYjM5MzQwZDIxNWYyMTAwYTllNzRkNGZjZWFmZDNhNDhmMmRlZjQ0
+    OTc3YTBhYTgwYTg5Nzc2ZWI0ZWVhODA3YjI5NTlmNDc4NmVhYmQ=
   data.tar.gz: !binary |-
-    MWU4NmVmN2I0MTQyMjgzZDk1YzI5NGZmOWJiZGEwMGU1MzZmMGI0OTg5NjI4
-    MzNiMTVhNWQ4M2JhMTIzM2E0YTM3MDI3YzFjMjU0NzRjNzI5MGYyN2U4MjNi
-    NjEzNWRiODVjY2UxNGVkOTA1MjU0MWM3OGY2YWY0Zjg3MGFmZjM=
+    Zjk0OGFhOWE5MGY2NDk4MzY3MjNiNGMyZWRmNjhlNjM4NWUzNTRiZTJmODE0
+    OTE4ZWIwNzkxZTJiMjY3N2ZmMjY1OTE2YzQ5NDdiYjIxMDEzOTdiN2JkNWJj
+    OGJjZjFlOTg3NzA4NWJkODk3YTRiNWRjM2FhYzM4ZDI1ZjJlNTA=

data/lib/beaker/answers/version30.rb

@@ -66,7 +66,7 @@ module Beaker
         end
 
         # Common answers for console and database
-        dashboard_password = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_password]}'" 
+        dashboard_password = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_password]}'"
         puppetdb_password = "'#{options[:answers][:q_puppetdb_password]}'"
 
         console_database_a = {

data/lib/beaker/cli.rb

@@ -1,6 +1,6 @@
 module Beaker
   class CLI
-    VERSION_STRING = 
+    VERSION_STRING =
 "      wWWWw
       |o o|
       | O |  %s!
@@ -105,7 +105,11 @@ module Beaker
             @network_manager.cleanup
           end
         end
-        raise "Failed to execute tests!"
+
+        @logger.error "\nFailed to execute tests!\n"
+        print_reproduction_info( :error )
+
+        exit 1
       else
         #cleanup on success
         if @options[:preserve_hosts] =~ /(never)|(onfail)/
@@ -114,6 +118,7 @@ module Beaker
             @network_manager.cleanup
           end
         end
+        print_reproduction_info( :debug ) if @logger.is_debug?
       end
     end
 
@@ -131,5 +136,11 @@ module Beaker
       ).run_and_raise_on_failure
     end
 
+    def print_reproduction_info( log_level = :debug )
+      puts ''
+      @logger.send(log_level, "You can reproduce this run with:\n")
+      @logger.send(log_level, @options[:command_line])
+      puts ''
+    end
   end
 end

data/lib/beaker/dsl/helpers.rb

@@ -92,7 +92,7 @@ module Beaker
               when 0
                 yield self
               #block with arity of 1 or greater, hand back the result object
-              else 
+              else
                 yield @result
             end
           end
@@ -665,7 +665,7 @@ module Beaker
       #                          codes that will NOT raise an error when found upon
       #                          command completion.  If provided, these values will
       #                          be combined with those used in :catch_failures and
-      #                          :expect_failures to create the full list of 
+      #                          :expect_failures to create the full list of
       #                          passing exit codes.
       #
       # @option opts [Hash]     :environment Additional environment variables to be
@@ -695,14 +695,14 @@ module Beaker
       #                         failure during its execution.
       #
       # @option opts [Boolean]  :future_parser (false) This option enables
-      #                         the future parser option that is available 
+      #                         the future parser option that is available
       #                         from Puppet verion 3.2
       #                         By default it will use the 'current' parser.
       #
       # @option opts [String]   :modulepath The search path for modules, as
       #                         a list of directories separated by the system
       #                         path separator character. (The POSIX path separator
-      #                         is ‘:’, and the Windows path separator is ‘;’.) 
+      #                         is ‘:’, and the Windows path separator is ‘;’.)
       #
       # @param [Block] block This method will yield to a block of code passed
       #                      by the caller; this can be used for additional
@@ -867,7 +867,7 @@ module Beaker
       # forge api v3 canonical source is forgeapi.puppetlabs.com
       #
       # @param machine [String] the host to perform the stub on
-      # @param forge_host [String] The URL to use as the forge alias, will default to using :forge_host in the 
+      # @param forge_host [String] The URL to use as the forge alias, will default to using :forge_host in the
       #                             global options hash
       def stub_forge_on(machine, forge_host = nil)
         #use global options hash
@@ -920,7 +920,7 @@ module Beaker
           agent_running = (result.exit_code == 0)
           sleep 2 unless agent_running
         end
-       
+
         if agent['platform'].include?('solaris')
           on(agent, '/usr/sbin/svcadm disable -s svc:/network/pe-puppet:default')
         elsif agent['platform'].include?('aix')

data/lib/beaker/dsl/install_utils.rb

@@ -313,7 +313,7 @@ module Beaker
           host['pe_installer'] ||= 'puppet-enterprise-installer'
           if host['platform'] !~ /windows/
             platform = use_all_tar ? 'all' : host['platform']
-            version = opts[:pe_ver] || host['pe_ver']
+            version = host['pe_ver'] || opts[:pe_ver]
             host['dist'] = "puppet-enterprise-#{version}-#{platform}"
           end
           host['working_dir'] = "/tmp/" + Time.new.strftime("%Y-%m-%d_%H.%M.%S") #unique working dirs make me happy
@@ -329,7 +329,7 @@ module Beaker
             on host, installer_cmd(host, opts)
           else
             # We only need answers if we're using the classic installer
-            version = opts[:pe_ver] || host['pe_ver']
+            version = host['pe_ver'] || opts[:pe_ver]
             if (! host['roles'].include? 'frictionless') || version_is_less(version, '3.2.0')
               answers = Beaker::Answers.answers(opts[:pe_ver] || host['pe_ver'], hosts, master_certname, opts)
               create_remote_file host, "#{host['working_dir']}/answers", Beaker::Answers.answer_string(host, answers)
@@ -448,7 +448,7 @@ module Beaker
       #
       # @api dsl
       # @return nil
-      def install_puppet
+      def install_puppet(opts = {})
         hosts.each do |host|
           if host['platform'] =~ /el-(5|6|7)/
             relver = $1
@@ -469,6 +469,19 @@ module Beaker
             on host, 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb'
             on host, 'apt-get update'
             on host, 'apt-get install -y puppet'
+          elsif host['platform'] =~ /windows/
+            relver = opts[:version]
+            on host, "curl -O http://downloads.puppetlabs.com/windows/puppet-#{relver}.msi"
+            on host, "msiexec /qn /i puppet-#{relver}.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'
+            else
+              install_dir = '/cygdrive/c/Program Files/Puppet Labs/Puppet/bin'
+            end
+            on host, %Q{ echo 'export PATH=$PATH:"#{install_dir}"' > /etc/bash.bashrc }
+
           else
             raise "install_puppet() called for unsupported platform '#{host['platform']}' on '#{host.name}'"
           end
@@ -506,7 +519,7 @@ module Beaker
       #                      Will contain a LATEST file indicating the latest build to install.
       #                      This is ignored if a pe_upgrade_ver and pe_upgrade_dir are specified
       #                      in the host configuration file.
-      # @example 
+      # @example
       #  upgrade_pe("http://neptune.puppetlabs.lan/3.0/ci-ready/")
       #
       # @note Install file names are assumed to be of the format puppet-enterprise-VERSION-PLATFORM.(tar)|(tar.gz)
@@ -516,7 +529,7 @@ module Beaker
         hosts.each do |host|
           host['pe_dir'] = host['pe_upgrade_dir'] || path
           if host['platform'] =~ /windows/
-            host['pe_ver'] = host['pe_upgrade_ver'] || options['pe_upgrade_ver'] || 
+            host['pe_ver'] = host['pe_upgrade_ver'] || options['pe_upgrade_ver'] ||
               Options::PEVersionScraper.load_pe_version(host['pe_dir'], options[:pe_version_file_win])
           else
             host['pe_ver'] = host['pe_upgrade_ver'] || options['pe_upgrade_ver'] ||

data/lib/beaker/host/unix.rb

@@ -23,7 +23,7 @@ module Unix
         'user'          => 'root',
         'group'         => 'pe-puppet',
         'service-wait'  => false,
-        'service-prefix'=> '/etc/init.d/', 
+        'service-prefix'=> '/etc/init.d/',
         'puppetservice' => 'pe-httpd',
         'puppetpath'    => '/etc/puppetlabs/puppet',
         'puppetbin'     => '/opt/puppet/bin/puppet',

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

@@ -12,7 +12,7 @@ module Unix::Pkg
     case self['platform']
     when /solaris-10/
       result.stdout =~ %r|/.*/#{name}|
-    else  
+    else
       result.exit_code == 0
     end
   end

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

@@ -3,7 +3,7 @@ module Windows::Pkg
 
   def check_for_package(name)
     result = exec(Beaker::Command.new("which #{name}"), :acceptable_exit_codes => (0...127))
-    result.exit_code == 0 
+    result.exit_code == 0
   end
 
   def install_package(name, cmdline_args = '')
@@ -23,7 +23,7 @@ module Windows::Pkg
     if not check_for_package(cygwin)
       execute("curl --retry 5 http://cygwin.com/#{cygwin} -o /cygdrive/c/Windows/System32/#{cygwin}")
     end
-    execute("#{cygwin} -q -n -N -d -R #{cmdline_args} #{rootdir} -s http://cygwin.osuosl.org -P #{name}") 
+    execute("#{cygwin} -q -n -N -d -R #{cmdline_args} #{rootdir} -s http://cygwin.osuosl.org -P #{name}")
   end
 
   def uninstall_package(name, cmdline_args = '')
@@ -35,7 +35,7 @@ module Windows::Pkg
   # @api private
   def identify_windows_architecture
     arch = nil
-    execute("echo '' | wmic os get osarchitecture", 
+    execute("echo '' | wmic os get osarchitecture",
             :acceptable_exit_codes => (0...127)) do |result|
 
       arch = if result.exit_code == 0

data/lib/beaker/host_prebuilt_steps.rb

@@ -71,7 +71,7 @@ module Beaker
     end
 
     #Validate that hosts are prepared to be used as SUTs, if packages are missing attempt to
-    #install them.  Verifies the presence of {HostPrebuiltSteps::PACKAGES} on all hosts, 
+    #install them.  Verifies the presence of {HostPrebuiltSteps::PACKAGES} on all hosts,
     #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts and {HostPrebuiltSteps::SLES_PACKAGES}
     #on sles (SUSE, Enterprise Linux) hosts.
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
@@ -148,8 +148,8 @@ module Beaker
       report_and_raise(logger, e, "add_master_entry")
     end
 
-    #Install a set of authorized keys using {HostPrebuiltSteps::ROOT_KEYS_SCRIPT}.  This is a 
-    #convenience method to allow for easy login to hosts after they have been provisioned with 
+    #Install a set of authorized keys using {HostPrebuiltSteps::ROOT_KEYS_SCRIPT}.  This is a
+    #convenience method to allow for easy login to hosts after they have been provisioned with
     #Beaker.
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
@@ -204,7 +204,7 @@ module Beaker
       if host.is_a? Array
         host.map { |h| apt_get_update(h) }
       else
-        if host[:platform] =~ /(ubuntu)|(debian)/ 
+        if host[:platform] =~ /(ubuntu)|(debian)/
           host.exec(Command.new("apt-get update"))
         end
       end
@@ -227,7 +227,7 @@ module Beaker
     end
 
     #Alter apt configuration on ubuntu and debian host or hosts to internal Puppet Labs
-    # proxy {HostPrebuiltSteps::APT_CFG} proxy, alter pkg on solaris-11 host or hosts 
+    # proxy {HostPrebuiltSteps::APT_CFG} proxy, alter pkg on solaris-11 host or hosts
     # to point to interal Puppetlabs proxy {HostPrebuiltSteps::IPS_PKG_REPO}. Do nothing
     # on non-ubuntu, debian or solaris-11 platform host or hosts.
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
@@ -306,7 +306,7 @@ module Beaker
       return search if search
     end
 
-    #Determine the ip address of the provided host 
+    #Determine the ip address of the provided host
     # @param [Host] host the host to act upon
     # @deprecated use {Host#get_ip}
     def get_ip(host)

data/lib/beaker/hypervisor.rb

@@ -22,7 +22,7 @@ module Beaker
     #@param [Hash] options options Options to alter execution
     def self.create(type, hosts_to_provision, options)
       @logger = options[:logger]
-      @logger.notify("Beaker::Hypervisor, found some #{type} boxes to create") 
+      @logger.notify("Beaker::Hypervisor, found some #{type} boxes to create")
       hyper_class = case type
         when /aix/
           Beaker::Aixer
@@ -51,7 +51,7 @@ module Beaker
         when /none/
           Beaker::Hypervisor
         else
-          raise "Invalid hypervisor: #{type}" 
+          raise "Invalid hypervisor: #{type}"
         end
 
       hypervisor = hyper_class.new(hosts_to_provision, options)
@@ -93,7 +93,7 @@ module Beaker
 
     #Default validation steps to be run for a given hypervisor
     def validate
-      if @options[:validate] 
+      if @options[:validate]
         validate_host(@hosts, @options)
       end
     end

data/lib/beaker/hypervisor/blimper.rb

@@ -19,8 +19,8 @@ module Beaker
         @hosts.each do |host|
           amitype = host['vmname'] || host['platform']
           amisize = host['amisize'] || 'm1.small'
-          #use snapshot provided for this host 
-          image_type = host['snapshot'] 
+          #use snapshot provided for this host
+          image_type = host['snapshot']
           if not image_type
             raise "No snapshot/image_type provided for blimpy provisioning"
           end
@@ -79,7 +79,7 @@ module Beaker
         host = @hosts.select { |host| host.name == name }[0]
         host['ip'] = ship.dns
         host.exec(Command.new("hostname #{name}"))
-        ip = get_ip(host) 
+        ip = get_ip(host)
         domain = get_domain_name(host)
         etc_hosts += "#{ip}\t#{name}\t#{name}.#{domain}\n"
       end

data/lib/beaker/hypervisor/docker.rb

@@ -24,15 +24,10 @@ module Beaker
 
         @logger.debug("Creating image")
         image = ::Docker::Image.build(dockerfile_for(host), { :rm => true })
-        @logger.debug("Tagging image #{image.id} as #{host.name}")
-        image.tag({
-          :repo => host.name,
-          :force => true,
-        })
 
-        @logger.debug("Creating container from image")
+        @logger.debug("Creating container from image #{image.id}")
         container = ::Docker::Container.create({
-          'Image' => host.name,
+          'Image' => image.id,
           'Hostname' => host.name,
         })
 
@@ -75,7 +70,8 @@ module Beaker
           end
         end
 
-        if image = host['docker_image']
+        # Do not remove the image if docker_reserve_image is set to true, otherwise remove it
+        if image = (host['docker_preserve_image'] ? nil : host['docker_image'])
           @logger.debug("delete image #{image.id}")
           begin
             image.delete

data/lib/beaker/hypervisor/fusion.rb

@@ -1,4 +1,4 @@
-module Beaker 
+module Beaker
   class Fusion < Beaker::Hypervisor
 
     def initialize(fusion_hosts, options)
@@ -29,12 +29,12 @@ module Beaker
 
         vm_snapshots = vm.snapshots.data
         if vm_snapshots.nil? or vm_snapshots.empty?
-          raise "No snapshots available for VM #{host.name} (vmname: '#{vm_name}')" 
+          raise "No snapshots available for VM #{host.name} (vmname: '#{vm_name}')"
         end
 
         available_snapshots = vm_snapshots.sort.join(", ")
         @logger.notify "Available snapshots for #{host.name}: #{available_snapshots}"
-        snap_name = host["snapshot"] 
+        snap_name = host["snapshot"]
         raise "Could not find snapshot '#{snap_name}' for host #{host.name}!" unless vm.snapshots.data.include? snap_name
 
         @logger.notify "Reverting #{host.name} to snapshot '#{snap_name}'"

data/lib/beaker/hypervisor/google_compute.rb

@@ -8,6 +8,14 @@ module Beaker
     #number of hours before an instance is considered a zombie
     ZOMBIE = 3
 
+    #Create the array of metaData, each member being a hash with a :key and a :value.  Sets
+    #:department, :project and :jenkins_build_url.
+    def format_metadata
+      [ {:key => :department, :value => @options[:department]},
+        {:key => :project, :value => @options[:project]},
+        {:key => :jenkins_build_url, :value => @options[:jenkins_build_url]} ].delete_if { |member| member[:value].nil? or member[:value].empty?}
+    end
+
     #Create a new instance of the Google Compute Engine hypervisor object
     #@param [<Host>] google_hosts The array of google hosts to provision, may ONLY be of platforms /centos-6-.*/ and
     #                             /debian-7-.*/.  We currently only support the Google Compute provided templates.
@@ -56,13 +64,15 @@ module Beaker
         #add a new instance of the image
         instance = @gce_helper.create_instance(host['vmhostname'], img, machineType, disk, start, attempts)
         @logger.debug("Created Google Compute instance for #{host.name}: #{host['vmhostname']}")
-        #add metadata to instance
-        @gce_helper.setMetadata_on_instance(host['vmhostname'], instance['metadata']['fingerprint'],
-                                            [ {:key => :department, :value => @options[:department]},
-                                              {:key => :project, :value => @options[:project]},
-                                              {:key => :jenkins_build_url, :value => @options[:jenkins_build_url]} ],
-                                            start, attempts)
-        @logger.debug("Added tags to Google Compute instance #{host.name}: #{host['vmhostname']}")
+
+        #add metadata to instance, if there is any to set
+        mdata = format_metadata
+        if not mdata.empty?
+          @gce_helper.setMetadata_on_instance(host['vmhostname'], instance['metadata']['fingerprint'],
+                                              mdata,
+                                              start, attempts)
+          @logger.debug("Added tags to Google Compute instance #{host.name}: #{host['vmhostname']}")
+        end
 
         #get ip for this host
         host['ip'] = instance['networkInterfaces'][0]['accessConfigs'][0]['natIP']

data/lib/beaker/hypervisor/google_compute_helper.rb

@@ -158,7 +158,7 @@ module Beaker
           end
           return parsed
         #retry errors
-        rescue Faraday::Error::ConnectionFailed => e 
+        rescue Faraday::Error::ConnectionFailed => e
           @logger.debug "ConnectionFailed attempting Google Compute execute command"
           try += 1
           last_error = e

data/lib/beaker/hypervisor/solaris.rb

@@ -14,7 +14,7 @@ module Beaker
     end
 
     def provision
-      hypername = @fog_file[:default][:solaris_hypervisor_server] 
+      hypername = @fog_file[:default][:solaris_hypervisor_server]
       vmpath    = @fog_file[:default][:solaris_hypervisor_vmpath]
       snappaths = @fog_file[:default][:solaris_hypervisor_snappaths]
 

data/lib/beaker/hypervisor/vagrant.rb

@@ -117,7 +117,7 @@ module Beaker
       @logger.debug "configure vagrant boxes (set ssh-config, switch to root user, hack etc/hosts)"
       @hosts.each do |host|
         default_user = host['user']
-      
+
         set_ssh_config host, 'vagrant'
 
         copy_ssh_to_root host, @options