beaker 2.36.0 → 2.37.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2FjZjE4ZjkyMmEyZTI3MWU2YmFmNTFlNzIwN2I0YzY3ZGFmODZkYg==
+    MGNkMmMyYzVlMzE0ZjZjNzZjYjMwNGUzYWI5ZGJiYzljM2E4YmJhNw==
   data.tar.gz: !binary |-
-    YmZkM2M3MThkOTEzNDMzYTBlOWRmOWNjNTBkNThkMWE0ZGQ5NzNjMQ==
+    MmQyMGI2ZTdmYjVjMjQ3MzIwNWI5OTQwNGFhNzQ3NDgyYzNjMTU4Zg==
 SHA512:
   metadata.gz: !binary |-
-    M2M5MDkwOGNjYTBiYmU2YzcxMDFjM2YzNzMyN2U5ZGMzZDc5NjRlNTZkYzU2
-    M2NjNDE5ZjNjMWU3Yzc4YzAyM2ZjN2RmMDE3YWZmZGI1OWM2NDMxNzg2ZTY5
-    OTE4MDYzZDcxZWVmMzY2NDY4NzM4OWNiYWNmZjA5OTJmMjk4NzE=
+    N2M5NjFjMWM4MGI2ZTllNDM2ODNhMGQ4YmQzMzlhNWUzNDdiZWZmMWU3ZTdk
+    MWQ5YzE2ZjgwMmY1NzE3YTU3NjVhMjkxYTUzYjZkZDZkZmYzNGExZjJiNzNh
+    ZDg0MDY0ZGM5YjZlYjhmMDkyNjIxNDViZTdjNzBhNWUzNDIwMjI=
   data.tar.gz: !binary |-
-    NzYyYjdjODA1ZTQwZjBiNmViYWEwY2YwOGI2MDJlY2IxN2FkMWVjODYwMmY0
-    YTRhMGVhYTNhYmZjYjZlZGJiYTZjZGJiZGNhM2NkNmZhNTIxZGU0MWFlYmI0
-    YzRkZDcyMGI0MWUyOTI3N2JjYjljM2U0ZTg2OWJlZmQ3ODIxOWI=
+    Mjk3ZTg3M2Y1MjIzMzZkY2NhNzhiNWViNjljODc3YzljNjk5ZmZkMzM1ODcx
+    OTA0ZmVhNDg0YmFhYzAwOTc5ZjEwNTEwMTM1MjVlNjdiNjVhODI4NTk1ZTQ4
+    MDIxNDE1YzViZmNmMTNlOGVmZTc2M2FhNTMxMzZkNzJkMzE2N2Y=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 9 Mar, 2016 (571ab630)](#LATEST)
+* [LATEST - 15 Mar, 2016 (b7ed692c)](#LATEST)
+* [2.36.0 - 9 Mar, 2016 (5fd86b67)](#2.36.0)
 * [2.35.0 - 24 Feb, 2016 (b20fa892)](#2.35.0)
 * [2.34.0 - 10 Feb, 2016 (b897a98a)](#2.34.0)
 * [2.33.0 - 27 Jan, 2016 (0dd8505a)](#2.33.0)
@@ -111,7 +112,71 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 9 Mar, 2016 (571ab630)
+### <a name = "LATEST">LATEST - 15 Mar, 2016 (b7ed692c)
+
+* (GEM) update beaker version to 2.37.0 (b7ed692c)
+
+* Merge pull request #1079 from kevpl/bkr702_platform_confine_tags (e2b3701d)
+
+
+```
+Merge pull request #1079 from kevpl/bkr702_platform_confine_tags
+
+(BKR-702) added platform-specific tag confines
+```
+* Merge pull request #1080 from MikaelSmith/fix-install_puppet_agent_on (478983f2)
+
+
+```
+Merge pull request #1080 from MikaelSmith/fix-install_puppet_agent_on
+
+(maint) Correct install_puppet_agent_on args
+```
+* (maint) Correct install_puppet_agent_on args (26c82bdd)
+
+
+```
+(maint) Correct install_puppet_agent_on args
+
+The docs for `install_puppet_agent_on` specify that the `opts` arg is
+optional, but it doesn't have a default value so in practice it's
+required. Update the call signature to specify a default empty hash, so
+the function matches its description.
+```
+* Merge pull request #1078 from LuvCurves/BKR-705 (23612a36)
+
+
+```
+Merge pull request #1078 from LuvCurves/BKR-705
+
+(BKR-705) Rename cisco platforms
+```
+* Merge pull request #1076 from MikaelSmith/BKR-715 (521fbf7b)
+
+
+```
+Merge pull request #1076 from MikaelSmith/BKR-715
+
+(BKR-715) Use puppet_agent_version for MSI from dev repos
+```
+* (BKR-702) added platform-specific tag confines (7cc40abb)
+
+* (BKR-705) Rename cisco platforms (f5a46897)
+
+* (BKR-715) Use puppet_agent_version for MSI from dev repos (046fbffd)
+
+
+```
+(BKR-715) Use puppet_agent_version for MSI from dev repos
+
+If a `puppet_agent_version` is specified, use it in
+`install_puppet_agent_dev_repo_on` to fetch the MSI, so we get an MSI
+unique to that SHA. This provides a work-around for BKR-712, and
+normalizes behavior with `install_puppet_agent_on`.
+```
+### <a name = "2.36.0">2.36.0 - 9 Mar, 2016 (5fd86b67)
+
+* (HISTORY) update beaker history for gem release 2.36.0 (5fd86b67)
 
 * (GEM) update beaker version to 2.36.0 (571ab630)
 

data/acceptance/tests/base/dsl/platform_tag_confiner_test.rb

@@ -0,0 +1,49 @@
+test_name "DSL::Structure::PlatformTagConfiner" do
+  pstc_method_name = "#platform_specific_tag_confines"
+  step "#{pstc_method_name} doesn't change hosts if there are no tags" do
+    previous_hosts = hosts.dup
+
+    platform_specific_tag_confines
+
+    assert_equal previous_hosts, hosts, "#{pstc_method_name} changed the hosts array"
+    # cleanup
+    options[:platform_tag_confines_object] = nil
+    options[:platform_tag_confines] = nil
+    @hosts = previous_hosts
+  end
+
+  step "#{pstc_method_name} can remove hosts from a test, or be skipped if empty" do
+    assert hosts.length() > 0, "#{pstc_method_name} did not have enough hosts to test"
+    previous_hosts = hosts.dup
+
+    options[:platform_tag_confines] = [
+      :platform => /#{default[:platform]}/,
+      :tag_reason_hash => {
+        'tag1' => 'reason1'
+      }
+    ]
+
+    begin
+      tag( 'tag1' )
+    rescue Beaker::DSL::Outcomes::SkipTest => e
+      if e.message =~ /^No\ suitable\ hosts\ found$/
+        # SkipTest is raised in the case when there are no hosts leftover for a test
+        # after confining. It's a very common acceptance test case where all of the
+        # hosts involved are of the same platform, and are thus all confined
+        # away by the code being run here. In this case, the hosts object will not
+        # be altered, but should be considered a pass, since the fact that SkipTest
+        # is being raised confirms that a lower number of hosts are coming out of
+        # the confine (0) than came in (>0, according to our pre-condition assertion)
+      else
+        fail "#{pstc_method_name} raised unexpected SkipTest exception: #{e}"
+      end
+    else
+      assert hosts.length() < previous_hosts.length(), "#{pstc_method_name} did not change hosts array"
+    end
+
+    # cleanup
+    options[:platform_tag_confines_object] = nil
+    options[:platform_tag_confines] = nil
+    @hosts = previous_hosts
+  end
+end

data/docs/dsl/platform_specific_tag_confines.md

@@ -0,0 +1,76 @@
+# Platform-Specific Tag Confines
+
+## What Are These?
+
+Typically when adding support for new platforms, a number of tests have to
+be confined away from executing on that new platform. This can be for a
+number of reasons, from partial implementation/support to tests having
+incorrect assumptions that don't work on the new platform.
+
+Platform-specific tag confines are structures created to make this workflow
+easier, & achievable in a much more low-impact and adaptable way.
+
+## Ok, So How Do We Use Them?
+
+In the local options file (provided to the command line interface (CLI)
+using the `--options-file` parameter), you can now provide an array of
+hashes, where each hash specifies a platform to confine, based on the
+tags included in the test. The local options file key is
+`:platform_tag_confines`.
+
+An example local options file is included 
+below (remember that local options files have to be readable into
+beaker as a ruby hash):
+
+```ruby
+{
+  :platform_tag_confines => [
+    {
+      :platform => /^ubuntu-1404/,
+      :tag_reason_hash => {
+        "metrics" => "Can't do this, because bananas are in the field",
+        "ui" => "TODO: We have not applied the UI tests to Ubuntu yet",
+      }
+    }, {
+      :platform => /^centos-7/,
+      :tag_reason_hash => {
+        "database" => "WUT is this system doing? I dunno, must skip",
+        "long_running" => "Flakiest test EVA. Would not run against centos-7, will kill...",
+        "ui" => "CentOS reason",
+      }
+    }
+  ]
+}
+```
+
+In this case, there are two platform confines objects specified, one for
+Ubuntu 14.04, and the other for CentOS 7. These objects consist of a hash,
+filled with two entries: the `:platform` regex, and the `:tag_reason_hash`.
+
+The `:platform` regex is just that, a Ruby regex matching the host's
+platform string.
+
+The `:tag_reason_hash` is another hash that maps tags to the reason that
+tests that have this particular tag are being confined away from testing.
+
+Taking one of our confine examples from above, we can think of the Ubuntu
+UI confine example like this:
+
+    "ui" tests will be confined away from ubuntu-1404 hosts, because
+    "TODO: We have not applied the UI tests to Ubuntu yet"
+    
+
+## But Why Do We Need These?
+
+Usually when we add platforms, the confining tests step is very heavy
+handed & repetitive, usually consisting of adding boilerplate confine
+calls that don't provide any explanation for why these are happening.
+This can make it hard to later know the reason for the confine, making
+it hard to know when we should be able to remove confines down the road.
+
+This new workflow should provide a number of advantages over the previous
+one, including:
+
+1. Always reporting a reason for confining a platform
+2. Allowing these to be dynamically determined from configuration, rather
+    than needing to edit tens to hundreds of test files in-repo

data/docs/hosts/cisco.md

@@ -4,10 +4,11 @@ Wind River Linux is an embedded systems OS from Wind, an Intel Company.  You
 can get more details on this from their
 [product page](http://www.windriver.com/products/linux/).
 
-Wind River Linux support came to Beaker through testing Cisco network
-devices, so our platform codename for this OS is `cisco`.
+Beaker provides support for 2 of Cisco's Wind River Linux platforms.
+Those platform codenames are `cisco_nexus` for Cisco NX-OS based systems
+and `cisco_ios_xr` for Cisco IOS XR based systems.
 
-Beaker currently can install puppet on WRLinux NXOS (5) and EXR (7).
+Beaker currently can install puppet on Cisco Nexus and Cisco IOS XR.
 
 # Host Requirements
 
@@ -15,7 +16,7 @@ WRLinux hosts validate their setup once created, and will fail if not
 setup correctly.  There are two conditions that are validated specifically
 on WRLinux hosts.  These conditions are listed below.
 
-A. All WRLinux hosts will need a `:vrf` value, which determines their
+A. All Cisco Nexus hosts will need a `:vrf` value, which determines their
 virtual routing framework for networking purposes.  For our purposes,
 we tend to use the value `management`, so there is always a hosts
 file line that looks like this in our configuration:
@@ -25,7 +26,7 @@ file line that looks like this in our configuration:
         ...
         vrf: management
     
-B. WRLinux NXOS (5) hosts will also require a user to be set on the
+B. All Cisco hosts will also require a user to be set on the
 hosts.  This is because they don't allow ssh'ing as the root user,
 which is one of the main assumptions that Beaker operates under in
 the usual case.  In order to specify a user to ssh with, add this

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

@@ -324,7 +324,7 @@ module Beaker
         # @return nil
         # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
         # @raise [FailTest] When error occurs during the actual installation process
-        def install_puppet_agent_on(hosts, opts)
+        def install_puppet_agent_on(hosts, opts = {})
           opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
           opts[:puppet_collection] ||= 'pc1' #hi!  i'm case sensitive!  be careful!
           opts[:puppet_agent_version] ||= opts[:version] #backwards compatability with old parameter name
@@ -333,7 +333,7 @@ module Beaker
             add_role(host, 'aio') #we are installing agent, so we want aio role
             package_name = nil
             case host['platform']
-            when /el-|fedora|sles|centos|cisco-/
+            when /el-|fedora|sles|centos|cisco_/
               package_name = 'puppet-agent'
               package_name << "-#{opts[:puppet_agent_version]}" if opts[:puppet_agent_version]
             when /debian|ubuntu|cumulus/
@@ -842,21 +842,25 @@ module Beaker
             opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
 
             case variant
-            when /^(fedora|el|centos|sles|cisco)$/
+            when /^(fedora|el|centos|sles|cisco_nexus|cisco_ios_xr)$/
               variant_url_value = (($1 == 'centos') ? 'el' : $1)
-              variant_url_value = 'cisco-wrlinux' if variant == 'cisco'
+              if variant == 'cisco_nexus'
+                variant_url_value = 'cisco-wrlinux'
+                version = '5'
+              end
+              if variant == 'cisco_ios_xr'
+                variant_url_value = 'cisco-wrlinux'
+                version = '7'
+              end
               remote = "%s/puppetlabs-release%s-%s-%s.noarch.rpm" %
                 [opts[:release_yum_repo_url], repo_name, variant_url_value, version]
 
-              if variant == 'cisco'
-                if version == '5'
-                  # cisco requires using yum to install the repo
-                  host.install_package( remote )
-                end
-                if version == '7'
-                  # cisco 7 requires using yum to localinstall the repo
-                  on host, "yum -y localinstall #{remote}"
-                end
+              if variant == 'cisco_nexus'
+                # cisco nexus requires using yum to install the repo
+                host.install_package( remote )
+              elsif variant == 'cisco_ios_xr'
+                # cisco ios xr requires using yum to localinstall the repo
+                on host, "yum -y localinstall #{remote}"
               else
                 host.install_package_with_rpm( remote, '--replacepkgs',
                   { :package_proxy => opts[:package_proxy] } )
@@ -896,7 +900,7 @@ module Beaker
                                   repo_filename,
                                   copy_dir )
 
-          if host[:platform] =~ /cisco-5/
+          if host[:platform] =~ /cisco_nexus/
             to_path = "#{host.package_config_dir}/#{File.basename(repo)}"
           else
             to_path = host.package_config_dir
@@ -938,7 +942,7 @@ module Beaker
                                   repo_configs_dir = nil,
                                   opts = options )
           variant, version, arch, codename = host['platform'].to_array
-          if variant !~ /^(fedora|el|centos|debian|ubuntu|cumulus|cisco)$/
+          if variant !~ /^(fedora|el|centos|debian|ubuntu|cumulus|cisco_nexus|cisco_ios_xr)$/
             raise "No repository installation step for #{variant} yet..."
           end
           repo_configs_dir ||= 'tmp/repo_configs'
@@ -1035,7 +1039,7 @@ module Beaker
             onhost_copy_base = opts[:copy_dir_external]
 
             case variant
-            when /^(fedora|el|centos|debian|ubuntu|cumulus|cisco)$/
+            when /^(fedora|el|centos|debian|ubuntu|cumulus|cisco_nexus|cisco_ios_xr)$/
               sha = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
               opts[:dev_builds_repos] ||= [ opts[:puppet_collection] ]
               install_puppetlabs_dev_repo( host, 'puppet-agent', sha, nil, opts )

data/lib/beaker/dsl/structure.rb

@@ -273,6 +273,28 @@ module Beaker
         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
+
+        platform_specific_tag_confines
+      end
+
+      # Handles platform-specific tag confines logic
+      #
+      # @return nil
+      # @!visibility private
+      def platform_specific_tag_confines
+        @options[:platform_tag_confines_object] ||= PlatformTagConfiner.new(
+          @options[:platform_tag_confines]
+        )
+        confines = @options[:platform_tag_confines_object].confine_details(
+          metadata[:case][:tags]
+        )
+        confines.each do |confine_details|
+          logger.notify( confine_details[:log_message] )
+          confine(
+            confine_details[:type],
+            :platform => confine_details[:platform_regex]
+          )
+        end
       end
 
       #Return a set of hosts that meet the given criteria
@@ -322,6 +344,79 @@ module Beaker
           true_false
         end
       end
+
+      class PlatformTagConfiner
+
+        # Constructs the PlatformTagConfiner, transforming the user format
+        #   into the internal structure for use by Beaker itself.
+        #
+        # @param [Array<Hash{Symbol=>Object}>] platform_tag_confines_array
+        #   The array of PlatformTagConfines objects that specify how these
+        #   confines should behave. See the note below for more info
+        #
+        # @note PlatformTagConfines objects come in the form
+        #     [
+        #       {
+        #         :platform => <platform-regex>,
+        #         :tag_reason_hash => {
+        #           <tag> => <reason to confine>,
+        #           <tag> => <reason to confine>,
+        #           ...etc...
+        #         }
+        #       }
+        #     ]
+        #
+        #   Internally, we want to turn tag matches into platform
+        #     confine statements. So a better internal structure would
+        #     be something of the form:
+        #     {
+        #       <tag> => [{
+        #         :platform => <platform-regex>,
+        #         :reason => <reason to confine>,
+        #         :type => :except,
+        #       }, ... ]
+        #     }
+        def initialize(platform_tag_confines_array)
+          platform_tag_confines_array ||= []
+          @tag_confine_details_hash = {}
+          platform_tag_confines_array.each do |entry|
+            entry[:tag_reason_hash].keys.each do |tag|
+              @tag_confine_details_hash[tag] ||= []
+              log_msg = "Tag '#{tag}' found, confining: except platforms "
+              log_msg << "matching regex '#{entry[:platform]}'. Reason: "
+              log_msg << "'#{entry[:tag_reason_hash][tag]}'"
+              @tag_confine_details_hash[tag] << {
+                :platform_regex => entry[:platform],
+                :log_message => log_msg,
+                :type => :except
+              }
+            end
+          end
+        end
+
+        # Gets the confine details needed for a set of tags
+        #
+        # @param [Array<String>] tags Tags of the given test
+        #
+        # @return [Array<Hash{Symbol=>Object}>] an array of
+        #   Confine details hashes, which are hashes of symbols
+        #   to their properties, which are objects of various
+        #   kinds, depending on the key
+        def confine_details(tags)
+          tags ||= []
+          details = []
+          tags.each do |tag|
+            tag_confine_array = @tag_confine_details_hash[tag]
+            next if tag_confine_array.nil?
+
+            details.push( *tag_confine_array )
+            # tag_confine_array.each do |confine_details|
+            #   details << confine_details
+            # end
+          end
+          details
+        end
+      end
     end
   end
 end

data/lib/beaker/host/cisco.rb

@@ -21,7 +21,7 @@ module Cisco
     #
     # @return nil
     def scp_post_operations(scp_file_actual, scp_file_target)
-      if self[:platform] =~ /cisco-5/
+      if self[:platform] =~ /cisco_nexus/
         execute( "mv #{scp_file_actual} #{scp_file_target}" )
       end
       nil
@@ -34,7 +34,7 @@ module Cisco
     # @return [String] path, changed if needed due to host
     #   constraints
     def scp_path(path)
-      if self[:platform] =~ /cisco-5/
+      if self[:platform] =~ /cisco_nexus/
         @home_dir ||= execute( 'pwd' )
         answer = "#{@home_dir}/#{File.basename( path )}"
         answer << '/' if path =~ /\/$/
@@ -72,9 +72,8 @@ module Cisco
       return user_pc unless command.index('vsh').nil?
 
       prepend_cmds = 'source /etc/profile;'
-      if self[:platform] =~ /cisco-5/
-        prepend_cmds << ' sudo ip netns exec '
-        prepend_cmds << ( self[:vrf] ? self[:vrf] : '' )
+      if self[:vrf]
+        prepend_cmds << "sudo ip netns exec #{self[:vrf]}"
       end
       return prepend_cmds
     end
@@ -95,7 +94,7 @@ module Cisco
       env_array = self.environment_variable_string_pair_array( env )
       environment_string = env_array.join(' ')
 
-      command = self[:platform] =~ /cisco-5/ ? 'export' : 'env'
+      command = self[:platform] =~ /cisco_nexus/ ? 'export' : 'env'
       "#{command} #{environment_string};"
     end
 
@@ -106,10 +105,18 @@ module Cisco
     #   this will be raised with the appropriate message
     def validate_setup
       msg = nil
-      msg = 'Cisco hosts must be provided with a :vrf value.' unless self[:vrf]
-
-      if !msg && self[:platform] =~ /cisco-5/ && self[:user] == 'root'
-        msg = 'Cisco-5 hosts must be provided with a :user value, as they can not SSH in as root.'
+      if self[:platform] =~ /cisco_nexus/ 
+        if !self[:vrf]
+          msg = 'Cisco Nexus hosts must be provided with a :vrf value.' 
+        end
+        if !self[:user]
+          msg = 'Cisco hosts must be provided with a :user value'
+        end
+      end
+      if self[:platform] =~ /cisco_ios_xr/ 
+        if !self[:user]
+          msg = 'Cisco hosts must be provided with a :user value'
+        end
       end
 
       if msg
@@ -121,4 +128,4 @@ module Cisco
     end
 
   end
-end
+end

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

@@ -62,10 +62,18 @@ module Unix::File
     repo_filename = "pl-%s-%s-" % [ package_name, build_version ]
 
     case variant
-    when /fedora|el|centos|cisco/
+    when /fedora|el|centos|cisco_nexus|cisco_ios_xr/
       variant = 'el' if variant == 'centos'
-      variant = 'cisco-wrlinux' if variant == 'cisco'
+      if variant == 'cisco_nexus'
+        variant = 'cisco-wrlinux'
+        version = '5'
+      end
+      if variant == 'cisco_ios_xr'
+        variant = 'cisco-wrlinux'
+        version = '7'
+      end
       fedora_prefix = ((variant == 'fedora') ? 'f' : '')
+
       pattern = "%s-%s%s-%s.repo"
       pattern = "repos-pe-#{pattern}" if self.is_pe?
 

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

@@ -65,7 +65,13 @@ module Windows::Pkg
     # - we do not have install_32 set on host
     # - we do not have install_32 set globally
     arch_suffix = should_install_64bit ? '64' : '86'
-    release_file = "puppet-agent-x#{arch_suffix}.msi"
+    # If a version was specified, use it; otherwise fall back to a default name.
+    # Avoid when puppet_agent_version is set to a SHA, which isn't used in package names.
+    if puppet_agent_version =~ /^\d+\.\d+\.\d+/
+      release_file = "puppet-agent-#{puppet_agent_version}-x#{arch_suffix}.msi"
+    else
+      release_file = "puppet-agent-x#{arch_suffix}.msi"
+    end
     return release_path_end, release_file
   end
 

data/lib/beaker/host_prebuilt_steps.rb

@@ -110,7 +110,7 @@ module Beaker
           check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
         when host['platform'] =~ /solaris-10/
           check_and_install_packages_if_needed(host, SOLARIS10_PACKAGES)
-        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-|netscaler|cisco-/
+        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-|netscaler|cisco_/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
       end

data/lib/beaker/platform.rb

@@ -3,7 +3,7 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(cisco|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
+    PLATFORMS = /^(cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
       { :debian => { "jessie"  => "8",
@@ -42,6 +42,8 @@ module Beaker
     # Creates the Platform object.  Checks to ensure that the platform String
     # provided meets the platform formatting rules.  Platforms name must be of
     # the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
+    # * cisco_nexus
+    # * cisco_ios_xr
     # * freebsd
     # * openbsd
     # * osx

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.36.0'
+    STRING = '2.37.0'
   end
 end

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

@@ -641,7 +641,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     context 'on cisco platforms' do
       context 'version 5' do
-        let( :platform ) { Beaker::Platform.new( 'cisco-5-x86_64' ) }
+        let( :platform ) { Beaker::Platform.new( 'cisco_nexus-7-x86_64' ) }
 
         it 'calls host.install_package' do
           expect( host ).to receive( :install_package ).with( /\.rpm$/ )
@@ -650,7 +650,7 @@ describe ClassMixedWithDSLInstallUtils do
       end
 
       context 'version 7' do
-        let( :platform ) { Beaker::Platform.new( 'cisco-7-x86_64' ) }
+        let( :platform ) { Beaker::Platform.new( 'cisco_ios_xr-6-x86_64' ) }
 
         it 'uses yum localinstall to install the package' do
           expect( subject ).to receive( :on ).with( host, /^yum.*localinstall.*\.rpm$/ )
@@ -952,12 +952,12 @@ describe ClassMixedWithDSLInstallUtils do
       host['platform'] = platform
       opts = { :version => '0.1.0' }
       allow( subject ).to receive( :options ).and_return( {} )
-      copied_path = "#{win_temp}\\puppet-agent-x86.msi"
+      copied_path = "#{win_temp}\\puppet-agent-0.1.0-x86.msi"
       mock_echo = Object.new()
       allow( mock_echo ).to receive( :raw_output ).and_return( copied_path )
 
-      expect(subject).to receive(:fetch_http_file).once.with(/\/windows$/, 'puppet-agent-x86.msi', /\/windows$/)
-      expect(subject).to receive(:scp_to).once.with(host, /\/puppet-agent-x86.msi$/, /#{external_copy_base}/)
+      expect(subject).to receive(:fetch_http_file).once.with(/\/windows$/, 'puppet-agent-0.1.0-x86.msi', /\/windows$/)
+      expect(subject).to receive(:scp_to).once.with(host, /\/puppet-agent-0.1.0-x86.msi$/, /#{external_copy_base}/)
       expect(subject).to receive(:install_msi_on).with(host, copied_path, {}, {:debug => nil}).once
       expect(subject).to receive(:on).ordered.with(host, /echo/).and_return(mock_echo)
 
@@ -1063,7 +1063,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :install_msi_on ).with( any_args )
       copy_base = 'copy_base_cygwin'
       allow( host ).to receive( :external_copy_base ).and_return( copy_base )
-      expect( subject ).to receive( :scp_to ).with( host, /puppet-agent-x86\.msi/, /#{copy_base}/ )
+      expect( subject ).to receive( :scp_to ).with( host, /puppet-agent-1\.0\.0-x86\.msi/, /#{copy_base}/ )
       expect( subject ).to receive( :configure_type_defaults_on ).with(host)
       expect( subject ).to receive( :fetch_http_file ).with( /[^\/]\z/, anything, anything )
       subject.install_puppet_agent_dev_repo_on( host, opts.merge({ :puppet_agent_version => '1.0.0' }) )

data/spec/beaker/dsl/structure_spec.rb

@@ -282,6 +282,10 @@ describe ClassMixedWithDSLStructure do
       opts
     }
 
+    before :each do
+      allow( subject ).to receive( :platform_specific_tag_confines )
+    end
+
     it 'sets tags on the TestCase\'s metadata object' do
       subject.instance_variable_set(:@options, options)
       tags = ['pants', 'jayjay', 'moguely']
@@ -339,3 +343,146 @@ describe ClassMixedWithDSLStructure do
 
   end
 end
+
+describe Beaker::DSL::Structure::PlatformTagConfiner do
+  let ( :confines_array ) { @confines_array || [] }
+  let ( :confiner ) {
+    Beaker::DSL::Structure::PlatformTagConfiner.new( confines_array )
+  }
+
+  describe '#initialize' do
+    it 'transforms one entry' do
+      platform_regex = /^ubuntu$/
+      tag_reason_hash = {
+        'tag1' => 'reason1',
+        'tag2' => 'reason2'
+      }
+      @confines_array = [ {
+          :platform => platform_regex,
+          :tag_reason_hash => tag_reason_hash
+        }
+      ]
+
+      internal_hash = confiner.instance_variable_get( :@tag_confine_details_hash )
+      expect( internal_hash.keys() ).to include( 'tag1' )
+      expect( internal_hash.keys() ).to include( 'tag2' )
+      expect( internal_hash.keys().length() ).to be === 2
+
+      tag_reason_hash.each do |tag, reason|
+        tag_array = internal_hash[tag]
+        expect( tag_array.length() ).to be === 1
+        tag_hash = tag_array[0]
+        expect( tag_hash[:platform_regex] ).to eql( platform_regex )
+        expect( tag_hash[:log_message] ).to match( /#{reason}/ )
+        expect( tag_hash[:type] ).to be === :except
+      end
+    end
+
+    it 'deals with the same tag being used on multiple platforms correctly' do
+      @confines_array = [
+        {
+          :platform => /^el-/,
+          :tag_reason_hash => {
+            'tag1' => 'reason el 1',
+            'tag2' => 'reason2'
+          }
+        }, {
+          :platform => /^cisco-/,
+          :tag_reason_hash => {
+            'tag1' => 'reason cisco 1',
+            'tag3' => 'reason3'
+          }
+        }
+      ]
+
+      internal_hash = confiner.instance_variable_get( :@tag_confine_details_hash )
+      expect( internal_hash.keys() ).to include( 'tag1' )
+      expect( internal_hash.keys() ).to include( 'tag2' )
+      expect( internal_hash.keys() ).to include( 'tag3' )
+      expect( internal_hash.keys().length() ).to be === 3
+
+      shared_tag_array = internal_hash['tag1']
+      expect( shared_tag_array.length() ).to be === 2
+
+      platform_el_found = false
+      platform_cisco_found = false
+      shared_tag_array.each do |confine_details|
+        case confine_details[:log_message]
+        when /\ el\ 1/
+          platform_el_found = true
+          platform_to_match = /^el-/
+          reason_to_match = /reason\ el\ 1/
+        when /\ cisco\ 1/
+          platform_cisco_found = true
+          platform_to_match = /^cisco-/
+          reason_to_match = /reason\ cisco\ 1/
+        else
+          log_msg = "unexpected log message for confine_details: "
+          log_msg << confine_details[:log_message]
+          fail( log_msg )
+        end
+
+        expect( confine_details[:platform_regex] ).to eql( platform_to_match )
+        expect( confine_details[:log_message] ).to match( reason_to_match )
+      end
+      expect( platform_el_found ).to be === true
+      expect( platform_cisco_found ).to be === true
+    end
+  end
+
+  describe '#confine_details' do
+    it 'returns an empty array if no tags match' do
+      fake_confine_details_hash = { 'tag1' => [ {:type => 1}, {:type => 2} ]}
+      confiner.instance_variable_set(
+        :@tag_confine_details_hash, fake_confine_details_hash
+      )
+      expect( confiner.confine_details( [ 'tag2', 'tag3' ] ) ).to be === []
+    end
+
+    context 'descriminates on tag name' do
+      fake_confine_details_hash = {
+        'tag0' => [ 10, 20, 30, 40 ],
+        'tag1' => [ 41, 51, 61, 71 ],
+        'tag2' => [ 22, 32, 42, 52 ],
+        'tag3' => [ 63, 73, 83, 93 ],
+        'tag4' => [ 34, 44, 54, 64 ],
+      }
+
+      key_combos_to_test = fake_confine_details_hash.keys.map { |key| [key] }
+      key_combos_to_test << [ 'tag0', 'tag2' ]
+      key_combos_to_test << [ 'tag1', 'tag4' ]
+      key_combos_to_test << [ 'tag2', 'tag3', 'tag4' ]
+      key_combos_to_test << fake_confine_details_hash.keys()
+
+      before :each do
+        confiner.instance_variable_set(
+          :@tag_confine_details_hash, fake_confine_details_hash
+        )
+      end
+
+      key_combos_to_test.each do |key_combo_to_have|
+        it "selects key(s) #{key_combo_to_have} from #{fake_confine_details_hash.keys}" do
+          haves = []
+          key_combo_to_have.each do |key_to_have|
+            haves += fake_confine_details_hash[key_to_have]
+          end
+          keys_not_to_have = fake_confine_details_hash.keys.reject { |key_trial|
+            key_combo_to_have.include?( key_trial )
+          }
+          have_nots = []
+          keys_not_to_have.each do |key_not_to_have|
+            have_nots += fake_confine_details_hash[key_not_to_have]
+          end
+
+          details = confiner.confine_details( key_combo_to_have )
+          have_nots.each do |confine_details|
+            expect( details ).to_not include( confine_details )
+          end
+          haves.each do |confine_details|
+            expect( details ).to     include( confine_details )
+          end
+        end
+      end
+    end
+  end
+end

data/spec/beaker/host/cisco_spec.rb

@@ -7,34 +7,41 @@ module Cisco
       if @platform
         { :platform => Beaker::Platform.new( @platform) }
       else
-        { :platform => Beaker::Platform.new( 'cisco-vers-arch-extra' ) }
+        { :platform => Beaker::Platform.new( 'cisco_nexus-vers-arch-extra' ) }
       end
     }
     let(:host)    { make_host( 'name', options.merge(platform) ) }
 
     describe '#prepend_commands' do
 
-      context 'for cisco-5' do
+      context 'for cisco_nexus-7' do
 
         before :each do
-          @platform = 'cisco-5-x86'
+          @platform = 'cisco_nexus-7-x86_64'
         end
 
         it 'ends with the :vrf host parameter' do
           vrf_answer = 'vrf_answer_135246'
-          @options = { :vrf => vrf_answer }
+          @options = {
+            :vrf  => vrf_answer,
+            :user => 'notroot',
+          }
           answer_test = host.prepend_commands( 'fake_command' )
           expect( answer_test ).to match( /#{vrf_answer}$/ )
         end
 
         it 'begins with sourcing the /etc/profile script' do
           answer_test = host.prepend_commands( 'fake_command' )
-          expect( answer_test ).to match( /^#{Regexp.escape('source /etc/profile; ')}/ )
+          expect( answer_test ).to match( 'source /etc/profile;' )
         end
 
         it 'uses sudo at the beginning of the actual command to execute' do
+          @options = {
+            :vrf  => 'fakevrf',
+            :user => 'notroot',
+          }
           answer_test = host.prepend_commands( 'fake_command' )
-          command_start_index = answer_test.index( '; ' ) + 2
+          command_start_index = answer_test.index( ';' ) + 1
           command_actual = answer_test[command_start_index, answer_test.length - command_start_index]
           expect( command_actual ).to match( /^sudo / )
         end
@@ -46,10 +53,10 @@ module Cisco
         end
       end
 
-      context 'for cisco-7' do
+      context 'for cisco_ios_xr-6' do
 
         before :each do
-          @platform = 'cisco-7-x86'
+          @platform = 'cisco_ios_xr-6-x86_64'
         end
 
         it 'begins with sourcing the /etc/profile script' do
@@ -62,8 +69,8 @@ module Cisco
           expect( answer_test ).not_to match( /sudo/ )
         end
 
-        it 'does not prepend with the :vrf host parameter' do
-          expect( host ).to receive( :[] ).with( :vrf ).never
+        it 'does prepend with the :vrf host parameter' do
+          expect( host ).to receive( :[] ).with( :vrf )
           host.prepend_commands( 'fake_command' )
         end
 
@@ -72,15 +79,15 @@ module Cisco
 
     describe '#environment_string' do
 
-      it 'starts with `env` for cisco-7' do
-        @platform = 'cisco-7-x86'
+      it 'starts with `env` for cisco_ios_xr-6' do
+        @platform = 'cisco_ios_xr-6-x86'
         env_map = { 'PATH' => '/opt/pants/1' }
         answer_test = host.environment_string( env_map )
         expect( answer_test ).to match( /^env\ / )
       end
 
-      it 'starts with `export` for cisco-5' do
-        @platform = 'cisco-5-x86'
+      it 'starts with `export` for cisco_nexus-7' do
+        @platform = 'cisco_nexus-7-x86_64'
         env_map = { 'PATH' => '/opt/pants/2' }
         answer_test = host.environment_string( env_map )
         expect( answer_test ).to match( /^export\ / )
@@ -93,7 +100,7 @@ module Cisco
       end
 
       it 'turns env maps into paired strings correctly' do
-        @platform = 'cisco-7-x86'
+        @platform = 'cisco_ios_xr-6-x86_64'
         env_map = { 'var1' => 'ans1', 'var2' => 'ans2' }
         answer_correct = 'env VAR1="ans1" VAR2="ans2";'
         answer_test = host.environment_string( env_map )
@@ -104,7 +111,7 @@ module Cisco
     describe '#package_config_dir' do
 
       it 'returns correctly for cisco platforms' do
-        @platform = 'cisco-5-x86_64'
+        @platform = 'cisco_nexus-7-x86_64'
         expect( host.package_config_dir ).to be === '/etc/yum/repos.d/'
       end
     end
@@ -112,16 +119,16 @@ module Cisco
     describe '#repo_type' do
 
       it 'returns correctly for cisco platforms' do
-        @platform = 'cisco-5-x86_64'
+        @platform = 'cisco_nexus-7-x86_64'
         expect( host.repo_type ).to be === 'rpm'
       end
     end
 
     describe '#validate_setup' do
 
-      context 'on the cisco-5 platform' do
+      context 'on the cisco_nexus-7 platform' do
         before :each do
-          @platform = 'cisco-5-x86'
+          @platform = 'cisco_nexus-7-x86_64'
         end
 
         it 'errors when no :vrf value is provided' do
@@ -130,10 +137,10 @@ module Cisco
           }.to raise_error( ArgumentError, /provided\ with\ a\ \:vrf\ value/ )
         end
 
-        it 'errors when no user is provided' do
+        it 'errors when no :user value is provided' do
           @options = {
             :vrf  => 'fake_vrf',
-            :user => 'root',
+            :user => nil,
           }
           expect {
             host.validate_setup
@@ -150,29 +157,34 @@ module Cisco
         end
       end
 
-      context 'on the cisco-7 platform' do
+      context 'on the cisco_ios_xr-6 platform' do
         before :each do
-          @platform = 'cisco-7-x86'
+          @platform = 'cisco_ios_xr-6-x86_64'
         end
 
-        it 'errors when no :vrf value is provided' do
-          expect {
-            host.validate_setup
-          }.to raise_error( ArgumentError, /provided\ with\ a\ \:vrf\ value/ )
+        it 'does nothing if no :vrf value is provided' do
+          @options = {
+              :user => 'notroot',
+          }
+          validate_test = host.validate_setup
+          expect( validate_test ).to be_nil
         end
 
-        it 'does not error when no user is provided' do
+        it 'errors when no user is provided' do
           @options = {
             :vrf  => 'fake_vrf',
-            :user => 'root',
+            :user => nil,
           }
           expect {
             host.validate_setup
-          }.not_to raise_error()
+          }.to raise_error( ArgumentError, /provided\ with\ a\ \:user\ value/ )
         end
 
         it 'does nothing if the host is setup correctly' do
-          @options = { :vrf  => 'fake_vrf' }
+          @options = {
+            :vrf  => 'fake_vrf',
+            :user => 'notroot',
+          }
           validate_test = host.validate_setup
           expect( validate_test ).to be_nil
         end

data/spec/beaker/host/unix/file_spec.rb

@@ -115,7 +115,7 @@ module Beaker
       end
 
       it 'adds wrlinux to variant on cisco platforms' do
-        @platform = 'cisco-5-x86_64'
+        @platform = 'cisco_nexus-7-x86_64'
         allow( instance ).to receive( :is_pe? ) { false }
         filename = instance.repo_filename( 'pkg_name', 'pkg_version12' )
         expect( filename ).to match( /sion12\-cisco\-wrlinux\-/ )

data/spec/beaker/host/unix_spec.rb

@@ -227,7 +227,7 @@ module Unix
 
     describe '#validate_setup' do
 
-      it 'does nothing for non cisco-5 platforms' do
+      it 'does nothing for non cisco_nexus-7 platforms' do
         @platform = 'el-7-x86_64'
         validate_test = host.validate_setup
         expect( validate_test ).to be_nil

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -413,7 +413,7 @@ describe Beaker do
     end
 
     it 'skips validation on cisco hosts' do
-      @platform = 'cisco-5-x86_64'
+      @platform = 'cisco_nexus-7-x86_64'
       expect( subject ).to receive( :check_and_install_packages_if_needed ).never
       subject.validate_host(hosts, options)
     end
@@ -588,7 +588,7 @@ describe Beaker do
 
     it 'skips a cisco host correctly' do
       host = make_host('name', {
-        :platform     => 'cisco-5-x86_64',
+        :platform     => 'cisco_nexus-7-x86_64',
         :ssh_env_file => 'ssh_env_file',
         :is_cygwin   => true,
       } )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.36.0
+  version: 2.37.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -535,6 +535,7 @@ files:
 - acceptance/tests/base/dsl/helpers/host_helpers/shell_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/upgrade_package_test.rb
 - acceptance/tests/base/dsl/install_utils/clone_git_repo_on_test.rb
+- acceptance/tests/base/dsl/platform_tag_confiner_test.rb
 - acceptance/tests/base/dsl/structure_test.rb
 - acceptance/tests/base/host_prebuilt_steps/ssh_environment_test.rb
 - acceptance/tests/base/host_test.rb
@@ -576,6 +577,7 @@ files:
 - docs/VMWare-Fusion-Support.md
 - docs/Vagrant-Support.md
 - docs/beaker-vs.-beaker-rspec.md
+- docs/dsl/platform_specific_tag_confines.md
 - docs/hosts/README.md
 - docs/hosts/cisco.md
 - docs/hosts/eos.md