packaging 0.114.0 → 0.116.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872132e3dcf2718b739c196a7c91f520592fb6888139d95ac69ff851de817d3c
-  data.tar.gz: fcc2351b89fb1c6bce455cb3ae93d8b3b372d3e70875eeda8d442e485d8332b5
+  metadata.gz: bb125c91f5926ab20605e4c9fb9ede2e46eb2494642ec25e37099327ad4a61f7
+  data.tar.gz: 89ab12e77f021ce246fbca1686b9f7218b059c660f557a56a1006623901cab10
 SHA512:
-  metadata.gz: 15fd7bc9ac1134f59a6c28c0e6ce1a151b56ab3f9e35b971d847b3eed1f9f9e80b1dbe35c0de03e2e2919d06b4e7a5dc03817db5783aa482aa7439a17b8ba449
-  data.tar.gz: 8edaf1970e42b5ed438b3c999b8f2fd57b9a6aae183e722cdb3670c6ec69bb3ae89a1a8cd2fd8bde4812be80441ed16d205f670337fa5ccd22a2010166f50117
+  metadata.gz: b938753dcaa851a1091496734b0b53a101b3b28f5d66fa7c2ded2f3ba23907d3c6ba2ab75b50f1c9a5f3c8f6b7f242c5235cd07e5fd651165c3791e63749fe97
+  data.tar.gz: 404cee80c9f4ab2f28d5cd311c8be29a929b42ba6c7c635d99853e77b6a4bf5df08712a0657369dd8587680ba40363d66d03cd672cd78a32ab4ae6bab31c5311

data/lib/packaging/platforms.rb

@@ -158,6 +158,14 @@ module Pkg
           source_package_formats: ['src.rpm'],
           signature_format: 'v3',
           repo: true,
+        },
+        '9' => {
+          architectures: ['x86_64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
         }
       },
 

data/lib/packaging/rpm/repo.rb

@@ -40,7 +40,25 @@ module Pkg::Rpm::Repo
       end
     end
 
+    ##
+    ## Let a wrapper script handle lock setting and pathing for the createrepo command
+    ##
     def repo_creation_command(repo_directory, artifact_paths = nil)
+      artifact_paths_argument = if artifact_paths
+                                  artifact_paths.join(' ')
+                                else
+                                  ''
+                                end
+      "/usr/local/bin/packaging-createrepo-wrapper #{repo_directory} #{artifact_paths_argument}"
+    end
+
+
+    ##
+    ## Deprecated
+    ## This was a slightly tortous way of going about this. Instead, see above.
+    ## Instead of constructing loop, let a wrapper script handle the details.
+    ##
+    def deprecated_repo_creation_command(repo_directory, artifact_paths = nil)
       cmd = "[ -d #{repo_directory} ] || exit 1 ; "
       cmd << "pushd #{repo_directory} > /dev/null && "
       cmd << 'echo "Checking for running repo creation. Will wait if detected." && '
@@ -131,14 +149,19 @@ module Pkg::Rpm::Repo
     end
 
     def retrieve_repo_configs(target = "repo_configs")
-      wget = Pkg::Util::Tool.check_tool("wget")
+      wget = Pkg::Util::Tool.check_tool('wget')
       FileUtils.mkdir_p("pkg/#{target}")
       config_url = "#{base_url}/#{target}/rpm/"
+
+      config_fetch_command = <<~CONFIG_FETCH_COMMAND.gsub(%r{\n}, ' ')
+        #{wget} --recursive --no-parent --no-host-directories --cut-dirs=3
+            "--directory-prefix=pkg/#{target} --reject='index' #{config_url}"
+      CONFIG_FETCH_COMMAND
+
       begin
-        stdout, = Pkg::Util::Execution.capture3("#{wget} -r -np -nH --cut-dirs 3 -P pkg/#{target} --reject 'index*' #{config_url}")
-        stdout
+        Pkg::Util::Execution.capture3(config_fetch_command)[0]
       rescue StandardError => e
-        fail "Couldn't retrieve rpm yum repo configs.\n#{e}"
+        fail "\"#{config_fetch_command} failed.\n#{e}"
       end
     end
 
@@ -152,27 +175,21 @@ module Pkg::Rpm::Repo
     def generate_repo_configs(source = "repos", target = "repo_configs", signed = false)
       # We have a hard requirement on wget because of all the download magicks
       # we have to do
-      #
       wget = Pkg::Util::Tool.check_tool("wget")
 
       # This is the standard path to all build artifacts on the distribution
       # server for this commit
-      #
       repo_base = "#{base_url}/#{source}/"
 
-      # First check if the artifacts directory exists
-      #
-
       # We have to do two checks here - first that there are directories with
       # repodata folders in them, and second that those same directories also
       # contain rpms
-      #
       stdout, = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 5 --no-parent #{repo_base} 2>&1")
-      stdout = stdout.split.uniq.reject { |x| x =~ /\?|index/ }.select { |x| x =~ /http:.*repodata\/$/ }
+      stdout = stdout.split.uniq.reject { |x| x =~ /\?|index/ }
+        .select { |x| x =~ /http:.*repodata\/$/ }
 
       # RPMs will always exist at the same directory level as the repodata
       # folder, which means if we go up a level we should find rpms
-      #
       yum_repos = []
       stdout.map { |x| x.chomp('repodata/') }.each do |url|
         output, = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 1 --no-parent #{url} 2>&1")

data/lib/packaging/util/net.rb

@@ -393,7 +393,8 @@ module Pkg::Util::Net
       rvm_ruby_version = ENV['RVM_RUBY_VERSION'] || '3.1.1'
       export_packaging_location = "export PACKAGING_LOCATION='#{ENV['PACKAGING_LOCATION']}';" if ENV['PACKAGING_LOCATION'] && !ENV['PACKAGING_LOCATION'].empty?
       export_vanagon_location = "export VANAGON_LOCATION='#{ENV['VANAGON_LOCATION']}';" if ENV['VANAGON_LOCATION'] && !ENV['VANAGON_LOCATION'].empty?
-      "source /usr/local/rvm/scripts/rvm; rvm use ruby-#{rvm_ruby_version}; #{export_packaging_location} #{export_vanagon_location} bundle install --path .bundle/gems ;"
+      export_gem_source = "export GEM_SOURCE='#{ENV['GEM_SOURCE']}';" if ENV['GEM_SOURCE'] && !ENV['GEM_SOURCE'].empty?
+      "source /usr/local/rvm/scripts/rvm; rvm use ruby-#{rvm_ruby_version}; #{export_gem_source} #{export_packaging_location} #{export_vanagon_location} bundle install --path .bundle/gems ;"
     end
 
     # Given a BuildInstance object and a host, send its params to the host. Return

data/spec/lib/packaging/rpm/repo_spec.rb

@@ -98,10 +98,10 @@ describe 'Pkg::Rpm::Repo' do
       expect(FileUtils).to receive(:mkdir_p).with('pkg/repo_configs').and_return(true)
       expect(Pkg::Util::Execution)
         .to receive(:capture3)
-        .with("#{wget} -r -np -nH --cut-dirs 3 -P pkg/repo_configs --reject 'index*' #{base_url}/repo_configs/rpm/")
+        .with(%r{#{wget}.*/repo_configs/rpm})
         .and_raise(RuntimeError)
       expect { Pkg::Rpm::Repo.retrieve_repo_configs }
-        .to raise_error(RuntimeError, /Couldn't retrieve rpm yum repo configs/)
+        .to raise_error(RuntimeError, %r{failed\.$})
     end
   end
 

metadata

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