packaging 0.99.33 → 0.99.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2626e32396343044346cf9ddfd1d7fc46e0668ae
-  data.tar.gz: 113aa519ba508b8924bc361deae143501737a926
+SHA256:
+  metadata.gz: 200b6ff64fb3ed9617fc5919244b28f1622cf87cd003e44f7d649f2714081e68
+  data.tar.gz: 6b46f9018fa27af7523d9285aa642e1d45a0965e4f55a3995b473082db95a046
 SHA512:
-  metadata.gz: d8e4f9704e9fc5c1b17ed78e18f268fd460e0c2f1dd404a76a0fbd5e8c8bb6f3a343bc68c17f9761fac92fd7578c2870a8e828790d1df18559f4f0b3ab6e6eb8
-  data.tar.gz: 2db7e11e0a4df1305bfa941a12c6dda22602d48c66ef3031af5e972a4157c44e5fe5cbcb5bf8e687cb5a06741d35f508fd854db6fe1e581cc27cdd834ee5498c
+  metadata.gz: 9b5df43f966a200425454dba7f64b01f2682f380c8f44afb2f450b221b48f744dd6cb980bc9d80c1fe2bf8d408f765f759de3f26094263e3433a732b516a8d9b
+  data.tar.gz: 972f46a09a7b5d586a2d63a174af9d329b4ecb28b325ebfe8790da4a0b99afbef970590f796ebd3d37de20a55732e49ea61ecc2e2f7d093614193ce6dc4c6276

data/lib/packaging/artifactory.rb

@@ -305,10 +305,10 @@ module Pkg
             promoted_artifact.properties(properties)
           end
         rescue Artifactory::Error::HTTPError => e
-          if e.message =~ /destination and source are the same/i
+          if e.message =~ /(destination and source are the same|user doesn't have permissions to override)/i
             puts "Skipping promotion of #{artifact_name}; it has already been promoted"
           else
-            puts "#{e.level}: #{e.message}"
+            puts "#{e.message}"
             raise e
           end
         rescue => e

data/tasks/archive.rake

@@ -30,7 +30,30 @@ namespace :pl do
 
     desc "Sync archived packages to s3"
     task :deploy_staged_archives_to_s3 => 'pl:fetch' do
-      command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com'
+      Pkg::Util::RakeUtils.invoke_task('pl:remote:deploy_staged_apt_archives_to_s3')
+      Pkg::Util::RakeUtils.invoke_task('pl:remote:deploy_staged_yum_archives_to_s3')
+      Pkg::Util::RakeUtils.invoke_task('pl:remote:deploy_staged_downloads_archives_to_s3')
+    end
+
+    desc "Sync staged apt archive repos to s3"
+    task :deploy_staged_apt_archives_to_s3 => 'pl:fetch' do
+      command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/apt'
+      Pkg::Util::Execution.retry_on_fail(:times => 3) do
+        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+      end
+    end
+
+    desc "Sync staged yum archive repos to s3"
+    task :deploy_staged_yum_archives_to_s3 => 'pl:fetch' do
+      command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/yum'
+      Pkg::Util::Execution.retry_on_fail(:times => 3) do
+        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+      end
+    end
+
+    desc "Sync staged downloads archives to s3"
+    task :deploy_staged_downloads_archives_to_s3 => 'pl:fetch' do
+      command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/downloads'
       Pkg::Util::Execution.retry_on_fail(:times => 3) do
         Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
       end

data/tasks/ship.rake

@@ -240,7 +240,8 @@ namespace :pl do
         Pkg::Util::Execution.retry_on_fail(:times => 3) do
           Pkg::Config.rsync_servers.each do |rsync_server|
             ['apt', 'yum'].each do |repo|
-              command = "sudo su - rsync --command 'rsync --verbose -a --exclude '*.html' --delete /opt/repo-s3-stage/repositories/#{repo}.puppetlabs.com/ rsync@#{rsync_server}:/opt/repository/#{repo}'"
+              # Don't --delete so that folks using archived packages can continue to do so
+              command = "sudo su - rsync --command 'rsync --verbose -a --exclude '*.html' /opt/repo-s3-stage/repositories/#{repo}.puppetlabs.com/ rsync@#{rsync_server}:/opt/repository/#{repo}'"
               Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.33
+  version: 0.99.34
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation