packaging 0.99.10.2.gfa4c366 → 0.99.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed1069a6e2c970cfd58605a5ef95b379b33c0c14
-  data.tar.gz: 59829675f9962b14b61eaca8edcc948e61c3d02a
+  metadata.gz: 941dadd42783a3f36d63c1b9ad2670ab6f514e76
+  data.tar.gz: c4a2cb2b7c8fdad4be179201aeb797ff539fc462
 SHA512:
-  metadata.gz: 68df7464f92bdebf150a86fad3d1caf14c1558d725a0c21d3ce82f3434eb0d89a471addb01d964c64ef00b6d8309460fbc35dcbbbe78a7d49526d8cb9c3bd1ba
-  data.tar.gz: 9a5f6ef023197d18ec1bfe1b5535bbe9807af7e2383ff8f25c13b242ab703d05bca016230b7ddf6cabb03ac2e57a42fbf111d52602afd13df098b22fe4bc0ce3
+  metadata.gz: 64160466a199a96adbe2f2de438387abed2a34ef09e60f19cc15b8261b2291e390c8327886df908786302ff33d17856ae3201da1dee98038da1caa7d08107218
+  data.tar.gz: 00d31db799203d04adea27d03816592dc67e2399302f571343a3d886ffdbea1746525a609cb34865d1a7b274f0be6cc955dc5e2fbe7cfceef7656db5feed9c62

data/lib/packaging/platforms.rb

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

data/lib/packaging/util/net.rb

@@ -359,12 +359,12 @@ module Pkg::Util::Net
 #{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ;
 git clone --recursive /tmp/#{tarball_name} /tmp/#{Pkg::Config.project}-#{appendix} ;
 cd /tmp/#{Pkg::Config.project}-#{appendix} ;
+bundle_prefix= ;
 if [[ -r Gemfile ]]; then
   source /usr/local/rvm/scripts/rvm; rvm use ruby-2.4.1; bundle install --path .bundle/gems ;
-else
-  echo "ERROR: Couldn't read Gemfile, can't bundle install."
-  exit 1
+  bundle_prefix='bundle exec' ;
 fi ;
+$bundle_prefix rake package:bootstrap
 DOC
       Pkg::Util::Net.remote_ssh_cmd(host, command)
       "/tmp/#{Pkg::Config.project}-#{appendix}"

data/tasks/jenkins.rake

@@ -53,13 +53,13 @@
 #     pushd git_repo
 #
 #     ### Clone the packaging repo
-#     bundle install --path .bundle/gems --bin .bundle/bin --retry 3
+#     rake package:bootstrap
 #
 #     ### Perform the build
-#     bundle exec rake pl:build_from_params PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
+#     rake pl:build_from_params PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
 #
 #     ### Send the results
-#     bundle exec rake pl:jenkins:ship["artifacts"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
+#     rake pl:jenkins:ship["artifacts"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
 #
 #   popd
 # popd
@@ -75,7 +75,7 @@
 # if [ -n "$DOWNSTREAM_JOB" ] ; then
 #   pushd project
 #     pushd git_repo
-#       bundle exec rake pl:jenkins:post["$DOWNSTREAM_JOB"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
+#       rake pl:jenkins:post["$DOWNSTREAM_JOB"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
 #     popd
 #   popd
 # fi

data/templates/packaging.xml.erb

@@ -146,7 +146,7 @@ pushd project
   pushd git_repo
 
     ### Clone the packaging repo
-    bundle install --path .bundle/gems --bin .bundle/bin --retry 3
+    bundle install --path .bundle/gems --binstubs .bundle/bin --retry 3
 
     ### Perform the build
     bundle exec rake $command PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace

data/templates/repo.xml.erb

@@ -71,7 +71,7 @@ if [ $PACKAGE_BUILD_RESULT -eq 0 ] ; then
     pushd git_repo
 
       ### Clone the packaging repo
-      bundle install --path .bundle/gems --bin .bundle/bin --retry 3
+      bundle install --path .bundle/gems --binstubs .bundle/bin --retry 3
 
       ### Run repo creation
 <% if Pkg::Config.final_mocks and not Pkg::Config.final_mocks.empty? %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.10.2.gfa4c366
+  version: 0.99.11
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -217,9 +217,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14