packaging 0.99.67 → 0.99.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f71d277a4d42c6208b4b70b97b481040ffd0714848f0a9a8fb6aee93d18819
-  data.tar.gz: 41bf51b6b07c7e981e56970b307b75e00eb71ccd96fd2d8ab1318c9d3658588a
+  metadata.gz: 382d8df54b4e231f8dbe4464c1b83767f000fce144e34833898eb296e4aa1a07
+  data.tar.gz: 698fd55d8612e46b15b829a6fef4d8722e2527a010120f3a8955ac1b3e1d7515
 SHA512:
-  metadata.gz: 361bf03ab4809b354b3b84976c2a8f43bd5aee4cd9eecd2b6840b1b8e8b67d48574aaa3f7af5c5ece0bde009439495fcadb3f277541b272afc77ac929e198749
-  data.tar.gz: 534fb7947567d7eb26aeaf04755a9c15e3626687a2cc386e41ea1b64e8734019f6380ac21d1670e168fb0c22e58c9afbe8a0a4fa6eeb8199c72f3f1d9b566e0c
+  metadata.gz: 16241153fc6f51335d0d5a7440c3b55a11575a33cc9123ac24a9a7812c53bcdfd4a7f7ea5301ecca53718ab48ba78534f1cc412102327cced1fd6d22057a310f
+  data.tar.gz: 4f64a0ce0c87758f156fca4776748ac81aef1eaf387508336bf47f859b76bdeedf6fdf5a4ba9b1966ff02a4668a30ca13d08d19b1e075221c67f7a9b3d1d4889

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/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.67
+  version: 0.99.68
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -259,28 +259,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging_spec.rb
 - spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/gem_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/rpm/repo_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/util/git_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/git_tag_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/retrieve_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/sign_spec.rb