beaker 2.14.1 → 2.15.0

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

@@ -131,13 +131,7 @@ module Beaker
               scp_to host, source_path, target_module_dir, {:ignore => ignore_list}
               #rename to the selected module name, if not correct
               cur_path = File.join(target_module_dir, source_name)
-              if (cur_path != target_path)
-                if host.is_powershell?
-                  on host, "move /y #{cur_path} #{target_path}"
-                else
-                  on host, "mv #{cur_path} #{target_path}"
-                end
-              end
+              host.mv cur_path, target_path unless cur_path == target_path
             when 'rsync'
               logger.debug "Using rsync to transfer #{source_path} to #{target_path}"
               rsync_to host, source_path, target_path, {:ignore => ignore_list}

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

@@ -110,7 +110,7 @@ module Beaker
         # @param [Host] host    A single host to act upon
         # @param [String] platform The platform type of this host, one of windows, freebsd, mac & unix
         def remove_platform_pe_defaults(host, platform)
-          FOSS_DEFAULTS[platform].each_pair do |key, val|
+          PE_DEFAULTS[platform].each_pair do |key, val|
             host.delete(key)
           end
           host['group'] = nil

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

@@ -26,7 +26,7 @@ module Beaker
         #                            or a role (String or Symbol) that identifies one or more hosts.
         def configure_pe_defaults_on( hosts )
           block_on hosts do |host|
-            if host['type'] && host['type'] =~ /aio/
+            if (host[:pe_ver] && (not version_is_less(host[:pe_ver], '4.0'))) or (host['type'] && host['type'] =~ /aio/)
               # add pe defaults to host
               add_aio_defaults_on(host)
             else
@@ -361,9 +361,18 @@ module Beaker
             pre30master = version_is_less(opts[:pe_ver] || master['pe_ver'], '3.0')
           end
 
+          pe_versions = ( [] << opts['pe_ver'] << hosts.map{ |host| host['pe_ver'] } ).flatten.compact
+          agent_only_check_needed = version_is_less('3.99', max_version(pe_versions, '3.8'))
+          if agent_only_check_needed
+            hosts_agent_only, hosts_not_agent_only = create_agent_specified_arrays(hosts)
+          else
+            hosts_agent_only, hosts_not_agent_only = [], hosts.dup
+          end
+
           # Set PE distribution for all the hosts, create working dir
           use_all_tar = ENV['PE_USE_ALL_TAR'] == 'true'
           hosts.each do |host|
+            next if agent_only_check_needed && hosts_agent_only.include?(host)
             host['pe_installer'] ||= 'puppet-enterprise-installer'
             if host['platform'] !~ /windows|osx/
               platform = use_all_tar ? 'all' : host['platform']
@@ -395,7 +404,7 @@ module Beaker
             host['working_dir'] = host.tmpdir(Time.new.strftime("%Y-%m-%d_%H.%M.%S"))
           end
 
-          fetch_pe(hosts, opts)
+          fetch_pe(hosts_not_agent_only, opts)
 
           install_hosts = hosts.dup
           unless masterless
@@ -404,7 +413,11 @@ module Beaker
           end
 
           install_hosts.each do |host|
-            if host['platform'] =~ /windows/
+            if agent_only_check_needed && hosts_agent_only.include?(host)
+              host['type'] = 'aio'
+              install_puppet_agent_pe_promoted_repo_on(host, opts)
+              setup_defaults_and_config_helper_on(host, master, [0, 1])
+            elsif host['platform'] =~ /windows/
               on host, installer_cmd(host, opts)
               configure_pe_defaults_on(host)
               if not host.is_cygwin?
@@ -425,13 +438,8 @@ module Beaker
               elsif host['platform'] =~ /osx|eos/
                 # If we're not frictionless, we need to run the OSX special-case
                 on host, installer_cmd(host, opts)
-                configure_pe_defaults_on(host)
-                #set the certname and master
-                on host, puppet("config set server #{master}")
-                on host, puppet("config set certname #{host}")
-                #run once to request cert
                 acceptable_codes = host['platform'] =~ /osx/ ? [1] : [0, 1]
-                on host, puppet_agent('-t'), :acceptable_exit_codes => acceptable_codes
+                setup_defaults_and_config_helper_on(host, master, acceptable_codes)
               else
                 answers = Beaker::Answers.create(opts[:pe_ver] || host['pe_ver'], hosts, opts)
                 create_remote_file host, "#{host['working_dir']}/answers", answers.answer_string(host)
@@ -483,6 +491,46 @@ module Beaker
           end
         end
 
+        # Builds the agent_only and not_agent_only arrays needed for installation.
+        #
+        # @param [Array<Host>]          hosts hosts to split up into the arrays
+        #
+        # @note should only be called against versions 4.0+, as this method
+        #   assumes AIO packages will be required.
+        #
+        # @api private
+        # @return [Array<Host>, Array<Host>]
+        #   the array of hosts to do an agent_only install on and
+        #   the array of hosts to do our usual install methods on
+        def create_agent_specified_arrays(hosts)
+          hosts_agent_only = []
+          hosts_not_agent_only = []
+          hosts.each do |host|
+            if host['roles'] && host['roles'].length == 1 && host['roles'][0] == 'agent'
+              hosts_agent_only << host
+            else
+              hosts_not_agent_only << host
+            end
+          end
+          return hosts_agent_only, hosts_not_agent_only
+        end
+
+        # Helper for setting up pe_defaults & setting up the cert on the host
+        # @param [Host] host                            host to setup
+        # @param [Host] master                          the master host, for setting up the relationship
+        # @param [Array<Fixnum>] acceptable_exit_codes  The exit codes that we want to ignore
+        #
+        # @return nil
+        # @api private
+        def setup_defaults_and_config_helper_on(host, master, acceptable_exit_codes=nil)
+          configure_pe_defaults_on(host)
+          #set the certname and master
+          on host, puppet("config set server #{master}")
+          on host, puppet("config set certname #{host}")
+          #run once to request cert
+          on host, puppet_agent('-t'), :acceptable_exit_codes => acceptable_exit_codes
+        end
+
         #Install PE based on global hosts with global options
         #@see #install_pe_on
         def install_pe
@@ -494,6 +542,12 @@ module Beaker
         # @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.
         # @!macro common_opts
+        # @option opts [String] :sha      The sha of puppet-agent to install. Required for PE agent
+        #                                 only hosts on 4.0+
+        # @option opts [String] :version  Version of puppet-agent to install. Required for PE agent
+        #                                 only hosts on 4.0+
+        # @option opts [String] :pe_ver   The version of PE (will also use host['pe_ver']), defaults to '4.0'
+        #
         # @example
         #  install_pe_on(hosts, {})
         #

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

@@ -29,6 +29,7 @@ module Beaker
         def add_puppet_paths_on(hosts)
           block_on hosts do | host |
             host.add_env_var('PATH', construct_puppet_path(host))
+            host.add_env_var('PATH', 'PATH') # don't destroy the path!
           end
         end
 
@@ -42,6 +43,45 @@ module Beaker
           end
         end
 
+        #Configure the provided hosts to be of the provided type (one of foss, aio, pe), if the host
+        #is already associated with a type then remove the previous settings for that type
+        # @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.
+        # @param [String] type One of 'aio', 'pe' or 'foss'
+        def configure_defaults_on( hosts, type )
+          block_on hosts do |host|
+
+            # check to see if the host already has a type associated with it
+            remove_defaults_on(host)
+
+            add_method = "add_#{type}_defaults_on"
+            if self.respond_to?(add_method, host)
+              self.send(add_method, host)
+            else
+              raise "cannot add defaults of type #{type} for host #{host.name} (#{add_method} not present)"
+            end
+            # add pathing env
+            add_puppet_paths_on(host)
+          end
+        end
+
+        #If the host is associated with a type remove all defaults and environment associated with that type.
+        # @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.
+        def remove_defaults_on( hosts )
+          block_on hosts do |host|
+            if host['type']
+              remove_puppet_paths_on(hosts)
+              remove_method = "remove_#{host['type']}_defaults_on"
+              if self.respond_to?(remove_method, host)
+                self.send(remove_method, host)
+              else
+                raise "cannot remove defaults of type #{host['type']} associated with host #{host.name} (#{remove_method} not present)"
+              end
+            end
+          end
+        end
+
       end
     end
   end

data/lib/beaker/dsl/structure.rb

@@ -209,6 +209,41 @@ module Beaker
         end
       end
 
+      # Sets tags on the current {Beaker::TestCase}, and skips testing
+      # if necessary after checking this case's tags against the ones that are
+      # being included or excluded.
+      #
+      # @param [Array<String>] tags Tags to be assigned to the current test
+      #
+      # @return nil
+      # @api public
+      def tag(*tags)
+        metadata[:case] ||= {}
+        metadata[:case][:tags] = []
+        tags.each do |tag|
+          metadata[:case][:tags] << tag.downcase
+        end
+
+        @options[:tag_includes] ||= []
+        @options[:tag_excludes] ||= []
+
+        tags_needed_to_include_this_test = []
+        @options[:tag_includes].each do |tag_to_include|
+          tags_needed_to_include_this_test << tag_to_include \
+            unless metadata[:case][:tags].include?(tag_to_include)
+        end
+        skip_test "#{self.path} does not include necessary tag(s): #{tags_needed_to_include_this_test}" \
+          if tags_needed_to_include_this_test.length > 0
+
+        tags_to_remove_to_include_this_test = []
+        @options[:tag_excludes].each do |tag_to_exclude|
+          tags_to_remove_to_include_this_test << tag_to_exclude \
+            if metadata[:case][:tags].include?(tag_to_exclude)
+        end
+        skip_test "#{self.path} includes excluded tag(s): #{tags_to_remove_to_include_this_test}" \
+          if tags_to_remove_to_include_this_test.length > 0
+      end
+
       #Return a set of hosts that meet the given criteria
       # @param [Hash{Symbol,String=>String,Regexp,Array<String,Regexp>}]
       #   criteria Specify the criteria with which a host should be

data/lib/beaker/host/pswindows/exec.rb

@@ -21,6 +21,15 @@ module PSWindows::Exec
     execute("del /s /q #{path}")
   end
 
+  # Move the origin to destination. The destination is removed prior to moving.
+  # @param [String] orig The origin path
+  # @param [String] dest the destination path
+  # @param [Boolean] rm Remove the destination prior to move
+  def mv(orig, dest, rm=true)
+    rm_rf dest unless !rm
+    execute("move /y #{orig} #{dest}")
+  end
+
   def path
     'c:/windows/system32;c:/windows'
   end

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

@@ -41,7 +41,16 @@ module Unix::Exec
   # Recursively remove the path provided
   # @param [String] path The path to remove
   def rm_rf path
-    exec(Beaker::Command.new("rm -rf #{path}"))
+    execute("rm -rf #{path}")
+  end
+
+  # Move the origin to destination. The destination is removed prior to moving.
+  # @param [String] orig The origin path
+  # @param [String] dest the destination path
+  # @param [Boolean] rm Remove the destination prior to move
+  def mv orig, dest, rm=true
+    rm_rf dest unless !rm
+    execute("mv #{orig} #{dest}")
   end
 
   # Converts the provided environment file to a new shell script in /etc/profile.d, then sources that file.

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

@@ -61,8 +61,6 @@ module Unix::Pkg
     case self['platform']
       when /sles-/
         execute("zypper --non-interactive in #{name}", opts)
-      when /el-4/
-        @logger.debug("Package installation not supported on rhel4")
       when /cisco|fedora|centos|eos|el-/
         if version
           name = "#{name}-#{version}"

data/lib/beaker/host_prebuilt_steps.rb

@@ -13,7 +13,7 @@ module Beaker
     SLEEPWAIT = 5
     TRIES = 5
     UNIX_PACKAGES = ['curl', 'ntpdate']
-    FREEBSD_PACKAGES = ['curl']
+    FREEBSD_PACKAGES = ['curl', 'perl5']
     WINDOWS_PACKAGES = ['curl']
     PSWINDOWS_PACKAGES = []
     SLES10_PACKAGES = ['curl']
@@ -521,7 +521,7 @@ module Beaker
           host.exec(Command.new("stopsrc -g ssh"))
           host.exec(Command.new("startsrc -g ssh"))
         when /freebsd/
-          host.echo_to_file('\nPermitUserEnvironment yes', '/etc/ssh/sshd_config')
+          host.exec(Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
         end
 

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -473,7 +473,7 @@ module Beaker
       @hosts.each do |host|
         @logger.notify("aws-sdk: Populate DNS for #{host.name}")
         instance = host['instance']
-        host['ip'] = instance.ip_address
+        host['ip'] = instance.ip_address ? instance.ip_address : instance.private_ip_address
         host['private_ip'] = instance.private_ip_address
         host['dns_name'] = instance.dns_name
         @logger.notify("aws-sdk: name: #{host.name} ip: #{host['ip']} private_ip: #{host['private_ip']} dns_name: #{instance.dns_name}")

data/lib/beaker/options/command_line_parser.rb

@@ -223,6 +223,13 @@ module Beaker
             @cmd_options[:type] = type
           end
 
+          opts.on '--tag TAGS', 'Run the set of tests matching ALL of the provided single or comma separated list of tags' do |value|
+            @cmd_options[:tag_includes] = value
+          end
+
+          opts.on '--exclude-tag TAGS', 'Run the set of tests that do not contain ANY of the provided single or command separated list of tags' do |value|
+            @cmd_options[:tag_excludes] = value
+          end
         end
 
       end

data/lib/beaker/options/parser.rb

@@ -170,18 +170,13 @@ module Beaker
       # Order of priority is as follows:
       #   1.  environment variables are given top priority
       #   2.  ARGV or provided arguments array
-      #   3.  host file options
-      #   4.  the 'CONFIG' section of the hosts file
-      #   5.  options file values
-      #   6.  default or preset values are given the lowest priority
+      #   3.  the 'CONFIG' section of the hosts file
+      #   4.  options file values
+      #   5.  default or preset values are given the lowest priority
       #
       # @param [Array] args ARGV or a provided arguments array
       # @raise [ArgumentError] Raises error on bad input
       def parse_args(args = ARGV)
-        # NOTE on argument precedence:
-        # Will use env, then hosts/config file, then command line, then file options
-
-
         @options = @presets.presets
         cmd_line_options = @command_line_parser.parse(args)
         cmd_line_options[:command_line] = ([$0] + args).join(' ')
@@ -332,6 +327,8 @@ module Beaker
           end
         end
 
+        normalize_and_validate_tags()
+
         #set the default role
         set_default_host!(@options[:HOSTS])
 
@@ -345,6 +342,29 @@ module Beaker
 
       end
 
+      # Takes tag arguments given at this point, which are strings, converts
+      # them into the proper format (an array of strings) for Beaker use,
+      # and lastly, validates them.
+      #
+      # @return nil
+      # @api public
+      def normalize_and_validate_tags()
+        @options[:tag_includes] ||= ''
+        @options[:tag_excludes] ||= ''
+        @options[:tag_includes] = @options[:tag_includes].split(',') if @options[:tag_includes].respond_to?(:split)
+        @options[:tag_excludes] = @options[:tag_excludes].split(',') if @options[:tag_excludes].respond_to?(:split)
+        @options[:tag_includes].map!(&:downcase)
+        @options[:tag_excludes].map!(&:downcase)
+
+        #check that a tag is not both included & excluded sets
+        @options[:tag_includes].each do |included_tag|
+          @options[:tag_excludes].each do |excluded_tag|
+            parser_error "tag '#{included_tag}' cannot be in both the included and excluded tag sets" \
+              if included_tag == excluded_tag
+          end
+        end
+      end
+
       private
 
       # @api private

data/lib/beaker/options/presets.rb

@@ -31,6 +31,8 @@ module Beaker
         :release_yum_repo_url => ['BEAKER_RELEASE_YUM_REPO', 'RELEASE_YUM_REPO'],
         :dev_builds_url       => ['BEAKER_DEV_BUILDS_URL', 'DEV_BUILDS_URL'],
         :vbguest_plugin       => ['BEAKER_VB_GUEST_PLUGIN', 'BEAKER_vb_guest_plugin'],
+        :tag_includes         => ['BEAKER_TAG'],
+        :tag_excludes         => ['BEAKER_EXCLUDE_TAG'],
       }
 
       # Select all environment variables whose name matches provided regex
@@ -142,6 +144,8 @@ module Beaker
           :log_sut_event          => 'sut.log',
           :color                  => true,
           :dry_run                => false,
+          :tag_includes           => '',
+          :tag_excludes           => '',
           :timeout                => 300,
           :fail_mode              => 'slow',
           :accept_all_exit_codes  => false,
@@ -151,9 +155,6 @@ module Beaker
           :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",

data/lib/beaker/shared/semvar.rb

@@ -14,9 +14,9 @@ module Beaker
         b_nums = b.split('-')[0].split('.')
         (0...a_nums.length).each do |i|
           if i < b_nums.length
-            if a_nums[i] < b_nums[i]
+            if a_nums[i].to_i < b_nums[i].to_i
               return true
-            elsif a_nums[i] > b_nums[i]
+            elsif a_nums[i].to_i > b_nums[i].to_i
               return false
             end
           else
@@ -35,6 +35,27 @@ module Beaker
         end
         return false
       end
+
+      # Gets the max semver version from a list of them
+      # @param [Array<String>]  versions  List of versions to get max from
+      # @param [String]         default   Default version if list is nil or empty
+      #
+      # @note nil values will be skipped
+      # @note versions parameter will be copied so that the original
+      #   won't be tampered with
+      #
+      # @return [String, nil] the max string out of the versions list or the
+      #   default value if the list is faulty, which can either be set or nil
+      def max_version(versions, default=nil)
+        return default if !versions || versions.empty?
+        versions_copy = versions.dup
+        highest = versions_copy.shift
+        versions_copy.each do |version|
+          next if !version
+          highest = version if version_is_less(highest, version)
+        end
+        highest
+      end
     end
   end
 end