packaging 0.99.9.5.g5811fb8 → 0.99.10.pre.dev1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/packaging/util/net.rb +3 -3
- data/tasks/jenkins.rake +4 -4
- data/templates/packaging.xml.erb +4 -4
- data/templates/repo.xml.erb +3 -3
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3fc5e773c698790a63e34a26aeaad0cfc6008abe
|
4
|
+
data.tar.gz: 0364bafc86d8fd15c0be9c808675c620589c6baa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4ac5f6695b6a809987739ad5adb6467c1af1044aa5f9e7341311077d752f08e1a26579bb64a996757f48e7318aa311af867364034e51824b6371d14003ee6250
|
7
|
+
data.tar.gz: 55349171a9927881a4a0b7dd2210c6904fa2173dcb094bdc516938db6abcb28cd4f36cbbf01a9dc7f4a34ae4fa22eaa3a1d2273e0f9a99921dab8e45f512eca4
|
data/lib/packaging/util/net.rb
CHANGED
@@ -359,12 +359,12 @@ module Pkg::Util::Net
|
|
359
359
|
#{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ;
|
360
360
|
git clone --recursive /tmp/#{tarball_name} /tmp/#{Pkg::Config.project}-#{appendix} ;
|
361
361
|
cd /tmp/#{Pkg::Config.project}-#{appendix} ;
|
362
|
-
bundle_prefix= ;
|
363
362
|
if [[ -r Gemfile ]]; then
|
364
363
|
source /usr/local/rvm/scripts/rvm; rvm use ruby-2.4.1; bundle install --path .bundle/gems ;
|
365
|
-
|
364
|
+
else
|
365
|
+
export GEM_HOME=.bundle
|
366
|
+
gem install packaging --version 0.99.10.pre.dev1
|
366
367
|
fi ;
|
367
|
-
$bundle_prefix rake package:bootstrap
|
368
368
|
DOC
|
369
369
|
Pkg::Util::Net.remote_ssh_cmd(host, command)
|
370
370
|
"/tmp/#{Pkg::Config.project}-#{appendix}"
|
data/tasks/jenkins.rake
CHANGED
@@ -53,13 +53,13 @@
|
|
53
53
|
# pushd git_repo
|
54
54
|
#
|
55
55
|
# ### Clone the packaging repo
|
56
|
-
#
|
56
|
+
# bundle install --path .bundle/gems --bin .bundle/bin --retry 3
|
57
57
|
#
|
58
58
|
# ### Perform the build
|
59
|
-
# rake pl:build_from_params PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
|
59
|
+
# bundle exec rake pl:build_from_params PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
|
60
60
|
#
|
61
61
|
# ### Send the results
|
62
|
-
# rake pl:jenkins:ship["artifacts"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
|
62
|
+
# bundle exec rake pl:jenkins:ship["artifacts"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
|
63
63
|
#
|
64
64
|
# popd
|
65
65
|
# popd
|
@@ -75,7 +75,7 @@
|
|
75
75
|
# if [ -n "$DOWNSTREAM_JOB" ] ; then
|
76
76
|
# pushd project
|
77
77
|
# pushd git_repo
|
78
|
-
# rake pl:jenkins:post["$DOWNSTREAM_JOB"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
|
78
|
+
# bundle exec rake pl:jenkins:post["$DOWNSTREAM_JOB"] PARAMS_FILE=$WORKSPACE/BUILD_PROPERTIES
|
79
79
|
# popd
|
80
80
|
# popd
|
81
81
|
# fi
|
data/templates/packaging.xml.erb
CHANGED
@@ -37,7 +37,7 @@ pl:jenkins:uber_build NOTIFY=foo@puppetlabs.com
|
|
37
37
|
Successful completion of packaging will result in the automatic creation of
|
38
38
|
apt/yum repositories on the distribution server with the built packages. To
|
39
39
|
generate client apt/yum repository config files for accessing these packages,
|
40
|
-
check out the ref of the git sha that was packaged, and run `rake
|
40
|
+
check out the ref of the git sha that was packaged, and run `bundle exec rake
|
41
41
|
pl:jenkins:(deb|rpm)_repo_configs`. Configuration files will be generated and
|
42
42
|
deposited locally in pkg/repo_configs.
|
43
43
|
</p>
|
@@ -146,13 +146,13 @@ pushd project
|
|
146
146
|
pushd git_repo
|
147
147
|
|
148
148
|
### Clone the packaging repo
|
149
|
-
|
149
|
+
bundle install --path .bundle/gems --bin .bundle/bin --retry 3
|
150
150
|
|
151
151
|
### Perform the build
|
152
|
-
rake $command PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace
|
152
|
+
bundle exec rake $command PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace
|
153
153
|
|
154
154
|
### Send the results
|
155
|
-
rake pl:jenkins:ship["artifacts"] PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace
|
155
|
+
bundle exec rake pl:jenkins:ship["artifacts"] PARAMS_FILE="$WORKSPACE/BUILD_PROPERTIES" --trace
|
156
156
|
|
157
157
|
popd
|
158
158
|
popd</command>
|
data/templates/repo.xml.erb
CHANGED
@@ -71,16 +71,16 @@ if [ $PACKAGE_BUILD_RESULT -eq 0 ] ; then
|
|
71
71
|
pushd git_repo
|
72
72
|
|
73
73
|
### Clone the packaging repo
|
74
|
-
|
74
|
+
bundle install --path .bundle/gems --bin .bundle/bin --retry 3
|
75
75
|
|
76
76
|
### Run repo creation
|
77
77
|
<% if Pkg::Config.final_mocks and not Pkg::Config.final_mocks.empty? %>
|
78
|
-
rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:rpm_repos --trace
|
78
|
+
bundle exec rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:rpm_repos --trace
|
79
79
|
<% else %>
|
80
80
|
echo "No mock/rpm targets found, skipping rpm repo creation"
|
81
81
|
<% end %>
|
82
82
|
<% if Pkg::Config.cows and not Pkg::Config.cows.empty? %>
|
83
|
-
rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:deb_repos --trace
|
83
|
+
bundle exec rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:deb_repos --trace
|
84
84
|
<% else %>
|
85
85
|
echo "No cow/deb targets found, skipping deb repo creation"
|
86
86
|
<% end %>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: packaging
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.99.
|
4
|
+
version: 0.99.10.pre.dev1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-08-
|
11
|
+
date: 2018-08-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|