packaging 0.112.0 → 0.113.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4edacd0d8bab96ae4a5ee44c23a120819524f0eb4faca14954f08e2f71a64ea
-  data.tar.gz: a608f83cb2eeabc40b366a792f5aea5ac9b05b3cece5db5939ee33e8fc725600
+  metadata.gz: 38a695c2a203545ed683903f02ae7fa8c5061c4cc2f9df51b51421527e479873
+  data.tar.gz: 9efef213c86d137b864401c7bc51d96c242c4bba6f8086652b727f325588ecd1
 SHA512:
-  metadata.gz: 322dd7199e20f7840d6cd42ad936944955ec6b1399b3f573fc9c60cea3aea390f5609b981931eea9c8437dfeb8ab4d855fbd7f33b9f3a989307a0947b90075c5
-  data.tar.gz: 91363da9e94bf818c67a3d4d073327f9c9878d7b20492e9bdc2cb3f95473b1023f7dc9f7758ab381fd08560b33a20b626361ac50f314882a53e5c5f459d8aaaa
+  metadata.gz: f1ecea7327e7f846700180f7f80a3f07baad08ae1b432261ba3b500438fd8232af5b676b6593905f6dc8117b4e6c84d7523fec06a915128297b1bb60b992d98e
+  data.tar.gz: b078ed636dbd2b8aa327c1a1784fa463d5c9aebf3ea5bc48c0fa9aafc015bfdee698d64544bbe7974b745219972224444f0413feb6cfcf59aadcd8f534216073

data/lib/packaging/artifactory.rb

@@ -362,7 +362,7 @@ module Pkg
           warn "Package list for #{dist} is empty, skipping"
           next
         end
-        packages.each do |name, info|
+        packages.each_value do |info|
           package_file_name = info['filename']
           puts format(
             "Searching Artifactory [%s]%s for %s (md5: %s)",
@@ -604,20 +604,27 @@ module Pkg
         properties = { 'deb.component' => target_debian_component }
         copied_artifact.properties(properties)
       end
-     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
+    # 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 which packages to download
+    #   and their corresponding md5sums
+    # @param target_path [String] path on artifactory to copy components to
+    #   Example: <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|
-          filename = info["filename"]
-          artifact = Artifactory::Resource::Artifact.checksum_search(md5: (info['md5']).to_s, repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename).first
+        packages.each_value do |info|
+          filename = info['filename']
+          artifact = Artifactory::Resource::Artifact.checksum_search(
+            md5: (info['md5']).to_s,
+            repos: ['rpm_enterprise__local', 'debian_enterprise__local'],
+            name: filename
+          ).first
           if artifact.nil?
-            raise "Error: what the hell, could not find package #{filename} with md5sum #{info['md5']}"
+            raise "Error: could not find package #{filename} with md5sum #{info['md5']}"
           end
           copy_artifact(artifact, artifact.repo, "#{target_path}/#{dist}/#{filename}")
         end
@@ -639,17 +646,22 @@ module Pkg
     end
 
     # Remove promoted artifacts if promotion is reverted, use information provided in manifest
-    # @param manifest [File] JSON file containing information about what packages to download and the corresponding md5sums
+    # @param manifest [File] JSON file containing information about what packages to
+    #   download and the corresponding md5sums
     # @param remote_path [String] path on artifactory to promoted packages ex. 2019.1/repos/
     # @param package [String] package name ex. puppet-agent
     # @param repos [Array] the repos the promoted artifacts live
     def remove_promoted_packages(manifest, remote_path, package, repos)
       check_authorization
-      manifest.each do |dist, packages|
+      manifest.each_value do |packages|
         packages.each do |package_name, info|
           next unless package_name == package
-          filename = info["filename"]
-          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: (info['md5']).to_s, repos: repos, name: filename)
+          filename = info['filename']
+          artifacts = Artifactory::Resource::Artifact.checksum_search(
+            md5: (info['md5']).to_s,
+            repos: repos,
+            name: filename
+          )
           artifacts.each do |artifact|
             next unless artifact.download_uri.include? remote_path
             puts "Removing reverted package #{artifact.download_uri}"

data/lib/packaging/platforms.rb

@@ -55,6 +55,14 @@ module Pkg
           source_package_formats: DEBIAN_SOURCE_FORMATS,
           repo: true,
         },
+        '12' => {
+          codename: 'bookworm',
+          architectures: ['amd64', 'aarch64'],
+          source_architecture: 'source',
+          package_format: 'deb',
+          source_package_formats: DEBIAN_SOURCE_FORMATS,
+          repo: true,
+        },
       },
 
       'el' => {
@@ -119,6 +127,11 @@ module Pkg
           package_format: 'dmg',
           repo: false,
         },
+        '14' => {
+          architectures: ['x86_64', 'arm64'],
+          package_format: 'dmg',
+          repo: false,
+        },
       },
 
       'redhatfips' => {

data/lib/packaging/sign/msi.rb

@@ -87,7 +87,7 @@ module Pkg::Sign::Msi
   end
 
   def delete_signed_msis(bucket, signed_msis)
-    signed_msis.each do |msi, temp_name|
+    signed_msis.each_value do |temp_name|
       signed_msi = bucket.file(temp_name)
       signed_msi.delete unless signed_msi.nil?
     end

data/spec/lib/packaging/platforms_spec.rb

@@ -36,7 +36,7 @@ describe 'Pkg::Platforms' do
 
   describe '#codenames' do
     it 'should return all codenames for a given platform' do
-      codenames = ['focal', 'bionic', 'bullseye', 'buster', 'jammy']
+      codenames = ['focal', 'bionic', 'bullseye', 'buster', 'bookworm', 'jammy']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end

data/tasks/30_metrics.rake

@@ -1,11 +1,11 @@
 @metrics = []
 def add_shipped_metrics(args)
   @metrics << {
-    :type         => 'shipped',
-    :package      => (args[:package]             || Pkg::Config.project),
-    :version      => (args[:version]             || Pkg::Config.version),
-    :pe_version   => (args[:pe_version]          || Pkg::Config.pe_version),
-    :is_rc        => (args[:is_rc]               || false),
+    :type => 'shipped',
+    :package => args[:package] || Pkg::Config.project,
+    :version => args[:version] || Pkg::Config.version,
+    :pe_version => args[:pe_version] || Pkg::Config.pe_version,
+    :is_rc => args[:is_rc] || false,
   }
 end
 

data/tasks/apple.rake

@@ -53,7 +53,7 @@ def make_directory_tree
   }
   puts "Cleaning Tree: #{project_tmp}"
   rm_rf(project_tmp)
-  @working_tree.each do |key, val|
+  @working_tree.each_value do |val|
     mkdir_p(val)
   end
 
@@ -162,7 +162,7 @@ def pack_source
   # Do a run through first setting the specified permissions then
   # making sure 755 is set for all directories
   unless @source_files['directories'].nil?
-    @source_files['directories'].each do |dir, params|
+    @source_files['directories'].each_value do |params|
       owner = params['owner']
       group = params['group']
       perms = params['perms']

data/tasks/jenkins.rake

@@ -512,13 +512,17 @@ namespace :pl do
   namespace :jenkins do
     desc "Trigger a jenkins uri with SHA of HEAD as a string param, requires \"URI\""
     task :post, :uri do |t, args|
-      uri = (args.uri or ENV['URI']) or fail "pl:jenkins:post requires a URI, either via URI= or pl:jenkin:post[URI]"
+      uri = args.uri || ENV['URI']
+
+      unless uri
+        fail 'pl:jenkins:post requires a URI, either via URI= or pl:jenkin:post[URI]'
+      end
 
       # We use JSON for parsing the json part of the submission.
       begin
         require 'json'
-      rescue LoadError
-        fail "Couldn't require 'json'. JSON is required for sanely generating the string we curl to Jenkins."
+      rescue LoadError => e
+        fail "Error: could not load 'json' gem: #{e}"
       end
 
       # Assemble the JSON string for the JSON parameter
@@ -526,17 +530,16 @@ namespace :pl do
 
       # Assemble our arguments to the post
       args = [
-      "-Fname=SHA", "-Fvalue=#{Pkg::Config.ref}",
-      "-Fjson=#{json.to_json}",
-      "-FSubmit=Build"
+        "-Fname=SHA", "-Fvalue=#{Pkg::Config.ref}",
+        "-Fjson=#{json.to_json}",
+        "-FSubmit=Build"
       ]
-
       _, retval = Pkg::Util::Net.curl_form_data(uri, args)
-      if Pkg::Util::Execution.success?(retval)
-        puts "Job triggered at #{uri}."
-      else
-        fail "An error occurred attempting to trigger the job at #{uri}. Please see the preceding http response for more info."
+      unless Pkg::Util::Execution.success?(retval)
+        fail "An error occurred attempting to trigger the job at \"#{uri}\". " \
+             "See the preceding http response for more information."
       end
+      puts "Job triggered at #{uri}."
     end
   end
 end

data/tasks/ship.rake

@@ -8,7 +8,7 @@ namespace :pl do
 
     desc "Update '#{Pkg::Config.repo_name}' yum repository on '#{Pkg::Config.yum_staging_server}'"
     task update_yum_repo: 'pl:fetch' do
-      command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository/Rakefile mk_repo'
+      command = Pkg::Config.yum_repo_command
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
       next unless Pkg::Util.ask_yes_or_no
 
@@ -25,7 +25,7 @@ namespace :pl do
 
     desc "Update all final yum repositories on '#{Pkg::Config.yum_staging_server}'"
     task update_all_final_yum_repos: 'pl:fetch' do
-      command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository/Rakefile mk_repo'
+      command = Pkg::Config.yum_repo_command
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
       next unless Pkg::Util.ask_yes_or_no
 
@@ -42,7 +42,7 @@ namespace :pl do
 
     desc "Update '#{Pkg::Config.nonfinal_repo_name}' nightly yum repository on '#{Pkg::Config.yum_staging_server}'"
     task update_nightlies_yum_repo: 'pl:fetch' do
-      command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository-nightlies/Rakefile mk_repo'
+      command = Pkg::Config.yum_repo_command
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
       next unless Pkg::Util.ask_yes_or_no
 
@@ -59,7 +59,7 @@ namespace :pl do
 
     desc "Update all nightly yum repositories on '#{Pkg::Config.yum_staging_server}'"
     task update_all_nightlies_yum_repos: 'pl:fetch' do
-      command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository-nightlies/Rakefile mk_repo'
+      command = Pkg::Config.yum_repo_command
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
       next unless Pkg::Util.ask_yes_or_no
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.112.0
+  version: 0.113.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -308,27 +308,27 @@ specification_version: 4
 summary: Puppet by Perforce packaging automation
 test_files:
 - spec/lib/packaging_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/repo_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/git_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb