beaker 2.26.0 → 2.27.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQ4ODE5YmE3ZTJlMmJiY2UxYjgyYjEzYjM2NzYxYTkwNjYzZWRhNg==
+    YjZlM2E1NDQzMTZiODJlYzcxZmFhZGZlZDUzOTA3NjNjMGZjY2MyZQ==
   data.tar.gz: !binary |-
-    YjRiNzY1ZTEyMTdkYWQwYjAxYWVhY2NiMzE1MzM2ODdmMjEzZTk5ZQ==
+    NDJjYmUyODBjNGE4ZTUxMWIyODAzYjZkMjRlMDc4MjdhYWI0YjFhZg==
 SHA512:
   metadata.gz: !binary |-
-    NDFmOWFiZWMwMjcxOWMwMGQwMzUxMzFiNDU1ZDE0M2E1ZGI4YmI3ZTY3YjZh
-    NjdlYzE5Y2QxZTczMDJmNzI3MTEyZDVmNDExMWQwNGZkYzYxYjY5Y2JhYzVj
-    MWI2NTE2NzdjYmY2OWI3Y2I3NTFjN2VjMDE1YmY5OTNiOGU3YWE=
+    NTVhZmMwYjVhNTExZjBiMWFkMTU0YzhlMGI1MzlmY2I1ZjBiMjIyNmNhZDIy
+    YzA4NDQ1NzY5MjZkOTg3ZDhjZjgyOWVmNjMwY2NiMzQ0MDU0YTJjMzdmMzQ1
+    YTczMTMzY2U2NjM4ODk2NjY4YzRmNGU5YzZmNDZhZWYwZTM1NGQ=
   data.tar.gz: !binary |-
-    NjViMjNhMDc1MDVhZTY5MThlNjQyM2M3ZTE2MDdiOTU4ZmQ0N2U1OGIwYWRj
-    MWMxYjA2NThhMWM0YzU5YjNmNmQ4MDI4OWY0ZTU2NmEzZmI4ZTAzMDc1OTM4
-    NGI0YTQ2NGQ1ODY0M2Q1MzVlMjVjMmM3ZGFkMzBlMzRlM2E3NWI=
+    MmM2Njk1MjNkNzg4YTQ2NDY4ODE4YjM4NTJlMjg1ZTk5MjljNzZlMzI0NGU0
+    OTYwZmFkNjk1MDZiMWFhN2ZlMmQ4Mjg2OGUzMDRkZGZiODkxNTM0NDU4YjU0
+    ZTE1MjNiYTEwZDhkYmQ4ODlkYjU1ZDY0YzRkNzY1YzIzYmY0NDA=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 13 Oct, 2015 (d581b613)](#LATEST)
+* [LATEST - 21 Oct, 2015 (90fddaf4)](#LATEST)
+* [2.26.0 - 13 Oct, 2015 (427a512b)](#2.26.0)
 * [2.25.0 - 1 Oct, 2015 (51d4cb1a)](#2.25.0)
 * [2.24.0 - 15 Sep, 2015 (c12e9054)](#2.24.0)
 * [2.23.0 - 9 Sep, 2015 (2532324a)](#2.23.0)
@@ -98,7 +99,270 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 13 Oct, 2015 (d581b613)
+### <a name = "LATEST">LATEST - 21 Oct, 2015 (90fddaf4)
+
+* (GEM) update beaker version to 2.27.0 (90fddaf4)
+
+* Merge pull request #961 from GeoffWilliams/dockerfile_externalise (f4a90933)
+
+
+```
+Merge pull request #961 from GeoffWilliams/dockerfile_externalise
+
+(BKR-539) simplified Dockerfile support
+```
+* Merge pull request #987 from johnduarte/remove_puppet_patch (2cdcb71e)
+
+
+```
+Merge pull request #987 from johnduarte/remove_puppet_patch
+
+(BKR-573) Add publisher for solaris package removal
+```
+* Merge pull request #977 from colinPL/qeng2604_add_tags (e79b4b17)
+
+
+```
+Merge pull request #977 from colinPL/qeng2604_add_tags
+
+(QENG-2604) Add Host Tags
+```
+* Merge pull request #962 from pondohva/decrease_spamlog_level (a7630b05)
+
+
+```
+Merge pull request #962 from pondohva/decrease_spamlog_level
+
+(BKR-542) remove hosts object from log about execution against empty …
+```
+* (QENG-2604) More vmpooler spec changes (dec9511c)
+
+
+```
+(QENG-2604) More vmpooler spec changes
+
+Remove some key:value checks from spec test. Override a used @option
+value and ensure it passes through add_tags.
+```
+* (QENG-2604) Fix vmpooler specs (8d71a905)
+
+
+```
+(QENG-2604) Fix vmpooler specs
+
+Fix vmpooler spec tests for tags that were hard-coded but checking
+against environment variables.
+```
+* (QENG-2604) Add More host_tag specs (f6fe7d5a)
+
+
+```
+(QENG-2604) Add More host_tag specs
+
+Add spec tests for aws_sdk and vmpooler hypervisors targetting
+host_tags behavior.
+```
+* (QENG-2604) Break add_tags in vmpooler (93d44425)
+
+
+```
+(QENG-2604) Break add_tags in vmpooler
+
+Move the merging of host tags with pre-defined tags to its own method
+to emulate how it behaves in aws_sdk.
+```
+* Merge pull request #988 from joshcooper/ticket/master/BKR-574-allow-no-restart (bfb6b356)
+
+
+```
+Merge pull request #988 from joshcooper/ticket/master/BKR-574-allow-no-restart
+
+(BKR-574) Allow global restart_when_done => false
+```
+* (BKR-574) Allow global restart_when_done => false (8d6742ef)
+
+
+```
+(BKR-574) Allow global restart_when_done => false
+
+Previously, setting `:restart_when_done` to false on the master host, or
+globally in options, did not work, because the `with_puppet_running_on`
+method was checking for a truthy value.
+
+This commit checks if the key is in the hash instead. It also preserves
+the behavior where the options passed in by the test case take
+precedence over the host's value.
+```
+* (BKR-573) Add publisher for solaris package removal (e90918c9)
+
+* Merge pull request #984 from ferventcoder/ticket/master/BKR-582 (45cca4e8)
+
+
+```
+Merge pull request #984 from ferventcoder/ticket/master/BKR-582
+
+(BKR-582) Colorization adjustments / CI Build / Allow overriding log colors
+```
+* Merge pull request #976 from johnduarte/remove_puppet_on (92a5309b)
+
+
+```
+Merge pull request #976 from johnduarte/remove_puppet_on
+
+(BKR-573) Add remove_puppet_on
+```
+* Merge pull request #982 from kevpl/bkr571_applymanifeston_docs (2a9b0a32)
+
+
+```
+Merge pull request #982 from kevpl/bkr571_applymanifeston_docs
+
+(BKR-571) updated documentation on return types
+```
+* Merge pull request #972 from azhurbilo/patch-1 (26c8c8bb)
+
+
+```
+Merge pull request #972 from azhurbilo/patch-1
+
+(BKR-380) Fix '3389' (host port) is declared multiple times
+```
+* (BKR-582) Colorization adjustments / CI Build (c2dc9fd7)
+
+
+```
+(BKR-582) Colorization adjustments / CI Build
+
+When beaker detects it is being run by Jenkins, it should adjust output
+colors so that they are better handled in console output. This is done
+by detecting BUILD_NUMBER environment variable, a variable that is
+known to be present on Jenkins build slaves.
+
+Adjust colorization to colors that come out better during runs. The
+colors that should come up to the front are shown better when running
+in the console. Additionally make it easier to see logs coming back
+from the SUT with an explicit color instead of NORMAL (which is the
+same setting as the current GREY).
+
+Allow overriding log colors by passing in log_colors in options.
+If a user has overridden the default colors, don't override the
+colors in CI.
+```
+* (BKR-582) Info on begin test file (239ab2d1)
+
+
+```
+(BKR-582) Info on begin test file
+
+When a test file is found, log it at the info level. This allows a bit
+more trackability in finding the location of tests.
+```
+* (BKR-582) Warn on skipped tests (8745c061)
+
+
+```
+(BKR-582) Warn on skipped tests
+
+If a test is skipped, it should show up as a warning. Adjust beaker to
+warn when tests are skipped.
+```
+* (BKR-571) updated documentation on return types (9d98dec1)
+
+* (QENG-2604) Empty host_tags in Presets (df0abb97)
+
+
+```
+(QENG-2604) Empty host_tags in Presets
+
+The host_tags value in presets is now an empty hash and
+department, project, and created_by are returned to the
+root of the @options hash. This resolves an issue with
+environment vars not being properly merged into the new
+host_tags hash.
+```
+* (BKR-542) change logger level to info for "empty array of hosts" (b056ef83)
+
+* (BKR-573) Add spec tests for remove_puppet_on (8e04650b)
+
+
+```
+(BKR-573) Add spec tests for remove_puppet_on
+
+This commit adds spec tests for the  `remove_puppet_on` method.
+```
+* (QENG-2604) Add Host Tags (03fd8ca7)
+
+
+```
+(QENG-2604) Add Host Tags
+
+This commit adds the ability to specify arbitrary tags and have them
+applied to AWS or vmpooler instances. The configuration parameter is
+called "host_tags" to avoid confusion with test tagging. Host tags can
+be specified at the host or CONFIG level.
+
+The presets have been modified to pre-populate "host_tags" with:
+project, department, and created_by.
+
+Example:
+HOSTS:
+  'agent1':
+    roles:
+      - agent
+    host_tags:
+      created_by: 'me'
+      some_key: 'yes it is'
+CONFIG:
+    host_tags:
+      project: 'beaker'
+```
+* (BKR-573) Add remove_puppet_on (3c1f5daf)
+
+
+```
+(BKR-573) Add remove_puppet_on
+
+This commit adds a `remove_puppet_on` method that can be used to
+ensure that puppet packages have been expunged from hosts.
+
+This method is intended to be used in a pre-suite. It is currently
+limited to the AIX and Solaris platforms.
+```
+* (BKR-380) beaker vagrant windows box support issues (c3379726)
+
+
+```
+(BKR-380) beaker vagrant windows box support issues
+Fix '3389' (host port) is declared multiple times
+
+Without "auto_correct" we got error if source Vagrantfile of box already contains this port forwarding.
+
+
+
+Error:
+vm:
+* Forwarded port '3389' (host port) is declared multiple times
+with the protocol 'tcp'.
+
+
+
+I think we need add this change as most part of Windows boxes in Vagrant Atlas already have this port forwarding:
+- https://github.com/joefitzgerald/packer-windows/blob/master/vagrantfile-windows_2012_r2.template
+- https://github.com/boxcutter/windows/blob/master/tpl/vagrantfile-eval-win2012r2-standard.tpl
+
+change spec for 3389 rdp port
+```
+* (BKR-539) simplified Dockerfile support (63268b8f)
+
+
+```
+(BKR-539) simplified Dockerfile support
+
+Allow user to override the automatically generated Dockerfile
+```
+### <a name = "2.26.0">2.26.0 - 13 Oct, 2015 (427a512b)
+
+* (HISTORY) update beaker history for gem release 2.26.0 (427a512b)
 
 * (GEM) update beaker version to 2.26.0 (d581b613)
 

data/lib/beaker/dsl/helpers/puppet_helpers.rb

@@ -126,7 +126,7 @@ module Beaker
           cmdline_args = conf_opts[:__commandline_args__]
           service_args = conf_opts[:__service_args__] || {}
           restart_when_done = true
-          restart_when_done = host[:restart_when_done] if host[:restart_when_done]
+          restart_when_done = host[:restart_when_done] if host.has_key?(:restart_when_done)
           restart_when_done = conf_opts.fetch(:restart_when_done, restart_when_done)
           conf_opts = conf_opts.reject { |k,v| [:__commandline_args__, :__service_args__, :restart_when_done].include?(k) }
 
@@ -382,6 +382,8 @@ module Beaker
         #                      by the caller; this can be used for additional
         #                      validation, etc.
         #
+        # @return [Array<Result>, Result] An array of results, or a result object.
+        #   Check {#run_block_on} for more details on this.
         def apply_manifest_on(host, manifest, opts = {}, &block)
           block_on host do | host |
             on_options = {}

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

@@ -1390,6 +1390,58 @@ NOASK
           create_remote_file(host, "C:\\Windows\\Temp\\#{cert_name}.pem", cert)
           on host, "certutil -v -addstore Root C:\\Windows\\Temp\\#{cert_name}.pem"
         end
+
+        # Ensures Puppet and dependencies are no longer installed on host(s).
+        #
+        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+        #                            or a role (String or Symbol) that identifies one or more hosts.
+        #
+        # @return nil
+        # @api public
+        def remove_puppet_on( hosts )
+          block_on hosts do |host|
+            cmdline_args = ''
+            # query packages
+            case host[:platform]
+            when /aix/
+              pkgs = on(host, "rpm -qa  | grep -E '(^pe-|puppet)'", :acceptable_exit_codes => [0,1]).stdout.chomp.split(/\n+/)
+              pkgs.concat on(host, "rpm -q tar", :acceptable_exit_codes => [0,1]).stdout.chomp.split(/\n+/)
+            when /solaris-10/
+              cmdline_args = '-a noask'
+              pkgs = on(host, "pkginfo | egrep '(^pe-|puppet)' | cut -f2 -d ' '", :acceptable_exit_codes => [0,1]).stdout.chomp.split(/\n+/)
+            when /solaris-11/
+              pkgs = on(host, "pkg list | egrep '(^pe-|puppet)' | awk '{print $1}'", :acceptable_exit_codes => [0,1]).stdout.chomp.split(/\n+/)
+            else
+              raise "remove_puppet_on() called for unsupported " +
+                    "platform '#{host['platform']}' on '#{host.name}'"
+            end
+
+            # uninstall packages
+            host.uninstall_package(pkgs.join(' '), cmdline_args) if pkgs.length > 0
+
+            if host[:platform] =~ /solaris-11/ then
+              # FIXME: This leaves things in a state where Puppet Enterprise (3.x) cannot be cleanly installed
+              #        but is required to put things in a state that puppet-agent can be installed
+              # extra magic for expunging left over publisher
+              publishers = ['puppetlabs.com', 'com.puppetlabs']
+              publishers.each do |publisher|
+                if on(host, "pkg publisher #{publisher}", :acceptable_exit_codes => [0,1]).exit_code == 0 then
+                  # First, try to remove the publisher altogether
+                  if on(host, "pkg unset-publisher #{publisher}", :acceptable_exit_codes => [0,1]).exit_code == 1 then
+                    # If that doesn't work, we're in a non-global zone and the
+                    # publisher is from a global zone. As such, just remove any
+                    # references to the non-global zone uri.
+                    on(host, "pkg set-publisher -G '*' #{publisher}", :acceptable_exit_codes => [0,1])
+                  end
+                end
+              end
+            end
+
+            # delete any residual files
+            on(host, 'find / -name "*puppet*" -print | xargs rm -rf')
+
+          end
+        end
       end
     end
   end

data/lib/beaker/dsl/patterns.rb

@@ -11,13 +11,16 @@ module Beaker
     #
     module Patterns
 
-      #Execute a block selecting the hosts that match with the provided criteria
-      #@param [Array<Host>, Host, String, Symbol] hosts_or_filter A host role as a String or Symbol that can be
+      # Execute a block selecting the hosts that match with the provided criteria
+      # @param [Array<Host>, Host, String, Symbol] hosts_or_filter A host role as a String or Symbol that can be
       #                                                used to search for a set of Hosts,  a host name
       #                                                as a String that can be used to search for
       #                                                a set of Hosts, or a {Host}
       #                                                or Array<{Host}> to run the block against
-      #@param [Block] block This method will yield to a block of code passed by the caller
+      # @param [Block] block This method will yield to a block of code passed by the caller
+      #
+      # @return [Array<Result>, Result] An array of results, or a result object.
+      #   Check {#run_block_on} for more details on this.
       def block_on hosts_or_filter, &block
         block_hosts = nil
         if defined? hosts

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

@@ -135,7 +135,9 @@ module Unix::Pkg
       when /solaris-11/
         execute("pkg #{cmdline_args} uninstall #{name}", opts)
       when /solaris-10/
-        execute("pkgutil -r -y #{cmdline_args} #{name}", opts)
+        execute("pkgrm -n #{cmdline_args} #{name}", opts)
+      when /aix/
+        execute("rpm #{cmdline_args} -e #{name}", opts)
       else
         raise "Package #{name} cannot be installed on #{self}"
     end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -502,6 +502,10 @@ module Beaker
         instance.add_tag("department", :value => @options[:department])
         instance.add_tag("project", :value => @options[:project])
         instance.add_tag("created_by", :value => @options[:created_by])
+
+        host[:host_tags].each do |name, val|
+          instance.add_tag(name.to_s, :value => val)
+        end
       end
 
       nil

data/lib/beaker/hypervisor/docker.rb

@@ -168,90 +168,98 @@ module Beaker
     end
 
     def dockerfile_for(host)
+      if host['dockerfile'] then
+        @logger.debug("attempting to load user Dockerfile from #{host['dockerfile']}")
+        if File.exist?(host['dockerfile']) then
+          dockerfile = File.read(host['dockerfile'])
+        else
+          raise "requested Dockerfile #{host['dockerfile']} does not exist"
+        end 
+      else 
+        raise("Docker image undefined!") if (host['image']||= nil).to_s.empty?
+
+        # specify base image
+        dockerfile = <<-EOF
+          FROM #{host['image']}
+        EOF
 
-      # Warn if image is not define, empty or nil
-      @logger.error("Docker image undefined!") if (host['image']||= nil).to_s.empty?
-
-      # specify base image
-      dockerfile = <<-EOF
-        FROM #{host['image']}
-      EOF
-
-      # additional options to specify to the sshd
-      # may vary by platform
-      sshd_options = ''
+        # additional options to specify to the sshd
+        # may vary by platform
+        sshd_options = ''
 
-      # add platform-specific actions
-      service_name = "sshd"
-      case host['platform']
-      when /ubuntu/, /debian/
-        service_name = "ssh"
-        dockerfile += <<-EOF
-          RUN apt-get update
-          RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
-        EOF
-        when  /cumulus/
+        # add platform-specific actions
+        service_name = "sshd"
+        case host['platform']
+        when /ubuntu/, /debian/
+          service_name = "ssh"
           dockerfile += <<-EOF
-          RUN apt-get update
-          RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
-        EOF
-      when /fedora-22/
-        dockerfile += <<-EOF
-          RUN dnf clean all
-          RUN dnf 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 /^el-/, /centos/, /fedora/, /redhat/, /eos/
+            RUN apt-get update
+            RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
+          EOF
+          when  /cumulus/
+            dockerfile += <<-EOF
+            RUN apt-get update
+            RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
+          EOF
+        when /fedora-22/
+          dockerfile += <<-EOF
+            RUN dnf clean all
+            RUN dnf 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 /^el-/, /centos/, /fedora/, /redhat/, /eos/
+          dockerfile += <<-EOF
+            RUN yum clean all
+            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/
+          dockerfile += <<-EOF
+            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
+            RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
+          EOF
+        else
+          # TODO add more platform steps here
+          raise "platform #{host['platform']} not yet supported on docker"
+        end
+
+        # Make sshd directory, set root password
         dockerfile += <<-EOF
-          RUN yum clean all
-          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
+          RUN mkdir -p /var/run/sshd
+          RUN echo root:#{root_password} | chpasswd
         EOF
-      when /opensuse/, /sles/
+
+        # Configure sshd service to allowroot login using password
         dockerfile += <<-EOF
-          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
-          RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
+          RUN sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
+          RUN sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
         EOF
-      else
-        # TODO add more platform steps here
-        raise "platform #{host['platform']} not yet supported on docker"
-      end
 
-      # Make sshd directory, set root password
-      dockerfile += <<-EOF
-        RUN mkdir -p /var/run/sshd
-        RUN echo root:#{root_password} | chpasswd
-      EOF
 
-      # Configure sshd service to allowroot login using password
-      dockerfile += <<-EOF
-        RUN sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
-        RUN sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
-      EOF
+        # Any extra commands specified for the host
+        dockerfile += (host['docker_image_commands'] || []).map { |command|
+          "RUN #{command}\n"
+        }.join('')
 
+        # Override image entrypoint
+        if host['docker_image_entrypoint']
+          dockerfile += "ENTRYPOINT #{host['docker_image_entrypoint']}\n"
+        end
 
-      # Any extra commands specified for the host
-      dockerfile += (host['docker_image_commands'] || []).map { |command|
-        "RUN #{command}\n"
-      }.join('')
+        # How to start a sshd on port 22.  May be an init for more supervision
+        # Ensure that the ssh server can be restarted (done from set_env) and container keeps running
+        cmd = host['docker_cmd'] || ["sh","-c","service #{service_name} start ; tail -f /dev/null"]
+        dockerfile += <<-EOF
+          EXPOSE 22
+          CMD #{cmd}
+        EOF
 
-      # Override image entrypoint
-      if host['docker_image_entrypoint']
-        dockerfile += "ENTRYPOINT #{host['docker_image_entrypoint']}\n"
       end
-
-      # How to start a sshd on port 22.  May be an init for more supervision
-      # Ensure that the ssh server can be restarted (done from set_env) and container keeps running
-      cmd = host['docker_cmd'] || ["sh","-c","service #{service_name} start ; tail -f /dev/null"]
-      dockerfile += <<-EOF
-        EXPOSE 22
-        CMD #{cmd}
-      EOF
-
+      
       @logger.debug("Dockerfile is #{dockerfile}")
       return dockerfile
     end

data/lib/beaker/hypervisor/vagrant.rb

@@ -36,7 +36,7 @@ module Beaker
         v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\", :mac => \"#{randmac}\"\n"
 
         if /windows/i.match(host['platform'])
-          v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389\n"
+          v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true\n"
           v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
           v_file << "    v.vm.guest = :windows\n"
         end

data/lib/beaker/hypervisor/vmpooler.rb

@@ -73,6 +73,20 @@ module Beaker
       template_url
     end
 
+    # Override host tags with presets
+    # @param [Beaker::Host] host Beaker host
+    # @return [Hash] Tag hash
+    def add_tags(host)
+      host[:host_tags].merge(
+          {
+              'beaker_version'    => Beaker::Version::STRING,
+              'jenkins_build_url' => @options[:jenkins_build_url],
+              'department'        => @options[:department],
+              'project'           => @options[:project],
+              'created_by'        => @options[:created_by]
+          })
+    end
+
     def provision
       request_payload = {}
       start = Time.now
@@ -143,14 +157,6 @@ module Beaker
       start = Time.now
       @logger.notify 'Tagging vmpooler VMs'
 
-      tags = {
-        'beaker_version' => Beaker::Version::STRING,
-        'jenkins_build_url' => @options[:jenkins_build_url],
-        'department' => @options[:department],
-        'project' => @options[:project],
-        'created_by' => @options[:created_by]
-      }
-
       @hosts.each_with_index do |h, i|
         begin
           uri = URI.parse(@options[:pooling_api] + '/vm/' + h['vmhostname'].split('.')[0])
@@ -158,7 +164,8 @@ module Beaker
           http = Net::HTTP.new(uri.host, uri.port)
           request = Net::HTTP::Put.new(uri.request_uri)
 
-          request.body = { 'tags' => tags }.to_json
+          # merge pre-defined tags with host tags
+          request.body = { 'tags' => add_tags(h) }.to_json
 
           response = http.request(request)
         rescue RuntimeError, Errno::EINVAL, Errno::ECONNRESET, EOFError,

data/lib/beaker/logger.rb

@@ -41,7 +41,7 @@ module Beaker
       :warn    => 0,
     }
 
-    attr_accessor :color, :log_level, :destinations
+    attr_accessor :color, :log_level, :destinations, :log_colors
 
     # Initialization of the Logger class
     # @overload initialize(dests)
@@ -83,6 +83,35 @@ module Beaker
 
       @destinations = []
 
+      @log_colors =  {
+        :error => RED,
+        :warn => BRIGHT_RED,
+        :success => MAGENTA,
+        :notify => BLUE,
+        :info => GREEN,
+        :debug => WHITE,
+        :trace => BRIGHT_YELLOW,
+        :perf => BRIGHT_MAGENTA,
+        :host => YELLOW
+      }
+
+      @log_colors.merge!(options[:log_colors]) if options[:log_colors]
+
+      # if a user overrides any of the log_colors, we will no longer
+      # override the colors at all on a CI build. This is b/c it is
+      # assumed that if a user is overriding the colors, they know
+      # what they are doing. We could potentially add an additional
+      # option a user can pass to be explicit about still allowing
+      # the override.
+      unless options[:log_colors]
+        # Jenkins exposed variable - should be present on the slave directing
+        # the beaker run
+        ci_build = ENV['BUILD_NUMBER'] != nil
+
+        @log_colors[:notify] = NORMAL if ci_build
+        @log_colors[:info] = NORMAL if ci_build
+      end
+
       dests = args
       dests << STDOUT unless options[:quiet]
       dests.uniq!
@@ -230,7 +259,7 @@ module Beaker
       return unless is_verbose?
       strings = strip_colors_from args
       string = strings.join
-      optionally_color GREY, string, false
+      optionally_color @log_colors[:host], string, false
     end
 
     # Custom reporting for messages generated by host SUTs - to preserve output
@@ -248,7 +277,7 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def perf_output *args
       return unless is_debug?
-      optionally_color MAGENTA, *args
+      optionally_color @log_colors[:perf], *args
     end
 
     # Report a trace message.
@@ -256,7 +285,7 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def trace *args
       return unless is_trace?
-      optionally_color CYAN, *args
+      optionally_color @log_colors[:trace], *args
     end
 
     # Report a debug message.
@@ -264,7 +293,7 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def debug *args
       return unless is_verbose?
-      optionally_color WHITE, *args
+      optionally_color @log_colors[:debug], *args
     end
 
     # Report a warning message.
@@ -274,7 +303,7 @@ module Beaker
     def warn *args
       return unless is_warn?
       strings = args.map {|msg| "Warning: #{msg}" }
-      optionally_color YELLOW, strings
+      optionally_color @log_colors[:warn], strings
     end
 
     # Report an info message.
@@ -282,14 +311,14 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def info *args
       return unless is_info?
-      optionally_color BLUE, *args
+      optionally_color @log_colors[:info], *args
     end
 
     # Report a success message.
     # Will always be reported.
     # @param args[Array<String>] Strings to be reported
     def success *args
-      optionally_color GREEN, *args
+      optionally_color @log_colors[:success], *args
     end
 
     # Report a notify message.
@@ -297,14 +326,14 @@ module Beaker
     # @param args[Array<String>] Strings to be reported
     def notify *args
       return unless is_notify?
-      optionally_color BRIGHT_WHITE, *args
+      optionally_color @log_colors[:notify], *args
     end
 
     # Report an error message.
     # Will always be reported.
     # @param args[Array<String>] Strings to be reported
     def error *args
-      optionally_color BRIGHT_RED, *args
+      optionally_color @log_colors[:error], *args
     end
 
     # Strip any color codes from provided string(s)

data/lib/beaker/options/parser.rb

@@ -325,6 +325,14 @@ module Beaker
           if host[:platform] =~ /windows|el-4/
             test_host_roles(name, host)
           end
+
+          #check to see if a custom user account has been provided, if so use it
+          if host[:ssh] && host[:ssh][:user]
+            host[:user] = host[:ssh][:user]
+          end
+
+          # merge host tags for this host with the global/preset host tags
+          host[:host_tags] = @options[:host_tags].merge(host[:host_tags] || {})
         end
 
         normalize_and_validate_tags()
@@ -333,14 +341,6 @@ module Beaker
         #set the default role
         set_default_host!(@options[:HOSTS])
 
-        #check to see if a custom user account has been provided, if so use it
-        @options[:HOSTS].each_key do |name|
-          host = @options[:HOSTS][name]
-          if host[:ssh] && host[:ssh][:user]
-            host[:user] = host[:ssh][:user]
-          end
-        end
-
       end
 
       # Takes tag arguments given at this point, which are strings, converts

data/lib/beaker/options/presets.rb

@@ -121,6 +121,7 @@ module Beaker
           :project                => 'Beaker',
           :department             => 'unknown',
           :created_by             => ENV['USER'] || ENV['USERNAME'] || 'unknown',
+          :host_tags              => {},
           :openstack_api_key      => ENV['OS_PASSWORD'],
           :openstack_username     => ENV['OS_USERNAME'],
           :openstack_auth_url     => "#{ENV['OS_AUTH_URL']}/tokens",

data/lib/beaker/shared/host_manager.rb

@@ -68,10 +68,17 @@ module Beaker
         host_with_role
       end
 
-      #Execute a block selecting the hosts that match with the provided criteria
-      #@param [Array<Host>, Host] hosts The host or hosts to run the provided block against
-      #@param [String, Symbol] filter Optional filter to apply to provided hosts - limits by name or role
-      #@param [Block] block This method will yield to a block of code passed by the caller
+      # Execute a block selecting the hosts that match with the provided criteria
+      #
+      # @param [Array<Host>, Host] hosts The host or hosts to run the provided block against
+      # @param [String, Symbol] filter Optional filter to apply to provided hosts - limits by name or role
+      # @param [Block] block This method will yield to a block of code passed by the caller
+      #
+      # @todo beaker3.0: simplify return types to Array<Result> only
+      #
+      # @return [Array<Result>, Result] If a non-empty array of hosts has been
+      #   passed (after filtering), then an array of results is returned. Else,
+      #   a result object is returned.
       def run_block_on hosts = [], filter = nil, &block
         result = nil
         block_hosts = hosts #the hosts to apply the block to after any filtering
@@ -98,7 +105,7 @@ module Beaker
             # should warn here
             # check if logger is defined in this context
             if ( cur_logger = (logger || @logger ) )
-              cur_logger.warn "Attempting to execute against an empty array of hosts (#{hosts}, filtered to #{block_hosts}), no execution will occur"
+              cur_logger.info "Attempting to execute against an empty array of hosts (#{hosts}, filtered to #{block_hosts}), no execution will occur"
             end
           end
         else

data/lib/beaker/test_suite.rb

@@ -306,7 +306,7 @@ module Beaker
       @test_suite_results.total_tests = @test_files.length
 
       @test_files.each do |test_file|
-        @logger.notify "Begin #{test_file}"
+        @logger.info "Begin #{test_file}"
         start = Time.now
         test_case = TestCase.new(@hosts, @logger, options, test_file).run_test
         duration = Time.now - start
@@ -319,7 +319,7 @@ module Beaker
         when :pass
           @logger.success msg
         when :skip
-          @logger.debug msg
+          @logger.warn msg
         when :fail
           @logger.error msg
           break if @fail_mode.to_s !~ /slow/ #all failure modes except slow cause us to kick out early on failure

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.26.0'
+    STRING = '2.27.0'
   end
 end

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -607,6 +607,15 @@ describe ClassMixedWithDSLHelpers do
             expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
           end
 
+          it 'can be set globally in options' do
+            host[:restart_when_done] = false
+
+            subject.with_puppet_running_on(host, {})
+
+            expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=running/).once
+            expect(host).to execute_commands_matching(/puppet resource service #{host['puppetservice']}.*ensure=stopped/).exactly(2).times
+          end
+
           it 'yields to a block after bouncing service' do
             execution = 0
             allow( subject ).to receive(:curl_with_retries)

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -1180,4 +1180,61 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
   end
+
+  describe '#remove_puppet_on' do
+    let(:aixhost) { make_host('aix', :platform => 'aix-53-power') }
+    let(:sol10host) { make_host('sol10', :platform => 'solaris-10-x86_64') }
+    let(:sol11host) { make_host('sol11', :platform => 'solaris-11-x86_64') }
+    let(:el6host) { make_host('el6', :platform => 'el-6-x64') }
+
+    pkg_list = 'foo bar'
+
+    it 'uninstalls packages on aix, including tar' do
+      aix_depend_list = 'tar'
+      result = Beaker::Result.new(aixhost,'')
+      result.stdout = pkg_list
+      result2 = Beaker::Result.new(aixhost,'')
+      result2.stdout = aix_depend_list
+
+      expected_list = pkg_list + " " + aix_depend_list
+      cmd_args = ''
+
+      expect( subject ).to receive(:on).exactly(3).times.and_return(result, result2, result)
+      expect( aixhost ).to receive(:uninstall_package).with(expected_list, cmd_args)
+
+      subject.remove_puppet_on( aixhost )
+    end
+
+    it 'uninstalls packages on solaris 10' do
+      result = Beaker::Result.new(sol10host,'')
+      result.stdout = pkg_list
+
+      expected_list = pkg_list
+      cmd_args = '-a noask'
+
+      expect( subject ).to receive(:on).exactly(2).times.and_return(result, result)
+      expect( sol10host ).to receive(:uninstall_package).with(expected_list, cmd_args)
+
+      subject.remove_puppet_on( sol10host  )
+    end
+
+    it 'uninstalls packages on solaris 11' do
+      result = Beaker::Result.new(sol11host,'')
+      result.stdout='foo bar'
+
+      expected_list = pkg_list
+      cmd_args = ''
+
+      expect( subject ).to receive(:on).exactly(4).times.and_return(result, result, result)
+      expect( sol11host ).to receive(:uninstall_package).with(expected_list, cmd_args)
+
+      subject.remove_puppet_on( sol11host  )
+    end
+
+    it 'raises error on other platforms' do
+      expect { subject.remove_puppet_on( el6host ) }.to raise_error(RuntimeError, /unsupported platform/)
+    end
+
+  end
+
 end

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -388,6 +388,15 @@ module Beaker
           @hosts.each {|host| host['instance'] = aws_instance}
         end
 
+        it 'handles host_tags hash on host object' do
+          # set :host_tags on first host
+          aws.instance_eval {
+            @hosts[0][:host_tags] =  {'test_tag' => 'test_value'}
+          }
+          expect(aws_instance).to receive(:add_tag).with('test_tag', hash_including(:value => 'test_value')).at_least(:once)
+          expect(add_tags).to be_nil
+        end
+
         it 'adds tag for jenkins_build_url' do
           aws.instance_eval('@options[:jenkins_build_url] = "my_build_url"')
           expect(aws_instance).to receive(:add_tag).with('jenkins_build_url', hash_including(:value => 'my_build_url')).at_least(:once)

data/spec/beaker/hypervisor/docker_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'fakefs/spec_helpers'
 
 # fake the docker-api
 module Docker
@@ -9,6 +10,14 @@ module Docker
 end
 
 module Beaker
+  platforms = [
+    "ubuntu-14.04-x86_64", 
+    "cumulus-2.2-x86_64", 
+    "fedora-22-x86_64", 
+    "centos-7-x86_64", 
+    "sles-12-x86_64"
+  ]
+
   describe Docker do
     let(:hosts) { make_hosts }
 
@@ -298,42 +307,77 @@ module Beaker
     end
 
     describe '#dockerfile_for' do
+      FakeFS.deactivate!
       before :each do
         allow( ::Docker ).to receive(:validate_version!)
       end
       it 'should raise on an unsupported platform' do
-        expect { docker.send(:dockerfile_for, {'platform' => 'a_sidewalk' }) }.to raise_error(/platform a_sidewalk not yet supported on docker/)
+        expect { docker.send(:dockerfile_for, {'platform' => 'a_sidewalk', 'image' => 'foobar' }) }.to raise_error(/platform a_sidewalk not yet supported/)
+      end
+
+      it 'should raise on missing image' do
+        expect { docker.send(:dockerfile_for, {'platform' => 'centos-7-x86_64'})}.to raise_error(/Docker image undefined/)
       end
 
       it 'should add docker_image_commands as RUN statements' do
+        FakeFS.deactivate!
+        platforms.each do |platform|
+          dockerfile = docker.send(:dockerfile_for, {
+            'platform' => platform,
+            'image' => 'foobar',
+            'docker_image_commands' => [
+              'special one',
+              'special two',
+              'special three',
+            ]
+          })
+
+          expect( dockerfile ).to be =~ /RUN special one\nRUN special two\nRUN special three/
+        end
+      end
+
+      it 'should add docker_image_entrypoint' do
+        FakeFS.deactivate!
+        platforms.each do |platform|
+          dockerfile = docker.send(:dockerfile_for, {
+            'platform' => platform,
+            'image' => 'foobar',
+            'docker_image_entrypoint' => '/bin/bash'
+          })
+
+          expect( dockerfile ).to be =~ %r{ENTRYPOINT /bin/bash}
+        end
+      end
+
+      it 'should use zypper on sles' do
+        FakeFS.deactivate!
         dockerfile = docker.send(:dockerfile_for, {
-          'platform' => 'el-',
-          'docker_image_commands' => [
-            'special one',
-            'special two',
-            'special three',
-          ]
+          'platform' => 'sles-12-x86_64',
+          'image' => 'foobar',
         })
 
-        expect( dockerfile ).to be =~ /RUN special one\nRUN special two\nRUN special three/
+        expect( dockerfile ).to be =~ /RUN zypper -n in openssh/
       end
 
-      it 'should add docker_image_entrypoint' do
+      it 'should use dnf on fedora-22' do
+        FakeFS.deactivate!
         dockerfile = docker.send(:dockerfile_for, {
-          'platform' => 'el-',
-          'docker_image_entrypoint' => '/bin/bash'
+          'platform' => 'fedora-22-x86_64',
+          'image' => 'foobar',
         })
 
-        expect( dockerfile ).to be =~ %r{ENTRYPOINT /bin/bash}
+        expect( dockerfile ).to be =~ /RUN dnf install -y sudo/
       end
 
-      it 'should use zypper on sles' do
+      it 'should use user dockerfile if specified' do
+        FakeFS.deactivate!
         dockerfile = docker.send(:dockerfile_for, {
-          'platform' => 'sles',
+          'dockerfile' => 'README.md'
         })
 
-        expect( dockerfile ).to be =~ /RUN zypper -n in openssh/
+        expect( dockerfile ).to be == File.read('README.md')
       end
+
     end
   end
 end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -100,7 +100,7 @@ EOF
 
       generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
 
-      match = generated_file.match(/v.vm.network :forwarded_port, guest: 3389, host: 3389/)
+      match = generated_file.match(/v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true/)
       expect( match ).to_not be_nil,'Should have proper port for RDP'
 
       match = generated_file.match(/v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true/)

data/spec/beaker/hypervisor/vmpooler_spec.rb

@@ -42,6 +42,24 @@ module Beaker
       end
     end
 
+    describe '#add_tags' do
+      let(:vmpooler) { Beaker::Vmpooler.new(make_hosts({:host_tags => {'test_tag' => 'test_value'}}), make_opts) }
+
+      it 'merges tags correctly' do
+        vmpooler.instance_eval {
+          @options = @options.merge({:project => 'vmpooler-spec'})
+        }
+        host          = vmpooler.instance_variable_get(:@hosts)[0]
+        merged_tags   = vmpooler.add_tags(host)
+        expected_hash = {
+            test_tag:       'test_value',
+            beaker_version: Beaker::Version::STRING,
+            project:        'vmpooler-spec'
+        }
+        expect(merged_tags).to include(expected_hash)
+      end
+    end
+
     describe "#provision" do
 
       it 'provisions hosts from the pool' do

data/spec/beaker/logger_spec.rb

@@ -121,14 +121,95 @@ module Beaker
         expect( stdout_logger.destinations.size ).to be === 1
       end
 
-
       context 'default for' do
         its(:destinations)  { should include(STDOUT)  }
         its(:color)         { should be_nil           }
         its(:log_level)     { should be :verbose      }
       end
-    end
 
+      context 'log_colors' do
+        original_build_number = ENV['BUILD_NUMBER']
+
+        before :each do
+          ENV['BUILD_NUMBER'] = nil
+        end
+
+        after :each do
+          ENV['BUILD_NUMER'] = original_build_number
+        end
+
+
+        it 'should have the default log_colors' do
+          expect(logger.log_colors).to be == {
+              :error=> Beaker::Logger::RED,
+              :warn=> Beaker::Logger::BRIGHT_RED,
+              :success=> Beaker::Logger::MAGENTA,
+              :notify=> Beaker::Logger::BLUE,
+              :info=> Beaker::Logger::GREEN,
+              :debug=> Beaker::Logger::WHITE,
+              :trace=> Beaker::Logger::BRIGHT_YELLOW,
+              :perf=> Beaker::Logger::BRIGHT_MAGENTA,
+              :host=> Beaker::Logger::YELLOW
+          }
+        end
+
+        context 'when passing in log_color options' do
+          let(:log_colors) {
+            {
+                :error => "\e[00;30m"
+            }
+          }
+
+          let(:logger)     { Logger.new(my_io, :quiet => true, :log_colors => log_colors) }
+
+          it 'should override the specified log colors' do
+            expect(logger.log_colors[:error]).to be == Beaker::Logger::BLACK
+          end
+
+          it 'should leave other colors as the default' do
+            expect(logger.log_colors[:warn]).to be == Beaker::Logger::BRIGHT_RED
+          end
+        end
+
+        context 'with CI detected' do
+          before :each do
+            ENV['BUILD_NUMBER'] = 'bob'
+          end
+
+          context 'when using the default log colors' do
+            it 'should override notify with NORMAL' do
+              expect(logger.log_colors[:notify]).to be == Beaker::Logger::NORMAL
+            end
+
+            it 'should override info with NORMAL' do
+              expect(logger.log_colors[:info]).to be == Beaker::Logger::NORMAL
+            end
+          end
+
+          context 'when overriding default log colors' do
+            let(:log_colors) {
+              {
+                  :error => "\e[00;30m"
+              }
+            }
+
+            let(:logger)     { Logger.new(my_io, :quiet => true, :log_colors => log_colors) }
+
+            it 'should override the specified log colors' do
+              expect(logger.log_colors[:error]).to be == Beaker::Logger::BLACK
+            end
+
+            it 'should not override notify with NORMAL' do
+              expect(logger.log_colors[:notify]).not_to be == Beaker::Logger::NORMAL
+            end
+
+            it 'should not override info with NORMAL' do
+              expect(logger.log_colors[:notify]).not_to be == Beaker::Logger::NORMAL
+            end
+          end
+        end
+      end
+    end
 
     context 'it can' do
       it 'open/create a file when a string is given to add_destination' do

data/spec/beaker/options/parser_spec.rb

@@ -292,6 +292,7 @@ module Beaker
             },
             'fail_mode' => 'slow',
             'preserve_hosts' => 'always',
+            'host_tags' => {}
           })
         end
 

data/spec/beaker/options/presets_spec.rb

@@ -27,6 +27,11 @@ module Beaker
         expect(presets.presets).to be_instance_of(Beaker::Options::OptionsHash)
       end
 
+      it 'has empty host_tags' do
+        expect(presets.presets.has_key?(:host_tags)).to be_truthy
+        expect(presets.presets[:host_tags]).to eq({})
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.26.0
+  version: 2.27.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec