packaging 0.99.47 → 0.99.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 462c33ee387ad86103e9ac1edead54aa1a6c017328c92a3ccba336484f89458c
-  data.tar.gz: '09c84bce3ea8c21637fe60ad730d2e07604796721f1f5cb366dab0a16ae8eca2'
+  metadata.gz: c9b1ac8c003ac90a5214eed7c8ba0452b2d264b093a1e33918951821e77abc1c
+  data.tar.gz: dffd6a141ca0c206e56a3a5f9d92f3d5fd43db33df13955485afb5598d020575
 SHA512:
-  metadata.gz: 3f47f740aade3d02bea8a007f1b727271a203d47d298ff144b207cfad8ae58cba66c3d4ebc758bb695666d18208b5f18220b8e9886357a35e0f41257d7d1fdb2
-  data.tar.gz: 113d0f5b9227fe43cdfaf68986e0850c768268937f7969fd390370c257ea963ceffcb67d128d21673a6b9c69ec62f30b94bd4efd7a888aa113e467a2c10f5c54
+  metadata.gz: ad5e4b3b0f541647b482692c8bca84ab17772a9875c569793f9dd2ec0aeeac6912ec7cc93ac49d417defc3a8c4e863d0975e91aa9b968d33cfdacadcdeada80c
+  data.tar.gz: 7c4c851417fb6fec73fd833a6cd753f29847cc9a097d5a972fadae0482a76a5073e7073405307af2099db23ffb6458b6b7fd758015cb36c924f4aedc39371cfc

data/lib/packaging/artifactory.rb

@@ -432,28 +432,14 @@ module Pkg
     def ship_pe_tarballs(local_tarball_directory, target_repo, ship_paths)
       check_authorization
       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)
+            artifact.upload(target_repo, "#{path}#{pe_tarball}")
           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
@@ -478,29 +464,43 @@ module Pkg
       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.
+    # Start by clearing the ARTIFACTORY_CLEANUP_SKIP_PROPERTY on all artifacts in a
+    # single repo/directory location. This allows all artifacts in the directory to be cleaned.
+    # Once cleared, set ARTIFACTORY_CLEANUP_SKIP_PROPERTY on those matching pe_build_version,
+    # presumably the latest. This prevents those artifacts from being deleted.
     #
     # @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
+    # @param pe_build_version [String] Set 'cleanup.skip' property on artifacts that
+    #   contain this string in their file inside the directory.
+    def prevent_artifact_cleanup(repo, directory, pe_build_version)
+      # Clean up any trailing slashes on directory, just in case
+      directory.sub!(/(\/)+$/, '')
+
+      all_artifacts_pattern = "#{directory}/*"
+      latest_artifacts_pattern = "#{directory}/*#{pe_build_version}*"
+
+      all_artifacts = Artifactory::Resource::Artifact.pattern_search(
+        repo: repo,
+        pattern: all_artifacts_pattern
+      )
+      latest_artifacts = Artifactory::Resource::Artifact.pattern_search(
+        repo: repo,
+        pattern: latest_artifacts_pattern
       )
 
-      # 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}/")
+      # Clear cleanup.skip on all artifacts in directory
+      puts "Clearing #{ARTIFACTORY_CLEANUP_SKIP_PROPERTY} in #{repo}/#{all_artifacts_pattern}"
+      all_artifacts.each do |artifact|
         artifact.properties(ARTIFACTORY_CLEANUP_SKIP_PROPERTY => false)
       end
+
+      # Set cleanup.skip on all artifacts in directory matching *pe_build_version*
+      puts "Setting #{ARTIFACTORY_CLEANUP_SKIP_PROPERTY} in #{repo}/#{latest_artifacts_pattern}"
+      latest_artifacts.each do |artifact|
+        artifact.properties(ARTIFACTORY_CLEANUP_SKIP_PROPERTY => true)
+      end
     end
 
     # Download an artifact based on name, repo, and path to artifact
@@ -584,7 +584,7 @@ module Pkg
             copied_artifact_search = Artifactory::Resource::Artifact.pattern_search(repo: 'debian_enterprise__local', pattern: "#{target_path}/*/#{info["filename"]}")
             fail "Error: what the hell, could not find just-copied package #{info["filename"]} under debian_enterprise__local/#{target_path}" if copied_artifact_search.nil?
             copied_artifact = copied_artifact_search.first
-            properties = { 'deb.component' => Pkg::Paths.two_digit_pe_version_from_path(target_path) }
+            properties = { 'deb.component' => Pkg::Paths.debian_component_from_path(target_path) }
             copied_artifact.properties(properties)
           end
         end

data/lib/packaging/paths.rb

@@ -303,9 +303,10 @@ module Pkg::Paths
     end
   end
 
-  def two_digit_pe_version_from_path(path)
-    matches = path.match(/\d+\.\d+/)
-    fail "Error: Could not determine PE version from path #{path}" if matches.nil?
+  def debian_component_from_path(path)
+    matches = path.match(/(\d+\.\d+)\/(\w+)/)
+    fail "Error: Could not determine Debian Component from path #{path}" if matches.nil?
+    return matches[1] if matches[2] == 'repos'
     return matches[0]
   end
 end

data/tasks/ship.rake

@@ -322,14 +322,12 @@ namespace :pl do
 
   desc "Ship built gems to public Downloads server (#{Pkg::Config.gem_host})"
   task :ship_gem_to_downloads => 'pl:fetch' do
-    unless Pkg::Config.gem_host
+    if Pkg::Config.gem_host && Pkg::Config.gem_path
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Ship.ship_gem('pkg', Pkg::Config.gem_path, platform_independent: true)
+      end
+    else
       warn 'Value `Pkg::Config.gem_host` not defined; skipping shipping to public Download server'
-      exit
-    end
-    fail 'Value `Pkg::Config.gem_path` not defined; skipping shipping to public Download server' unless Pkg::Config.gem_path
-
-    Pkg::Util::Execution.retry_on_fail(times: 3) do
-      Pkg::Util::Ship.ship_gem('pkg', Pkg::Config.gem_path, platform_independent: true)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.47
+  version: 0.99.48
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -244,28 +244,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
+- spec/lib/packaging_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/gem_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/rpm/repo_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/config_spec.rb
+- spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/version_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/rake_utils_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/paths_spec.rb