packaging 0.99.29 → 0.99.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f423cc0b3db951ead3f977e29ce01bb1ef130b86ce40de7b21c45f8c7cb7952
-  data.tar.gz: e15f8d7c8bb1f03dea062857bc5e8669e175b11d11855affa24e653fa45b87f1
+  metadata.gz: 7cfddfe342677b102df76026925a4f2d6c63d3ab462f11c663f370a66a54bcc0
+  data.tar.gz: 7b4b4bf61cd61f5b131ece5020bf6cb99ef6551118ddaeec5884036718c41078
 SHA512:
-  metadata.gz: 40aa070d4b58734c6b16be7ceac959b860560016f407dfb124349cb51e5afd6d6cbe1f506c3aaecbce345e029ca861527d2d419167235114083b9555ec466f0c
-  data.tar.gz: aa7e8edc975af46c0b08370e94e2335381bdba55cc281f908e207b6b80db1c60a79f6319c88782500b8a2e5b24865a6aa90362be4e9a3fb36f4167053cf15382
+  metadata.gz: 779471e6fc2b8b379ac5a1e30c8f0d4002406b2ef267c8ff3fdd7384a97d61e29a9616b77b03851fd65ece2c95007a079b933eeeb0465d89e82260ca4cfb959d
+  data.tar.gz: 83d313b8e9342138e946e0d652c3b88880a7f16c7d2eda18f54bfb3cd793102201cd787be0f39eb0981757dd79bd63707f41b6ce36733d831f80f511c526dc9d

data/lib/packaging/artifactory.rb

@@ -266,10 +266,12 @@ module Pkg
     # @param ref [String] tag or SHA of package(s) to be promoted
     # @param platform_tag [String] the platform tag of the artifact
     #   ex. el-7-x86_64, ubuntu-18.04-amd64
-    # @param repositories [Array(String)] the repositories to promote
+    # @param repository [String] the repository to promote
     #   the artifact to. Will prepend 'rpm_' or 'debian_' to the repositories
     #   depending on package type
-    def promote_package(pkg, ref, platform_tag, repositories)
+    # @param debian_component [String] the debian component to promote packages
+    #   into. Optional.
+    def promote_package(pkg, ref, platform_tag, repository, debian_component = nil)
       # load package metadata
       yaml_content = retrieve_yaml_data(pkg, ref)
       yaml_data = YAML::load(yaml_content)
@@ -286,17 +288,21 @@ module Pkg
         # This makes an assumption that we're using some consistent repo names
         # but need to either prepend 'rpm_' or 'debian_' based on package type
         if File.extname(artifact_name) == '.rpm'
-          promotion_paths = Array(repositories).compact.map { |repo| "rpm_#{repo}/#{platform_tag}/#{artifact_name}" }
+          promotion_path = "rpm_#{repository}/#{platform_tag}/#{artifact_name}"
         elsif File.extname(artifact_name) == '.deb'
-          promotion_paths = Array(repositories).compact.map { |repo| "debian_#{repo}/#{platform_tag}/#{artifact_name}" }
+          promotion_path = "debian_#{repository}/#{platform_tag}/#{artifact_name}"
+          properties = { 'deb.component' => debian_component } unless debian_component.nil?
         else
           raise "Error: Unknown promotion repository for #{artifact_name}! Only .rpm and .deb files are supported!"
         end
 
         begin
-          promotion_paths.each do |path|
-            puts "promoting #{artifact_name} to #{path}"
-            artifact_to_promote[0].copy(path)
+          puts "promoting #{artifact_name} to #{promotion_path}"
+          artifact_to_promote[0].copy(promotion_path)
+          unless properties.nil?
+            artifacts = Artifactory::Resource::Artifact.search(name: artifact_name, :artifactory_uri => @artifactory_uri)
+            promoted_artifact = artifacts.select { |artifact| artifact.download_uri =~ %r{#{promotion_path}} }.first
+            promoted_artifact.properties(properties)
           end
         rescue Artifactory::Error::HTTPError => e
           if e.message =~ /destination and source are the same/i

data/lib/packaging/util/ship.rb

@@ -140,7 +140,7 @@ module Pkg::Util::Ship
     if packages_have_shipped
       Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
         # Create the latest symlink for the current supported repo
-        Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(platform_tag, remote_path), 'dmg')
+        Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(platform_tag, remote_path, opts[:nonfinal]), 'dmg')
       end
     end
   end
@@ -157,8 +157,8 @@ module Pkg::Util::Ship
     create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, remote_path, opts[:nonfinal])
     if packages_have_shipped
       # Create the symlinks for the latest supported repo
-      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x64')
-      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x86')
+      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path, opts[:nonfinal]), 'msi', arch: 'x64')
+      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path, opts[:nonfinal]), 'msi', arch: 'x86')
     end
   end
 

data/spec/fixtures/config/ext/build_defaults.yaml

@@ -1 +1 @@
-../params.yaml
+spec/fixtures/config/ext/../params.yaml

data/spec/fixtures/config/ext/project_data.yaml

@@ -1 +1 @@
-../params.yaml
+spec/fixtures/config/ext/../params.yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.29
+  version: 0.99.30
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -223,7 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation