packaging 0.99.42 → 0.99.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd24a8988e84d0bda7452b64162e7d6e884b92bd6d5f4ceccc83483f62383da2
-  data.tar.gz: fa19cd31ea261e6e3ff17762f17e869f6098c1a07714faafa582381225953c7f
+  metadata.gz: 8e86d7fe08b68d5d7dae0c81c719c82cfe1d4fab9eb766cd0a92e4c9bf2e6ad5
+  data.tar.gz: dcb6ecf3b11dec313a80239ba0d6e8b2e30cb2ad99c3ce1033e1cb37e82ef9cf
 SHA512:
-  metadata.gz: 8346344afaedd5e10b1d3eab98b0e3bc6a4b894ca90990f7f1dd6a595c373c8f7bd383d545a2441cacb5bb69dc03a9920818352e740c1085381fcebd6693b9ad
-  data.tar.gz: d0b4ae82cf80a0658df1165f2eeb7375b697a335618ff1cc312394d617e1422f47a5e7abf41edd60d0cdb66e2ccda33447c30a710de94c7bce332c6d5743d32a
+  metadata.gz: 362e996c395b9d1932711854489dec6075184f554b9f22465bda917e8b620d2a474a89d62c9abcb30c575042ea1ad500d0c06e78a001e4766efd0748add89f90
+  data.tar.gz: a74993a3a525c777649c4562c40a6c53b9b0f3f0c6f9b23412c0c4eed6ed8903f8be102ef0b5b3fa25df7c575e4392413b6efe8138e860113a05f5bb777f3b4a

data/lib/packaging/artifactory.rb

@@ -1,7 +1,69 @@
+require 'artifactory'
 require 'uri'
 require 'open-uri'
 require 'digest'
 
+#
+# [eric.griswold] This is unfortunate. The 'pattern_search' class method really does belong in
+# the Artifactory gem. However, because of some of Chef's social policies,
+# I am unwilling to contribute this code there. If that changes, I'll submit a PR. Until
+# then, it'll live here.
+#
+module Artifactory
+  class Resource::Artifact
+    #
+    # Search for an artifact in a repo using an Ant-like pattern.
+    # Unlike many Artifactory searches, this one is restricted to a single
+    # repository.
+    #
+    # @example Search in a repository named 'foo_local' for an artifact in a directory containing
+    #   the word "recent", named "artifact[0-9].txt"
+    #   Artifact.pattern_search(pattern: '*recent*/artifact[0-9].txt',
+    #                           repo: 'foo_local')
+    #
+    # @param [Hash] options
+    #   A hash of options, as follows:
+    #
+    # @option options [Artifactory::Client] :client
+    #   the client object to make the request with
+    # @option options [String] :pattern
+    #   the Ant-like pattern to use for finding artifacts within the repos. Note that the
+    #   Ant pattern '**' is barred in this case by JFrog.
+    # @option options [String] :repo
+    #   the repo to search
+    #
+    # @return [Array<Resource::Artifact>]
+    #   a list of artifacts that match the query
+    #
+    def self.pattern_search(options = {})
+      client = extract_client!(options)
+      params = Util.slice(options, :pattern, :repo)
+      pattern_search_parameter = { :pattern => "#{params[:repo]}:#{params[:pattern]}" }
+      response = client.get('/api/search/pattern', pattern_search_parameter)
+      return [] if response['files'].nil? || response['files'].empty?
+
+      # A typical response:
+      # {
+      #  "repoUri"=>"https:<artifactory endpoint>/<repo>",
+      #  "sourcePattern"=>"<repo>:<provided search pattern>",
+      #  "files"=>[<filename that matched pattern>, ...]
+      # }
+      #
+      # Inserting '/api/storage' before the repo makes the 'from_url' call work correctly.
+      #
+      repo_uri = response['repoUri']
+      unless repo_uri.include?('/api/storage/')
+        # rubocop:disable Style/PercentLiteralDelimiters
+        repo_uri.sub!(%r(/#{params[:repo]}$), "/api/storage/#{params[:repo]}")
+      end
+      response['files'].map do |file_path|
+        from_url("#{repo_uri}/#{file_path}", client: client)
+      end
+    end
+  end
+end
+
+
 module Pkg
 
   # The Artifactory class
@@ -10,6 +72,11 @@ module Pkg
   # artifacts to the repos, and to retrieve them back from the repos.
   class ManageArtifactory
 
+    # The Artifactory property that the artifactCleanup user plugin
+    # {https://github.com/jfrog/artifactory-user-plugins/tree/master/cleanup/artifactCleanup}
+    # uses to tell it to not clean a particular artifact
+    ARTIFACTORY_CLEANUP_SKIP_PROPERTY = 'cleanup.skip'
+
     DEFAULT_REPO_TYPE = 'generic'
     DEFAULT_REPO_BASE = 'development'
 
@@ -24,8 +91,6 @@ module Pkg
     # @option :repo_base [String] The base of all repos, set for consistency.
     #   This currently defaults to 'development'
     def initialize(project, project_version, opts = {})
-      require 'artifactory'
-
       @artifactory_uri = opts[:artifactory_uri] || 'https://artifactory.delivery.puppetlabs.net/artifactory'
       @repo_base = opts[:repo_base] || DEFAULT_REPO_BASE
 
@@ -297,17 +362,20 @@ module Pkg
       # get the artifact name
       artifact_names = all_package_names(yaml_data[:platform_data], platform_tag)
       artifact_names.each do |artifact_name|
-        artifact_to_promote = Artifactory::Resource::Artifact.search(name: artifact_name, :artifactory_uri => @artifactory_uri)
+        artifact_search_results = Artifactory::Resource::Artifact.search(
+          name: artifact_name, :artifactory_uri => @artifactory_uri)
 
-        if artifact_to_promote.empty?
+        if artifact_search_results.empty?
           raise "Error: could not find PKG=#{pkg} at REF=#{git_ref} for #{platform_tag}"
         end
+        artifact_to_promote = artifact_search_results[0]
 
         # This makes an assumption that we're using some consistent repo names
         # but need to either prepend 'rpm_' or 'debian_' based on package type
-        if File.extname(artifact_name) == '.rpm'
+        case File.extname(artifact_name)
+        when '.rpm'
           promotion_path = "rpm_#{repository}/#{platform_tag}/#{artifact_name}"
-        elsif File.extname(artifact_name) == '.deb'
+        when '.deb'
           promotion_path = "debian_#{repository}/#{platform_tag}/#{artifact_name}"
           properties = { 'deb.component' => debian_component } unless debian_component.nil?
         else
@@ -315,8 +383,9 @@ module Pkg
         end
 
         begin
-          puts "promoting #{artifact_name} to #{promotion_path}"
-          artifact_to_promote[0].copy(promotion_path)
+          source_path = artifact_to_promote.download_uri.sub(@artifactory_uri, '')
+          puts "promoting #{artifact_name} from #{source_path} to #{promotion_path}"
+          artifact_to_promote.copy(promotion_path)
           unless properties.nil?
             artifacts = Artifactory::Resource::Artifact.search(name: artifact_name, :artifactory_uri => @artifactory_uri)
             promoted_artifact = artifacts.select { |artifact| artifact.download_uri =~ %r{#{promotion_path}} }.first
@@ -356,37 +425,81 @@ module Pkg
     end
 
     # Ship PE tarballs to specified artifactory repo and paths
-    # @param tarball_path [String] the path of the tarballs to ship
+    # @param local_tarball_directory [String] the local directory containing the tarballs
     # @param target_repo [String] the artifactory repo to ship the tarballs to
-    # @param ship_paths [Array] the artifactory path(s) to ship the tarballs to within the target_repo
-    def ship_pe_tarballs(tarball_path, target_repo, ship_paths)
+    # @param ship_paths [Array] the artifactory path(s) to ship the tarballs to within
+    #   the target_repo
+    def ship_pe_tarballs(local_tarball_directory, target_repo, ship_paths)
       check_authorization
-      Dir.foreach("#{tarball_path}/") do |pe_tarball|
-        unless pe_tarball == '.' || pe_tarball == ".."
-          ship_paths.each do |path|
-            begin
-              puts "Uploading #{pe_tarball} to #{target_repo}/#{path}... "
-              artifact = Artifactory::Resource::Artifact.new(local_path: "#{tarball_path}/#{pe_tarball}")
-              artifact.upload(target_repo, "/#{path}/#{pe_tarball}")
-            rescue Errno::EPIPE
-              STDERR.puts "Error: Could not upload #{pe_tarball} to #{path}"
+      ship_paths.each do |path|
+        unset_cleanup_skip_on_artifacts(target_repo, path)
+        Dir.foreach(local_tarball_directory) do |pe_tarball|
+          next if pe_tarball == '.' || pe_tarball == ".."
+          begin
+            puts "Uploading #{pe_tarball} to #{target_repo}/#{path}#{pe_tarball}"
+            artifact = Artifactory::Resource::Artifact.new(
+              local_path: "#{local_tarball_directory}/#{pe_tarball}")
+            uploaded_artifact = artifact.upload(target_repo, "#{path}#{pe_tarball}")
+            # The Artifactory gem property setter only works when '/api/storage' is used in
+            # the 'uri' field.
+            # Strangely, the above Artifactory::Resource::Artifact.new gives us the raw URI.
+            # Therefore we are forced to do some path surgery, inserting
+            # '/api/storage' before "/#{target_repo}" to make the property setting work.
+            storage_artifact = uploaded_artifact
+            unless storage_artifact.uri.include?("/api/storage")
+              storage_artifact.uri = storage_artifact.uri.sub(
+                "/#{target_repo}",
+                "/api/storage/#{target_repo}")
             end
+            storage_artifact.properties(ARTIFACTORY_CLEANUP_SKIP_PROPERTY => true)
+          rescue Errno::EPIPE
+            ## [eric.griswold] maybe this should be fatal?
+            STDERR.puts "Warning: Could not upload #{pe_tarball} to #{target_repo}/#{path}. Skipping."
+            next
           end
         end
       end
     end
 
-    # Update LATEST file with latest PE build
-    # @param latest_file [String] name of latest file to ship
-    # @param target_repo [String] repo on artifactory to ship latest file to
-    # @param path [String] path on target_repo to latest file
-    def update_latest_file(latest_file, target_repo, path)
+    # Upload file to Artifactory
+    # @param local_path [String] local path to file to upload
+    # @param target_repo [String] repo on artifactory to upload to
+    # @param target_path [String] path within target_repo to upload to
+    def upload_file(local_path, target_repo, target_path)
+      fail "Error: Couldn't find file at #{local_path}." unless File.exist? local_path
       check_authorization
-      artifact = Artifactory::Resource::Artifact.new(local_path: latest_file)
+      artifact = Artifactory::Resource::Artifact.new(local_path: local_path)
+      full_upload_path = File.join(target_path, File.basename(local_path))
       begin
-        artifact.upload(target_repo, "/#{path}/#{latest_file}")
-      rescue Errno::ENOENT
-        STDERR.puts "Error: Could not upload #{latest_file} file. Are you sure it was created?"
+        puts "Uploading #{local_path} to #{target_repo}/#{full_upload_path} . . ."
+        artifact.upload(target_repo, full_upload_path)
+      rescue Artifactory::Error::HTTPError => e
+        fail "Error: Upload failed. Ensure path #{target_path} exists in the #{target_repo} repository."
+      end
+    end
+
+    # Clear the ARTIFACTORY_CLEANUP_SKIP_PROPERTY on all artifacts in
+    # a specified directory in a given Artifactory repo that match
+    # /<directory>/*.tar. Use this before uploading newer tarballs to maintain
+    # 'cleanup.skip' on the latest tarballs only.
+    #
+    # @param repo [String] Artifactory repository that contains the specified directory
+    # @param directory [String] Artifactory directory in repo containing the artifacts from which to
+    #   set the 'cleanup.skip' property setting to false
+    def unset_cleanup_skip_on_artifacts(repo, directory)
+      artifacts_with_cleanup_skip = Artifactory::Resource::Artifact.property_search(
+        ARTIFACTORY_CLEANUP_SKIP_PROPERTY => true,
+        "repos" => repo
+      )
+
+      # For the upcoming directory check, make sure we know where our trailing slashes are.
+      directory_no_trailing_slashes = directory.sub(/(\/)+$/, '')
+
+      # For all tarball artifacts in #{directory} that have the Artifactory property
+      # 'cleanup.skip' set to true, set it to 'false'
+      artifacts_with_cleanup_skip.each do |artifact|
+        next unless artifact.uri.include?("/#{directory_no_trailing_slashes}/")
+        artifact.properties(ARTIFACTORY_CLEANUP_SKIP_PROPERTY => false)
       end
     end
 
@@ -404,6 +517,87 @@ module Pkg
       end
     end
 
+    # Download final pe tarballs to local path based on name, repo, and path on artifactory
+    # @param pe_version [String] pe final tag
+    # @param repo [String] repo the tarballs live
+    # @param remote_path [String] path to tarballs in the repo
+    # @param local_path [String] local path to download tarballs to
+    def download_final_pe_tarballs(pe_version, repo, remote_path, local_path)
+      check_authorization
+      artifacts = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo)
+      artifacts.each do |artifact|
+        next unless artifact.download_uri.include? remote_path
+        next if artifact.download_uri.include? "-rc"
+        artifact.download(local_path)
+      end
+    end
+
+    # Download beta pe tarballs to local path based on tag, repo, and path on artifactory
+    # @param beta_tag [String] rc tag of beta release ex. 2019.2.0-rc10
+    # @param repo [String] repo the tarballs live
+    # @param remote_path [String] path to tarballs in the repo
+    # @param local_path [String] local path to download tarballs to
+    def download_beta_pe_tarballs(beta_tag, repo, remote_path, local_path)
+      check_authorization
+      pattern = "#{remote_path}/*-#{beta_tag}-*"
+      artifacts = Artifactory::Resource::Artifact.pattern_search(repo: repo, pattern: pattern)
+      artifacts.each do |artifact|
+        artifact.download(local_path)
+      end
+    end
+
+    # When we ship a new PE release we copy final tarballs to archives/releases
+    # @param pe_version [String] pe final tag
+    # @param repo [String] repo the tarballs live
+    # @param remote_path [String] path to tarballs in the repo
+    # @param target_path [String] path copy tarballs to, assumes same repo
+    def copy_final_pe_tarballs(pe_version, repo, remote_path, target_path)
+      check_authorization
+      final_tarballs = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo)
+      final_tarballs.each do |artifact|
+        next unless artifact.download_uri.include? remote_path
+        next if artifact.download_uri.include? "-rc"
+        artifact.copy("#{repo}/#{target_path}")
+      end
+    end
+
+    # When we cut a new PE branch, we need to copy the pe components into <pe_version>/{repos,feature,release}/<platform>
+    # @param manifest [File] JSON file containing information about what packages to download and the corresponding md5sums
+    # @param target_path [String] path on artifactory to copy components to, e.g. <pe_version>/release
+    def populate_pe_repos(manifest, target_path)
+      check_authorization
+      manifest.each do |dist, packages|
+        puts "Copying #{dist} packages..."
+        packages.each do |name, info|
+          artifact = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"]).first
+          if artifact.nil?
+            raise "Error: what the hell, could not find package #{info["filename"]} with md5sum #{info["md5"]}"
+          end
+          begin
+            artifact_target_path = "#{artifact.repo}/#{target_path}/#{dist}/#{info["filename"]}"
+            puts "Copying #{artifact.download_uri} to #{artifact_target_path}"
+            artifact.copy(artifact_target_path)
+          rescue Artifactory::Error::HTTPError
+            STDERR.puts "Could not copy #{artifact_target_path}. Source and destination are the same. Skipping..."
+          end
+        end
+      end
+    end
+
+    # Remove all artifacts in repo based on pattern, used when we purge all artifacts in release/ after PE release
+    # @param repos [Array] repos that we want to search for artifacts in
+    # @param pattern [String] pattern for artifacts that should be deleted ex. `2019.1/release/*/*`
+    def teardown_repo(repos, pattern)
+      check_authorization
+      repos.each do |repo|
+        artifacts = Artifactory::Resource::Artifact.pattern_search(repo: repo, pattern: pattern)
+        artifacts.each do |artifact|
+          puts "Deleting #{artifact.download_uri}"
+          artifact.delete
+        end
+      end
+    end
+
     # Remove shipped PE tarballs from artifactory
     # Used when compose fails, we only want the tarball shipped to artifactory if all platforms succeed
     # Identify which packages were created and shipped based on md5sum and remove them

data/lib/packaging/config.rb

@@ -99,7 +99,7 @@ module Pkg
             # beaker install the msi without having to know any version
             # information, but we should report the versioned artifact in
             # platform_data
-            next if platform == 'windows' && File.basename(artifact) == "#{self.project}-#{arch}.#{package_format}"
+            next if platform =~ /^windows.*$/ && File.basename(artifact) == "#{self.project}-#{arch}.#{package_format}"
 
             # Sometimes we have source or debug packages. We don't want to save
             # these paths in favor of the artifact paths.

data/lib/packaging/paths.rb

@@ -25,13 +25,15 @@ module Pkg::Paths
   # with the artifact and path
   def tag_from_artifact_path(path)
     platform = Pkg::Platforms.supported_platforms.find { |p| path =~ /(\/|\.)#{p}[^\.]/ }
+    platform = 'windowsfips' if path =~ /windowsfips/
+
     codename = Pkg::Platforms.codenames.find { |c| path =~ /\/#{c}/ }
 
     if codename
       platform, version = Pkg::Platforms.codename_to_platform_version(codename)
     end
 
-    version = '2012' if platform == 'windows'
+    version = '2012' if platform =~ /^windows.*$/
 
     version ||= Pkg::Platforms.versions_for_platform(platform).find { |v| path =~ /#{platform}(\/|-)?#{v}/ }
 
@@ -152,7 +154,7 @@ module Pkg::Paths
       if is_legacy_repo?(repo_name(nonfinal))
         [File.join(path_prefix, 'windows'), nil]
       else
-        [File.join(path_prefix, 'windows', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'windows', link_name(nonfinal))]
+        [File.join(path_prefix, platform, repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, platform, link_name(nonfinal))]
       end
     else
       raise "Not sure where to find packages with a package format of '#{package_format}'"
@@ -242,7 +244,7 @@ module Pkg::Paths
       if options[:legacy]
         File.join('repos', 'windows')
       else
-        File.join('repos', 'windows', repo_target)
+        File.join('repos', platform, repo_target)
       end
     else
       raise "Not sure what to do with a package format of '#{package_format}'"

data/lib/packaging/platforms.rb

@@ -340,6 +340,13 @@ module Pkg
           repo: false,
         }
       },
+      'windowsfips' => {
+        '2012' => {
+          architectures: ['x64'],
+          package_format: 'msi',
+          repo: false,
+        }
+      },
     }.freeze
 
     # @return [Array] An array of Strings, containing all of the supported

data/lib/packaging/sign/msi.rb

@@ -9,7 +9,7 @@ module Pkg::Sign::Msi
 
     work_dir = "Windows/Temp/#{Pkg::Util.rand_string}"
     Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p C:/#{work_dir}")
-    msis = Dir.glob("#{target_dir}/windows/**/*.msi")
+    msis = Dir.glob("#{target_dir}/windows*/**/*.msi")
     Pkg::Util::Net.rsync_to(msis.join(" "), rsync_host_string, "/cygdrive/c/#{work_dir}")
 
     # Please Note:

data/spec/lib/packaging/artifactory_spec.rb

@@ -26,6 +26,11 @@ describe 'artifactory.rb' do
         :repo_config => '',
         :additional_artifacts => ["./windows/puppet-agent-extras-5.3.1.34-x86.msi"],
       },
+      'windowsfips-2012-x64' => {
+        :artifact => "./windowsfips/puppet-agent-5.3.1.34-x64.msi",
+        :repo_config => '',
+        :additional_artifacts => ["./windowsfips/puppet-agent-extras-5.3.1.34-x64.msi"],
+      },
       'eos-4-i386' => {
         :artifact => "./eos/4/PC1/i386/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix",
         :repo_config => '',
@@ -65,6 +70,12 @@ describe 'artifactory.rb' do
       :package_name => 'path/to/a/windows/package/puppet-agent-5.3.1.34-x86.msi',
       :all_package_names => ['puppet-agent-5.3.1.34-x86.msi','puppet-agent-extras-5.3.1.34-x86.msi']
     },
+    'windowsfips-2012-x64' => {
+      :toplevel_repo => 'generic',
+      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/windowsfips-x64",
+      :package_name => 'path/to/a/windowsfips/package/puppet-agent-5.3.1.34-x64.msi',
+      :all_package_names => ['puppet-agent-5.3.1.34-x64.msi','puppet-agent-extras-5.3.1.34-x64.msi']
+    },
     'eos-4-i386' => {
       :toplevel_repo => 'generic',
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/eos-4-i386",

data/spec/lib/packaging/config_spec.rb

@@ -232,7 +232,9 @@ describe "Pkg::Config" do
       "./artifacts/windows/puppet-agent-x64.msi\n" \
       "./artifacts/windows/puppet-agent-5.3.2-x86.wixpdb\n" \
       "./artifacts/windows/puppet-agent-5.3.2-x86.msi\n" \
-      "./artifacts/windows/puppet-agent-5.3.2-x64.msi"
+      "./artifacts/windows/puppet-agent-5.3.2-x64.msi\n"\
+      "./artifacts/windowsfips/puppet-agent-x64.msi\n" \
+      "./artifacts/windowsfips/puppet-agent-5.3.2-x64.msi"
 
     solaris_artifacts = \
       "./artifacts/solaris/11/PC1/puppet-agent@5.3.2,5.11-1.sparc.p5p\n" \
@@ -297,6 +299,7 @@ describe "Pkg::Config" do
       data = Pkg::Config.platform_data
       expect(data['windows-2012-x86']).to include(:artifact => './windows/puppet-agent-5.3.2-x86.msi')
       expect(data['windows-2012-x64']).to include(:artifact => './windows/puppet-agent-5.3.2-x64.msi')
+      expect(data['windowsfips-2012-x64']).to include(:artifact => './windowsfips/puppet-agent-5.3.2-x64.msi')
     end
 
     it "should not collect debug packages" do

data/spec/lib/packaging/platforms_spec.rb

@@ -19,7 +19,7 @@ describe 'Pkg::Platforms' do
 
   describe '#supported_platforms' do
     it 'should return all supported platforms' do
-      platforms = ['aix', 'cisco-wrlinux', 'cumulus', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows']
+      platforms = ['aix', 'cisco-wrlinux', 'cumulus', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
       expect(Pkg::Platforms.supported_platforms).to match_array(platforms)
     end
   end
@@ -127,6 +127,7 @@ describe 'Pkg::Platforms' do
     test_cases = {
       'debian-9-amd64' => ['debian', '9', 'amd64'],
       'windows-2012-x86' => ['windows', '2012', 'x86'],
+      'windowsfips-2012-x64' => ['windowsfips', '2012', 'x64'],
       'el-7-x86_64' => ['el', '7', 'x86_64'],
       'cisco-wrlinux-7-x86_64' => ['cisco-wrlinux', '7', 'x86_64'],
       'cisco-wrlinux-7' => ['cisco-wrlinux', '7', ''],

data/spec/lib/packaging/util/ship_spec.rb

@@ -4,7 +4,9 @@ describe '#Pkg::Util::Ship' do
   describe '#collect_packages' do
     msi_pkgs = [
       'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
-      'pkg/windows/puppet5/puppet-agent-x86.msi'
+      'pkg/windows/puppet5/puppet-agent-x86.msi',
+      'pkg/windowsfips/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x64.msi',
+      'pkg/windowsfips/puppet5/puppet-agent-x64.msi'
     ]
     swix_pkgs = [
       'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
@@ -24,7 +26,13 @@ describe '#Pkg::Util::Ship' do
         expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi'])).not_to include('pkg/windows/puppet5/puppet-agent-x86.msi')
       end
       it 'correctly includes packages that do not match a passed excluded argument' do
-        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi'])).to include('pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi')
+        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi'])).to \
+          match_array(
+            [
+              'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
+              'pkg/windowsfips/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x64.msi',
+            ]
+          )
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.42
+  version: 0.99.43
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -229,28 +229,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
+- spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/config_spec.rb
 - spec/lib/packaging_spec.rb