packaging 0.109.1 → 0.109.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f9364e0c2f42bf8fde82f5cfd09a0d670c1f3b9ba9da6ef6f7449bbfcc1059
-  data.tar.gz: 865fe30ff9909ea5453149a4278561e2f954eee37feb95563c2b05877373f454
+  metadata.gz: d4b1debe2d5b8b3f8eba5525251ff49b861c3934c892ee2e0d022bb6b35fbecb
+  data.tar.gz: 4ccf51e8c80d24ff4ed5cba8422d06e8c33eb96dd5d136cad7e47f5863abfa99
 SHA512:
-  metadata.gz: 6d518ebe161341f6e69a71ddef76476c3ed205c1b4b7ca377d2ef93f1c37a347b7487f1de902ee468fb4d11c42d6c577e5909f9653f204af87ebdb61b63bb546
-  data.tar.gz: 34da211e5ea10b81fa179c1c2b5f3fbc66fc5ab10fbfa38934ee82a6edc8db43960e0363f05b03c7aa258b433304491f7d396d0c8f4d96296e9ffc0de376ef5e
+  metadata.gz: d95cf48ac1b357e1fdd25872db2b123fe7ca542508689e58beab6757b367acc1a323660dc182c99baefc4aea1858236c215c72f6113879a0eb923241d9e2d9a8
+  data.tar.gz: d976fe3c0f19f81fd261232716b121def43096ceecfb9393c005922e69d7bb7a06e1d6ff7ab7b4e9efdf2d0026cc1b0d4d0209f42a5243d5530f886ca7292d9b

data/lib/packaging/gem.rb

@@ -48,7 +48,7 @@ module Pkg::Gem
       gem_push_command = "gem push #{file}"
       gem_push_command << " --host #{options[:host]}" if options[:host]
       gem_push_command << " --key #{options[:key]}" if options[:key]
-      Pkg::Util::Execution.capture3(gem_push_command)
+      Pkg::Util::Execution.capture3(gem_push_command, true)
     rescue StandardError => e
       puts "###########################################"
       puts "#  Publishing to rubygems failed. Make sure your .gem/credentials"
@@ -56,7 +56,15 @@ module Pkg::Gem
       puts "###########################################"
       puts
       puts e
-      raise e
+      # There appears to be a race condition where the rubygems versions api will not
+      # be updated in time between builders attempting to push a gem. We want to avoid
+      # failing here due to gem already being pushed, so if we identify this error
+      # we can just log it and move on. NOTE: the gem push documentation does not
+      # appear to provide a distinct error code for this kind of error so we rely on
+      # string matching the stdout/stderr from the Pkg::Uti::execution method.
+      unless e.message.match(/Repushing of gem versions is not allowed/)
+        raise e
+      end
     end
 
     def ship_to_internal_mirror(file)

data/tasks/ship.rake

@@ -124,32 +124,41 @@ namespace :pl do
 
     desc "Update remote ips repository on #{Pkg::Config.ips_host}"
     task :update_ips_repo => 'pl:fetch' do
-      if Dir['pkg/ips/pkgs/**/*'].empty? && Dir['pkg/solaris/11/**/*'].empty?
-        $stdout.puts "Error: there aren't any p5p packages in pkg/ips/pkgs or pkg/solaris/11."
+      # This could be pkg/ips/pkgs/{i386,sparc} or pkg/solaris/11/{i386,sparc}
+      p5p_files = Dir.glob('pkg/**/*.p5p')
+      if p5p_files.empty?
+        puts "Error: there aren't any p5p packages in pkg/ips/pkgs or pkg/solaris/11."
         next
       end
 
-      source_dir = 'pkg/solaris/11/'
-      source_dir = 'pkg/ips/pkgs/' unless Dir['pkg/ips/pkgs/**/*'].empty?
-
-      tmpdir, = Pkg::Util::Net.remote_execute(
+      # This makes the historical assumption that all p5p files we want to ship exist in
+      # just one directory.
+      source_directory = File.dirname(p5p_files.first)
+      remote_working_directory = Pkg::Util::Net.remote_execute(
         Pkg::Config.ips_host,
-                'mktemp -d -p /var/tmp',
-                { capture_output: true }
-      )
-      tmpdir.chomp!
+        'mktemp -d -p /var/tmp',
+        { capture_output: true }
+      )[0].chomp
 
-      Pkg::Util::Net.rsync_to(source_dir, Pkg::Config.ips_host, tmpdir)
+      Pkg::Util::Net.rsync_to(
+        "#{source_directory}/",
+        Pkg::Config.ips_host, remote_working_directory
+      )
 
-      remote_cmd = %(for pkg in #{tmpdir}/*.p5p; do
-        sudo pkgrecv -s $pkg -d #{Pkg::Config.ips_path} '*';
+      pkgrecv_scriptlet = %(for p5p_file in #{remote_working_directory}/*.p5p; do
+        sudo pkgrecv -s $p5p_file -d #{Pkg::Config.ips_path} '*';
       done)
 
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, remote_cmd)
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host,
-        "sudo pkgrepo refresh -s #{Pkg::Config.ips_path}")
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host,
-        "sudo /usr/sbin/svcadm restart svc:/application/pkg/server:#{Pkg::Config.ips_repo || 'default'}")
+      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, pkgrecv_scriptlet)
+      Pkg::Util::Net.remote_execute(
+        Pkg::Config.ips_host,
+        "sudo pkgrepo refresh -s #{Pkg::Config.ips_path}"
+      )
+      ips_repository = Pkg::Config.ips_repo || 'default'
+      Pkg::Util::Net.remote_execute(
+        Pkg::Config.ips_host,
+        "sudo /usr/sbin/svcadm restart svc:/application/pkg/server:#{ips_repository}"
+      )
     end
 
     desc "Move dmg repos from #{Pkg::Config.dmg_staging_server} to #{Pkg::Config.dmg_host}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.109.1
+  version: 0.109.3
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -308,28 +308,28 @@ signing_key:
 specification_version: 4
 summary: Puppet by Perforce packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/gpg_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/misc_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging_spec.rb