packaging 0.99.66 → 0.99.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47aedaa86f3b67d8c5c0dac793bdc7ba76098d59a69a371d686ad040a82bcad7
-  data.tar.gz: 46903f549c65511da61bc15448809e2442d8569b9cc7c318b3a44c9d1389a4a8
+  metadata.gz: dc55afd9bcd5d03c49cd0ce6f89ae31a209356058fb3462bafc8c65fe49d4797
+  data.tar.gz: 502621e9b2c3596626e56e0a38855ced2b118bcf501dc8a87381fda4f1c06f76
 SHA512:
-  metadata.gz: 2a4f6a1f1135c242cb3561b609943a44715f9bbf45653f76548c2682819dbf14c1a1f1909380a70b7c5b054eebbd871c0572760c8d76e104fae19b9fedb330d5
-  data.tar.gz: 69bb9b00a3e3711911fc98a4b68d175f9e79553e4c100db4a02ab4e57be3a6ed71c00b0014b19ff5ef5c30c22796e22db73efff32f9775ddf05b9204c12c6885
+  metadata.gz: cb7d531d46d326390769e3c1f27210b3ae65907d9e48adae43248a13b850b5688e008f4d229267d0d936b8d80c6b0c8569b5823e41c55d60ed0145d4b47a9ec6
+  data.tar.gz: 5c9c2ee3f31fdfc657efb40e17ff9f5283707a883cc1c2bea3ec81dafed9da39a56ae58d6e791f657759ae419c96cfb726a1a30332dba174ab36a6087c50d4a7

data/lib/packaging/artifactory.rb

@@ -502,7 +502,7 @@ module Pkg
     # @param local_path [String] local path to download tarballs to
     def download_final_pe_tarballs(pe_version, repo, remote_path, local_path)
       check_authorization
-      artifacts = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo)
+      artifacts = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo, exact_match: false)
       artifacts.each do |artifact|
         next unless artifact.download_uri.include? remote_path
         next if artifact.download_uri.include? "-rc"

data/lib/packaging/paths.rb

@@ -315,7 +315,7 @@ module Pkg::Paths
 
   def debian_component_from_path(path)
     # substitute '.' and '/' since those aren't valid characters for debian components
-    matches = path.match(/([\d+\.\d+|master])\/(\w+)/)
+    matches = path.match(/(\d+\.\d+|master|main)\/(\w+)/)
     regex_for_substitution = /[\.\/]/
     fail "Error: Could not determine Debian Component from path #{path}" if matches.nil?
     base_component = matches[1]

data/lib/packaging/platforms.rb

@@ -100,7 +100,7 @@ module Pkg
           repo: true,
         },
         '8' => {
-          architectures: ['x86_64'],
+          architectures: ['x86_64', 'aarch64'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -134,6 +134,14 @@ module Pkg
           signature_format: 'v4',
           repo: true,
         },
+        '32' => {
+          architectures: ['x86_64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
       },
 
       'osx' => {

data/tasks/00_utils.rake

@@ -119,7 +119,10 @@ end
 # purport to both return the results of the command execution (ala `%x{cmd}`)
 # while also raising an exception if a command does not succeed (ala `sh "cmd"`).
 def ex(command)
-  Pkg::Util.deprecate("ex", "Pkg::Util::Execution.ex")
+  # We haven't done anything about this deprecation and our log files
+  # have too many warnings from this.
+  # Turn off the notice for now until packaging is refactored.
+  # Pkg::Util.deprecate("ex", "Pkg::Util::Execution.ex")
   Pkg::Util::Execution.ex(command)
 end
 

data/tasks/gem.rake

@@ -150,10 +150,20 @@ namespace :package do
     Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version
     package_gem
   end
+
+  # PA-3356: temporary task to ship puppet 7 nightly gem
+  # TODO: PA-3358 - remove when puppet 7 is officialy out
+  task :puppet_7_nightly_gem => ["clean"] do
+    Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
+    package_gem
+  end
 end
 
 # An alias task to simplify our remote logic in jenkins.rake
 namespace :pl do
   task :gem => "package:gem"
   task :nightly_gem => "package:nightly_gem"
+  # PA-3356: temporary task to ship puppet 7 nightly gem
+  # TODO: PA-3358 - remove when puppet 7 is officialy out
+  task :puppet_7_nightly_gem => "package:puppet_7_nightly_gem"
 end

data/tasks/ship.rake

@@ -265,6 +265,25 @@ namespace :pl do
 
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
     end
+
+    # PA-3356: temporary task to link puppet 7 nightly gem
+    # TODO: PA-3358 - remove when puppet 7 is officialy out
+    desc "Remotely link puppet 7 nightly shipped gems to latest versions on #{Pkg::Config.gem_host}"
+    task link_puppet_7_nightly_shipped_gems_to_latest: 'pl:fetch' do
+      Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
+
+      remote_path = Pkg::Config.nonfinal_gem_path
+      gems = FileList['pkg/*.gem'].map! { |path| path.gsub!('pkg/', '') }
+      command = %(cd #{remote_path}; )
+
+      command += gems.map! do |gem_name|
+        %(sudo ln -sf #{gem_name} #{gem_name.gsub(Pkg::Config.gemversion, 'latest')})
+      end.join(';')
+
+      command += %(; sync)
+
+      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
+    end
   end
 
   desc "Ship mocked rpms to #{Pkg::Config.yum_staging_server}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.66
+  version: 0.99.71
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 description: Packaging automation written in Rake and Ruby. Easily build native packages
   for most platforms with a few data files and git.
 email: info@puppetlabs.com
@@ -245,28 +259,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
+- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging_spec.rb