packaging 0.99.10 → 0.99.10.2.gfa4c366

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0f788b32c3e05aac814dca9f9ace5194cfea0302be6d123c81a2c3d124d150f7
-  data.tar.gz: a0febe3e56e27da47fa79a9180e4285c7a1b714e15443036a26a71b25ffd0987
+SHA1:
+  metadata.gz: ed1069a6e2c970cfd58605a5ef95b379b33c0c14
+  data.tar.gz: 59829675f9962b14b61eaca8edcc948e61c3d02a
 SHA512:
-  metadata.gz: f86454f7a83fe56d9220efe15a261c500d46208c77e5129ac9c48ed9f3114c30fe717e6bb2406a7edf56314d25c27c05f278409dbbe02cf98872aff27ea60208
-  data.tar.gz: c18c7c85b88c495aa21b7e9fd9826d8183066aaf49937cad240c62e3bed70b4d970d039f5d0261cfd352238d171720d5615b0e3e60d579c7b86fa941b5b0eef6
+  metadata.gz: 68df7464f92bdebf150a86fad3d1caf14c1558d725a0c21d3ce82f3434eb0d89a471addb01d964c64ef00b6d8309460fbc35dcbbbe78a7d49526d8cb9c3bd1ba
+  data.tar.gz: 9a5f6ef023197d18ec1bfe1b5535bbe9807af7e2383ff8f25c13b242ab703d05bca016230b7ddf6cabb03ac2e57a42fbf111d52602afd13df098b22fe4bc0ce3

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 ;
-  bundle_prefix='bundle exec' ;
+else
+  echo "ERROR: Couldn't read Gemfile, can't bundle install."
+  exit 1
 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
-#     rake package:bootstrap
+#     bundle install --path .bundle/gems --bin .bundle/bin --retry 3
 #
 #     ### Perform the build
-#     rake pl:build_from_params PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
+#     bundle exec rake pl:build_from_params PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
 #
 #     ### Send the results
-#     rake pl:jenkins:ship["artifacts"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
+#     bundle exec 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
-#       rake pl:jenkins:post["$DOWNSTREAM_JOB"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
+#       bundle exec rake pl:jenkins:post["$DOWNSTREAM_JOB"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
 #     popd
 #   popd
 # fi

data/templates/packaging.xml.erb

@@ -37,7 +37,7 @@ pl:jenkins:uber_build NOTIFY=foo@puppetlabs.com
   Successful completion of packaging will result in the automatic creation of
   apt/yum repositories on the distribution server with the built packages.  To
   generate client apt/yum repository config files for accessing these packages,
-  check out the ref of the git sha that was packaged, and run `rake
+  check out the ref of the git sha that was packaged, and run `bundle exec rake
   pl:jenkins:(deb|rpm)_repo_configs`. Configuration files will be generated and
   deposited locally in pkg/repo_configs.
 </p>
@@ -146,13 +146,13 @@ pushd project
   pushd git_repo
 
     ### Clone the packaging repo
-    rake package:bootstrap
+    bundle install --path .bundle/gems --bin .bundle/bin --retry 3
 
     ### Perform the build
-    rake $command PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace
+    bundle exec rake $command PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace
 
     ### Send the results
-    rake pl:jenkins:ship["artifacts"] PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace
+    bundle exec rake pl:jenkins:ship["artifacts"] PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace
 
   popd
 popd</command>

data/templates/repo.xml.erb

@@ -71,16 +71,16 @@ if [ $PACKAGE_BUILD_RESULT -eq 0 ] ; then
     pushd git_repo
 
       ### Clone the packaging repo
-      rake package:bootstrap --trace
+      bundle install --path .bundle/gems --bin .bundle/bin --retry 3
 
       ### Run repo creation
 <% if Pkg::Config.final_mocks and not Pkg::Config.final_mocks.empty? %>
-      rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:rpm_repos --trace
+      bundle exec rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:rpm_repos --trace
 <% else %>
       echo "No mock/rpm targets found, skipping rpm repo creation"
 <% end %>
 <% if Pkg::Config.cows and not Pkg::Config.cows.empty? %>
-      rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:deb_repos --trace
+      bundle exec rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:deb_repos --trace
 <% else %>
       echo "No cow/deb targets found, skipping deb repo creation"
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.10
+  version: 0.99.10.2.gfa4c366
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -217,36 +217,36 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging_spec.rb