beaker 1.19.1 → 1.20.0

data/lib/beaker/hypervisor.rb

@@ -20,33 +20,39 @@ module Beaker
       @logger = options[:logger]
       @logger.notify("Beaker::Hypervisor, found some #{type} boxes to create")
       hyper_class = case type
-        when /aix/
+        when /^aix$/
           Beaker::Aixer
-        when /solaris/
+        when /^solaris$/
           Beaker::Solaris
-        when /vsphere/
+        when /^vsphere$/
           Beaker::Vsphere
-        when /fusion/
+        when /^fusion$/
           Beaker::Fusion
-        when /blimpy/
+        when /^blimpy$/
           Beaker::Blimper
-        when /ec2/
+        when /^ec2$/
           Beaker::AwsSdk
-        when /vcloud/
+        when /^vcloud$/
           if options['pooling_api']
             Beaker::VcloudPooled
           else
             Beaker::Vcloud
           end
-        when /vagrant/
+        when /^vagrant$/
           Beaker::Vagrant
-        when /google/
+        when /^vagrant_virtualbox$/
+          Beaker::VagrantVirtualbox
+        when /^vagrant_fusion$/
+          Beaker::VagrantFusion
+        when /^vagrant_workstation$/
+          Beaker::VagrantWorkstation
+        when /^google$/
           Beaker::GoogleCompute
-        when /docker/
+        when /^docker$/
           Beaker::Docker
-        when /openstack/
+        when /^openstack$/
           Beaker::OpenStack
-        when /none/
+        when /^none$/
           Beaker::Hypervisor
         else
           # Custom hypervisor
@@ -93,6 +99,9 @@ module Beaker
       if @options[:package_proxy]
         package_proxy(@hosts, @options)
       end
+      if @options[:disable_iptables]
+        disable_iptables @hosts, @options
+      end
     end
 
     #Default validation steps to be run for a given hypervisor
@@ -110,6 +119,6 @@ module Beaker
   end
 end
 
-[ 'vsphere_helper', 'vagrant', 'fusion', 'blimper', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack' ].each do |lib|
+[ 'vsphere_helper', 'vagrant', 'vagrant_virtualbox', 'vagrant_fusion', 'vagrant_workstation', '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/logger.rb

@@ -29,6 +29,7 @@ module Beaker
 
     # The defined log levels.  Each log level also reports messages at levels lower than itself
     LOG_LEVELS      = {
+      :trace   => 6,
       :debug   => 5,
       :verbose => 3,
       :info    => 2,
@@ -56,6 +57,8 @@ module Beaker
       @color = options[:color]
       @sublog = nil
       case options[:log_level]
+      when /trace/i, :trace
+        @log_level = :trace
       when /debug/i, :debug
         @log_level = :debug
       when /verbose/i, :verbose
@@ -80,6 +83,18 @@ module Beaker
       dests.each {|dest| add_destination(dest)}
     end
 
+
+    # Turn on/off STDOUT logging
+    # @param [Boolean] off If true, disable STDOUT logging, if false enable STDOUT logging
+    def quiet(off = true)
+      if off
+        remove_destination(STDOUT) #turn off the noise!
+      else
+        remove_destination(STDOUT) #in case we are calling this in error and we are already noisy
+        add_destination(STDOUT)
+      end
+    end
+
     # Construct an array of open steams for printing log messages to
     # @param [Array<IO, String>] dest Array of strings (each used as a file path) and IO steams that messages will be printed to
     def add_destination(dest)
@@ -110,6 +125,12 @@ module Beaker
       end
     end
 
+    # Are we at {LOG_LEVELS} trace?
+    # @return [Boolean] true if 'trace' or higher, false if not 'trace' {LOG_LEVELS} or lower
+    def is_trace?
+      LOG_LEVELS[@log_level] >= LOG_LEVELS[:trace]
+    end
+
     # Are we at {LOG_LEVELS} debug?
     # @return [Boolean] true if 'debug' or higher, false if not 'debug' {LOG_LEVELS} or lower
     def is_debug?
@@ -181,6 +202,14 @@ module Beaker
       optionally_color MAGENTA, string, false
     end
 
+    # Report a trace message.
+    # Will not print unless we are at {LOG_LEVELS} 'trace' or higher.
+    # @param args[Array<String>] Strings to be reported
+    def trace *args
+      return unless is_trace?
+      optionally_color CYAN, *args
+    end
+
     # Report a debug message.
     # Will not print unless we are at {LOG_LEVELS} 'debug' or higher.
     # @param args[Array<String>] Strings to be reported

data/lib/beaker/options/command_line_parser.rb

@@ -71,6 +71,7 @@ module Beaker
                   'Possible values:',
                   'always (keep SUTs alive)',
                   'onfail (keep SUTs alive if failures occur during testing)',
+                  'onpass (keep SUTs alive if no failures occur during testing)',
                   'never (cleanup SUTs - shutdown and destroy any changes made during testing)',
                   '(default: never)'  do |mode|
             @cmd_options[:preserve_hosts] = mode || 'always'
@@ -120,6 +121,7 @@ module Beaker
           opts.on '--log-level LEVEL',
                   'Log level',
                   'Supported LEVEL keywords:',
+                  'trace   : all messages, full stack trace of errors, file copy details',
                   'debug   : all messages, plus full stack trace of errors',
                   'verbose : all messages',
                   'info    : info messages, notifications and warnings',

data/lib/beaker/options/parser.rb

@@ -161,6 +161,7 @@ module Beaker
       #
       def initialize
          @command_line_parser = Beaker::Options::CommandLineParser.new
+         @presets = Beaker::Options::Presets.new
       end
 
       # Parses ARGV or provided arguments array, file options, hosts options and combines with environment variables and
@@ -181,7 +182,7 @@ module Beaker
         # Will use env, then hosts/config file, then command line, then file options
 
 
-        @options = Beaker::Options::Presets.presets
+        @options = @presets.presets
         cmd_line_options = @command_line_parser.parse(args)
         file_options = Beaker::Options::OptionsFileParser.parse_options_file(cmd_line_options[:options_file])
 
@@ -204,7 +205,7 @@ module Beaker
 
           # merge in env vars
           #   overwrite options (default, file options, command line, hosts file) with env
-          env_vars = Beaker::Options::Presets.env_vars
+          env_vars = @presets.env_vars
 
           @options = @options.merge(env_vars)
 
@@ -288,8 +289,8 @@ module Beaker
         end
 
         #check for valid preserve_hosts option
-        if @options[:preserve_hosts] !~ /always|onfail|never/
-          parser_error "--preserve_hosts must be one of always, onfail or never, not '#{@options[:preserve_hosts]}'"
+        if @options[:preserve_hosts] !~ /always|onfail|onpass|never/
+          parser_error "--preserve_hosts must be one of always, onfail, onpass or never, not '#{@options[:preserve_hosts]}'"
         end
 
         #check for config files necessary for different hypervisors

data/lib/beaker/options/presets.rb

@@ -1,12 +1,12 @@
 module Beaker
   module Options
-    #A set of functions representing the environment variables and preset argument values to be incorporated
+    #A class representing the environment variables and preset argument values to be incorporated
     #into the Beaker options Object.
-    module Presets
+    class Presets
 
       # This is a constant that describes the variables we want to collect
       # from the environment. The keys correspond to the keys in
-      # `self.presets` (flattened) The values are an optional array of
+      # `presets` (flattened) The values are an optional array of
       # environment variable names to look for. The array structure allows
       # us to define multiple environment variables for the same
       # configuration value. They are checked in the order they are arrayed
@@ -26,24 +26,27 @@ module Beaker
         :release_apt_repo_url => ['BEAKER_RELEASE_APT_REPO', 'RELEASE_APT_REPO'],
         :release_yum_repo_url => ['BEAKER_RELEASE_YUM_REPO', 'RELEASE_YUM_REPO'],
         :dev_builds_url       => ['BEAKER_DEV_BUILDS_URL', 'DEV_BUILDS_URL'],
-        :q_puppet_enterpriseconsole_auth_user_email => 'q_puppet_enterpriseconsole_auth_user_email',
-        :q_puppet_enterpriseconsole_auth_password   => 'q_puppet_enterpriseconsole_auth_password',
-        :q_puppet_enterpriseconsole_smtp_host       => 'q_puppet_enterpriseconsole_smtp_host',
-        :q_puppet_enterpriseconsole_smtp_port       => 'q_puppet_enterpriseconsole_smtp_port',
-        :q_puppet_enterpriseconsole_smtp_username   => 'q_puppet_enterpriseconsole_smtp_username',
-        :q_puppet_enterpriseconsole_smtp_password   => 'q_puppet_enterpriseconsole_smtp_password',
-        :q_puppet_enterpriseconsole_smtp_use_tls    => 'q_puppet_enterpriseconsole_smtp_use_tls',
-        :q_verify_packages                          => 'q_verify_packages',
-        :q_puppetdb_password                        => 'q_puppetdb_password',
       }
 
+      # Select all environment variables whose name matches provided regex
+      # @return [Hash] Hash of environment variables
+      def select_env_by_regex regex
+        envs = Beaker::Options::OptionsHash.new
+        ENV.each_pair do | k, v |
+          if k.to_s =~ /#{regex}/
+            envs[k] = v
+          end
+        end
+        envs
+      end
+
       # Takes an environment_spec and searches the processes environment variables accordingly
       #
       # @param [Hash{Symbol=>Array,String}] env_var_spec  the spec of what env vars to search for
       #
       # @return [Hash] Found environment values
-      def self.collect_env_vars( env_var_spec )
-        env_var_spec.inject({:answers => {}}) do |memo, key_value|
+      def collect_env_vars( env_var_spec )
+        env_var_spec.inject({}) do |memo, key_value|
           key, value = key_value[0], key_value[1]
 
           set_env_var = Array(value).detect {|possible_variable| ENV[possible_variable] }
@@ -54,40 +57,43 @@ module Beaker
       end
 
       # Takes a hash where the values are found environment configuration values
-      # and munges them to appropriate Beaker configuration values
+      # and formats them to appropriate Beaker configuration values
       #
       # @param [Hash{Symbol=>String}] found_env_vars  Environment variables to munge
       #
-      # @return [Hash] Environment config values munged appropriately
-      def self.munge_found_env_vars( found_env_vars )
-        found_env_vars[:answers] ||= {}
-        found_env_vars.each_pair do |key,value|
-          found_env_vars[:answers][key] = value if key.to_s =~ /q_/
-        end
+      # @return [Hash] Environment config values formatted appropriately
+      def format_found_env_vars( found_env_vars )
         found_env_vars[:consoleport] &&= found_env_vars[:consoleport].to_i
         found_env_vars[:type] = found_env_vars[:is_pe] == 'true' || found_env_vars[:is_pe] == 'yes' ? 'pe' : nil
         found_env_vars[:pe_version_file_win] = found_env_vars[:pe_version_file]
-        found_env_vars[:answers].delete_if {|key, value| value.nil? or value.empty? }
-        found_env_vars.delete_if {|key, value| value.nil? or value.empty? }
+        found_env_vars
       end
 
-
       # Generates an OptionsHash of the environment variables of interest to Beaker
       #
       # @return [OptionsHash] The supported environment variables in an OptionsHash,
       #                       empty or nil environment variables are removed from the OptionsHash
-      def self.env_vars
-        h = Beaker::Options::OptionsHash.new
+      def calculate_env_vars
+        found = Beaker::Options::OptionsHash.new
+        found = found.merge(format_found_env_vars( collect_env_vars( ENVIRONMENT_SPEC )))
+        found[:answers] = select_env_by_regex('\\Aq_')
 
-        found = munge_found_env_vars( collect_env_vars( ENVIRONMENT_SPEC ))
+        found.delete_if {|key, value| value.nil? or value.empty? }
+        found
+      end
 
-        return h.merge( found )
+      # Return an OptionsHash of environment variables used in this run of Beaker
+      #
+      # @return [OptionsHash] The supported environment variables in an OptionsHash,
+      #                       empty or nil environment variables are removed from the OptionsHash
+      def env_vars
+        @env ||= calculate_env_vars
       end
 
       # Generates an OptionsHash of preset values for arguments supported by Beaker
       #
       # @return [OptionsHash] The supported arguments in an OptionsHash
-      def self.presets
+      def presets
         h = Beaker::Options::OptionsHash.new
         h.merge({
           :project              => 'Beaker',
@@ -113,23 +119,40 @@ module Beaker
           :timeout              => 300,
           :fail_mode            => 'slow',
           :timesync             => false,
+          :disable_iptables     => true,
           :repo_proxy           => false,
           :package_proxy        => false,
           :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.delivery.puppetlabs.net",
+          :epel_url             => "http://mirrors.kernel.org/fedora-epel",
+          :epel_arch            => "i386",
+          :epel_6_pkg           => "epel-release-6-8.noarch.rpm",
+          :epel_5_pkg           => "epel-release-5-4.noarch.rpm",
           :consoleport          => 443,
           :pe_dir               => '/opt/enterprise/dists',
           :pe_version_file      => 'LATEST',
           :pe_version_file_win  => 'LATEST-win',
           :answers              => {
-                                     :q_puppet_enterpriseconsole_auth_user_email => 'admin@example.com',
-                                     :q_puppet_enterpriseconsole_auth_password   => '~!@#$%^*-/ aZ',
-                                     :q_puppet_enterpriseconsole_smtp_port       => 25,
-                                     :q_puppet_enterpriseconsole_smtp_use_tls    => 'n',
-                                     :q_verify_packages                          => 'y',
-                                     :q_puppetdb_password                        => '~!@#$%^*-/ aZ'
+                                     :q_puppet_enterpriseconsole_auth_user_email    => 'admin@example.com',
+                                     :q_puppet_enterpriseconsole_auth_password      => '~!@#$%^*-/ aZ',
+                                     :q_puppet_enterpriseconsole_smtp_port          => 25,
+                                     :q_puppet_enterpriseconsole_smtp_use_tls       => 'n',
+                                     :q_verify_packages                             => 'y',
+                                     :q_puppetdb_password                           => '~!@#$%^*-/ aZ',
+                                     :q_puppetmaster_enterpriseconsole_port         => 443,
+                                     :q_puppet_enterpriseconsole_auth_database_name => 'console_auth',
+                                     :q_puppet_enterpriseconsole_auth_database_user => 'mYu7hu3r',
+                                     :q_puppet_enterpriseconsole_database_name      => 'console',
+                                     :q_puppet_enterpriseconsole_database_user      => 'mYc0nS03u3r',
+                                     :q_database_root_password                      => '=ZYdjiP3jCwV5eo9s1MBd',
+                                     :q_database_root_user                          => 'pe-postgres',
+                                     :q_database_export_dir                         => '/tmp',
+                                     :q_puppetdb_database_name                      => 'pe-puppetdb',
+                                     :q_puppetdb_database_user                      => 'mYpdBu3r',
+                                     :q_database_port                               => 5432,
+                                     :q_puppetdb_port                               => 8081,
           },
           :dot_fog              => File.join(ENV['HOME'], '.fog'),
           :ec2_yaml             => 'config/image_templates/ec2.yaml',

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.19.1'
+    STRING = '1.20.0'
   end
 end