packaging 0.99.76 → 0.99.77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/packaging/archive.rb +6 -6
- data/lib/packaging/config.rb +5 -1
- data/lib/packaging/deb/repo.rb +5 -5
- data/lib/packaging/platforms.rb +13 -34
- data/lib/packaging/repo.rb +9 -3
- data/lib/packaging/rpm/repo.rb +4 -4
- data/lib/packaging/sign/dmg.rb +3 -3
- data/lib/packaging/sign/ips.rb +8 -8
- data/lib/packaging/sign/msi.rb +7 -3
- data/lib/packaging/util/net.rb +53 -31
- data/lib/packaging/util/ship.rb +4 -4
- data/spec/lib/packaging/artifactory_spec.rb +11 -11
- data/spec/lib/packaging/config_spec.rb +13 -15
- data/spec/lib/packaging/deb/repo_spec.rb +3 -3
- data/spec/lib/packaging/paths_spec.rb +8 -2
- data/spec/lib/packaging/platforms_spec.rb +14 -14
- data/spec/lib/packaging/repo_spec.rb +1 -1
- data/spec/lib/packaging/retrieve_spec.rb +4 -3
- data/spec/lib/packaging/rpm/repo_spec.rb +3 -3
- data/spec/lib/packaging/sign_spec.rb +0 -2
- data/spec/lib/packaging/util/net_spec.rb +22 -9
- data/spec/lib/packaging/util/ship_spec.rb +2 -2
- data/tasks/archive.rake +3 -4
- data/tasks/education.rake +5 -5
- data/tasks/nightly_repos.rake +9 -9
- data/tasks/pe_ship.rake +11 -19
- data/tasks/ship.rake +25 -17
- data/tasks/sign.rake +3 -3
- metadata +17 -17
|
@@ -126,7 +126,7 @@ describe '#Pkg::Util::Ship' do
|
|
|
126
126
|
# All of these expects must be called in the same block in order for the
|
|
127
127
|
# tests to work without actually shipping anything
|
|
128
128
|
expect(Pkg::Util::Net)
|
|
129
|
-
.to receive(:
|
|
129
|
+
.to receive(:remote_execute)
|
|
130
130
|
.with(test_staging_server, /#{test_remote_path}/)
|
|
131
131
|
.exactly(retrieved_packages.count).times
|
|
132
132
|
expect(Pkg::Util::Net)
|
|
@@ -167,7 +167,7 @@ describe '#Pkg::Util::Ship' do
|
|
|
167
167
|
# All of these expects must be called in the same block in order for the
|
|
168
168
|
# tests to work without actually shipping anything
|
|
169
169
|
expect(Pkg::Util::Net)
|
|
170
|
-
.to receive(:
|
|
170
|
+
.to receive(:remote_execute)
|
|
171
171
|
.with(test_staging_server, /#{test_remote_path}/)
|
|
172
172
|
expect(Pkg::Util::Net)
|
|
173
173
|
.to receive(:rsync_to)
|
data/tasks/archive.rake
CHANGED
|
@@ -39,7 +39,7 @@ namespace :pl do
|
|
|
39
39
|
task :deploy_staged_apt_archives_to_s3 => 'pl:fetch' do
|
|
40
40
|
command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/apt'
|
|
41
41
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
42
|
-
Pkg::Util::Net.
|
|
42
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
|
|
43
43
|
end
|
|
44
44
|
end
|
|
45
45
|
|
|
@@ -47,7 +47,7 @@ namespace :pl do
|
|
|
47
47
|
task :deploy_staged_yum_archives_to_s3 => 'pl:fetch' do
|
|
48
48
|
command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/yum'
|
|
49
49
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
50
|
-
Pkg::Util::Net.
|
|
50
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
|
|
51
51
|
end
|
|
52
52
|
end
|
|
53
53
|
|
|
@@ -55,7 +55,7 @@ namespace :pl do
|
|
|
55
55
|
task :deploy_staged_downloads_archives_to_s3 => 'pl:fetch' do
|
|
56
56
|
command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/downloads'
|
|
57
57
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
58
|
-
Pkg::Util::Net.
|
|
58
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
|
|
59
59
|
end
|
|
60
60
|
end
|
|
61
61
|
|
|
@@ -67,4 +67,3 @@ namespace :pl do
|
|
|
67
67
|
end
|
|
68
68
|
end
|
|
69
69
|
end
|
|
70
|
-
|
data/tasks/education.rake
CHANGED
|
@@ -35,7 +35,7 @@ namespace :pl do
|
|
|
35
35
|
end
|
|
36
36
|
|
|
37
37
|
# If the archive directory exists, move old VMs to it
|
|
38
|
-
Pkg::Util::Net.
|
|
38
|
+
Pkg::Util::Net.remote_execute(target_host, "if [ -d #{target_directory}/archive ]; then #{archive_cmd}; fi")
|
|
39
39
|
|
|
40
40
|
# Ship VM and md5 to host
|
|
41
41
|
Pkg::Util::Net.rsync_to(vm, target_host, target_directory)
|
|
@@ -45,10 +45,10 @@ namespace :pl do
|
|
|
45
45
|
link_target.each do |link|
|
|
46
46
|
link_path = File.join(target_directory, link)
|
|
47
47
|
link_md5_path = "#{link_path}.md5"
|
|
48
|
-
Pkg::Util::Net.
|
|
49
|
-
Pkg::Util::Net.
|
|
50
|
-
Pkg::Util::Net.
|
|
51
|
-
Pkg::Util::Net.
|
|
48
|
+
Pkg::Util::Net.remote_execute(target_host, "if [[ -L '#{link_path}' ]] && [[ ! -e '#{link_path}' ]] ; then echo '#{link_path} is a broken link, deleting' ; unlink '#{link_path}' ; fi")
|
|
49
|
+
Pkg::Util::Net.remote_execute(target_host, "if [[ -L '#{link_md5_path}' ]] && [[ ! -e '#{link_md5_path}' ]] ; then echo '#{link_md5_path} is a broken link, deleting' ; unlink '#{link_md5_path}' ; fi")
|
|
50
|
+
Pkg::Util::Net.remote_execute(target_host, "cd #{target_directory} ; ln -sf #{File.basename(vm)} #{link}")
|
|
51
|
+
Pkg::Util::Net.remote_execute(target_host, "cd #{target_directory} ; ln -sf #{File.basename(md5)} #{link}.md5")
|
|
52
52
|
end
|
|
53
53
|
|
|
54
54
|
puts "'#{vm}' and '#{md5}' have been shipped via rsync to '#{target_host}/#{target_directory}'"
|
data/tasks/nightly_repos.rake
CHANGED
|
@@ -26,10 +26,10 @@ cd #{remote_repo} ;
|
|
|
26
26
|
#{Pkg::Util::Net.remote_bundle_install_command}
|
|
27
27
|
bundle exec rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}
|
|
28
28
|
DOC
|
|
29
|
-
Pkg::Util::Net.
|
|
29
|
+
Pkg::Util::Net.remote_execute(signing_server, rake_command)
|
|
30
30
|
Pkg::Util::Net.rsync_from("#{remote_repo}/repos/", signing_server, target)
|
|
31
|
-
Pkg::Util::Net.
|
|
32
|
-
Pkg::Util::Net.
|
|
31
|
+
Pkg::Util::Net.remote_execute(signing_server, "rm -rf #{remote_repo}")
|
|
32
|
+
Pkg::Util::Net.remote_execute(signing_server, "rm #{build_params}")
|
|
33
33
|
puts "Signed packages staged in '#{target}' directory"
|
|
34
34
|
end
|
|
35
35
|
|
|
@@ -48,7 +48,7 @@ DOC
|
|
|
48
48
|
target_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target_prefix}_repos"
|
|
49
49
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
50
50
|
# Ship the now signed repos to the distribution server
|
|
51
|
-
Pkg::Util::Net.
|
|
51
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{target_dir}")
|
|
52
52
|
Pkg::Util::Net.rsync_to("#{target_prefix}_repos/", Pkg::Config.distribution_server, target_dir)
|
|
53
53
|
end
|
|
54
54
|
end
|
|
@@ -244,11 +244,11 @@ DOC
|
|
|
244
244
|
local_pa_latest = "#{pa_source}-latest"
|
|
245
245
|
local_pe_latest = "#{pe_target}-latest"
|
|
246
246
|
|
|
247
|
-
Pkg::Util::Net.
|
|
248
|
-
Pkg::Util::Net.
|
|
249
|
-
Pkg::Util::Net.
|
|
250
|
-
Pkg::Util::Net.
|
|
251
|
-
Pkg::Util::Net.
|
|
247
|
+
Pkg::Util::Net.remote_execute(target_host, "mkdir -p '#{pe_target}'")
|
|
248
|
+
Pkg::Util::Net.remote_execute(target_host, "mkdir -p '#{local_pe_latest}'")
|
|
249
|
+
Pkg::Util::Net.remote_execute(target_host, "cp -r #{local_pa_latest}/* #{local_pe_latest}")
|
|
250
|
+
Pkg::Util::Net.remote_execute(target_host, "sed -i 's|/#{File.basename(local_pa_latest)}|/#{pe_version}/#{File.basename(local_pa_latest)}|' #{local_pe_latest}/repo_configs/*/*")
|
|
251
|
+
Pkg::Util::Net.remote_execute(target_host, "ln -sf '#{local_pa}' '#{local_pe}'")
|
|
252
252
|
end
|
|
253
253
|
|
|
254
254
|
task :nightly_repos => ["pl:fetch"] do
|
data/tasks/pe_ship.rake
CHANGED
|
@@ -65,7 +65,7 @@ if Pkg::Config.build_pe
|
|
|
65
65
|
puts "Shipping PE debs to apt repo 'incoming' dir on #{Pkg::Config.apt_host}"
|
|
66
66
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
67
67
|
Dir["pkg/pe/deb/#{dist}/*.deb"].each do |deb|
|
|
68
|
-
Pkg::Util::Net.
|
|
68
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.apt_host, "mkdir -p '#{target_path}/#{dist}'")
|
|
69
69
|
Pkg::Util::Net.rsync_to(deb, Pkg::Config.apt_host, "#{target_path}/#{dist}/#{File.basename(deb)}")
|
|
70
70
|
end
|
|
71
71
|
end
|
|
@@ -145,23 +145,11 @@ if Pkg::Config.build_pe
|
|
|
145
145
|
# single line. By breaking it into a series of concatenated strings, we can maintain
|
|
146
146
|
# a semblance of formatting and structure (nevermind readability).
|
|
147
147
|
command = %(for dir in #{repo_base_path}/{#{rpm_family_and_version.join(",")}}-*; do)
|
|
148
|
-
|
|
149
|
-
# For (RE-12463), make this less quiet than it has been.
|
|
150
|
-
# We're trying to find out why its aborting. Preserve the original
|
|
151
|
-
# so it can be restored.
|
|
152
|
-
command += %( sudo createrepo --checksum=sha --checkts --update --delta-workers=0 --database --update $dir; )
|
|
153
|
-
|
|
154
|
-
## Original
|
|
155
|
-
# command += %( sudo createrepo --checksum=sha --checkts --update --delta-workers=0 --quiet --database --update $dir; )
|
|
156
|
-
##
|
|
148
|
+
command += %( sudo createrepo --checksum=sha --checkts --update --delta-workers=0 --quiet --database --update $dir; )
|
|
157
149
|
command += %(done; )
|
|
158
150
|
command += %(sync)
|
|
159
151
|
|
|
160
|
-
|
|
161
|
-
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.yum_host, command, false, '', true, true)
|
|
162
|
-
|
|
163
|
-
## Original one below
|
|
164
|
-
# Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.yum_host, command)
|
|
152
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.yum_host, command)
|
|
165
153
|
end
|
|
166
154
|
|
|
167
155
|
desc "Remotely add shipped packages to apt repo on #{Pkg::Config.apt_host}"
|
|
@@ -183,7 +171,11 @@ if Pkg::Config.build_pe
|
|
|
183
171
|
aptly publish repo -gpg-key=\"8BBEB79B\" #{Pkg::Config::pe_version}-#{dist} #{Pkg::Config::pe_version}
|
|
184
172
|
fi
|
|
185
173
|
eos
|
|
186
|
-
stdout, stderr = Pkg::Util::Net.
|
|
174
|
+
stdout, stderr = Pkg::Util::Net.remote_execute(
|
|
175
|
+
Pkg::Config.apt_host,
|
|
176
|
+
cmd,
|
|
177
|
+
{ capture_output: true }
|
|
178
|
+
)
|
|
187
179
|
|
|
188
180
|
output = stdout.to_s + stderr.to_s
|
|
189
181
|
|
|
@@ -197,7 +189,7 @@ if Pkg::Config.build_pe
|
|
|
197
189
|
puts
|
|
198
190
|
|
|
199
191
|
puts "Cleaning up apt repo 'incoming' dir on #{Pkg::Config.apt_host}"
|
|
200
|
-
Pkg::Util::Net.
|
|
192
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.apt_host, "rm -r #{incoming_dir}")
|
|
201
193
|
|
|
202
194
|
end
|
|
203
195
|
|
|
@@ -213,7 +205,7 @@ if Pkg::Config.build_pe
|
|
|
213
205
|
command += %(done; )
|
|
214
206
|
command += %(sync)
|
|
215
207
|
|
|
216
|
-
Pkg::Util::Net.
|
|
208
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.yum_host, command)
|
|
217
209
|
end
|
|
218
210
|
|
|
219
211
|
desc "Remotely link shipped deb packages into feature repo on #{Pkg::Config.apt_host}"
|
|
@@ -227,7 +219,7 @@ if Pkg::Config.build_pe
|
|
|
227
219
|
command += %(done; )
|
|
228
220
|
command += %(sync)
|
|
229
221
|
|
|
230
|
-
Pkg::Util::Net.
|
|
222
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.apt_host, command)
|
|
231
223
|
end
|
|
232
224
|
end
|
|
233
225
|
end
|
data/tasks/ship.rake
CHANGED
|
@@ -83,7 +83,11 @@ namespace :pl do
|
|
|
83
83
|
source_dir = 'pkg/solaris/11/'
|
|
84
84
|
end
|
|
85
85
|
|
|
86
|
-
tmpdir, _ = Pkg::Util::Net.
|
|
86
|
+
tmpdir, _ = Pkg::Util::Net.remote_execute(
|
|
87
|
+
Pkg::Config.ips_host,
|
|
88
|
+
'mktemp -d -p /var/tmp',
|
|
89
|
+
{ capture_output: true }
|
|
90
|
+
)
|
|
87
91
|
tmpdir.chomp!
|
|
88
92
|
|
|
89
93
|
Pkg::Util::Net.rsync_to(source_dir, Pkg::Config.ips_host, tmpdir)
|
|
@@ -92,9 +96,9 @@ namespace :pl do
|
|
|
92
96
|
sudo pkgrecv -s $pkg -d #{Pkg::Config.ips_path} '*';
|
|
93
97
|
done)
|
|
94
98
|
|
|
95
|
-
Pkg::Util::Net.
|
|
96
|
-
Pkg::Util::Net.
|
|
97
|
-
Pkg::Util::Net.
|
|
99
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, remote_cmd)
|
|
100
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, "sudo pkgrepo refresh -s #{Pkg::Config.ips_path}")
|
|
101
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, "sudo /usr/sbin/svcadm restart svc:/application/pkg/server:#{Pkg::Config.ips_repo || 'default'}")
|
|
98
102
|
end
|
|
99
103
|
end
|
|
100
104
|
|
|
@@ -104,7 +108,7 @@ namespace :pl do
|
|
|
104
108
|
if Pkg::Util.ask_yes_or_no
|
|
105
109
|
Pkg::Util::Execution.retry_on_fail(times: 3) do
|
|
106
110
|
cmd = Pkg::Util::Net.rsync_cmd(Pkg::Config.dmg_path, target_host: Pkg::Config.dmg_host, extra_flags: ['--update'])
|
|
107
|
-
Pkg::Util::Net.
|
|
111
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.dmg_staging_server, cmd)
|
|
108
112
|
end
|
|
109
113
|
end
|
|
110
114
|
end
|
|
@@ -115,7 +119,7 @@ namespace :pl do
|
|
|
115
119
|
if Pkg::Util.ask_yes_or_no
|
|
116
120
|
Pkg::Util::Execution.retry_on_fail(times: 3) do
|
|
117
121
|
cmd = Pkg::Util::Net.rsync_cmd(Pkg::Config.swix_path, target_host: Pkg::Config.swix_host, extra_flags: ['--update'])
|
|
118
|
-
Pkg::Util::Net.
|
|
122
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.swix_staging_server, cmd)
|
|
119
123
|
end
|
|
120
124
|
end
|
|
121
125
|
end
|
|
@@ -130,7 +134,7 @@ namespace :pl do
|
|
|
130
134
|
else
|
|
131
135
|
Pkg::Util::Execution.retry_on_fail(times: 3) do
|
|
132
136
|
cmd = Pkg::Util::Net.rsync_cmd(Pkg::Config.tarball_path, target_host: Pkg::Config.tar_host, extra_flags: ['--update'])
|
|
133
|
-
Pkg::Util::Net.
|
|
137
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.tar_staging_server, cmd)
|
|
134
138
|
end
|
|
135
139
|
end
|
|
136
140
|
end
|
|
@@ -146,7 +150,7 @@ namespace :pl do
|
|
|
146
150
|
else
|
|
147
151
|
Pkg::Util::Execution.retry_on_fail(times: 3) do
|
|
148
152
|
cmd = Pkg::Util::Net.rsync_cmd(Pkg::Config.msi_path, target_host: Pkg::Config.msi_host, extra_flags: ['--update'])
|
|
149
|
-
Pkg::Util::Net.
|
|
153
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.msi_staging_server, cmd)
|
|
150
154
|
end
|
|
151
155
|
end
|
|
152
156
|
end
|
|
@@ -174,7 +178,7 @@ namespace :pl do
|
|
|
174
178
|
if Pkg::Util.ask_yes_or_no
|
|
175
179
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
176
180
|
command = 'sudo /usr/local/bin/s3_repo_sync.sh apt.puppetlabs.com'
|
|
177
|
-
Pkg::Util::Net.
|
|
181
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.apt_signing_server, command)
|
|
178
182
|
end
|
|
179
183
|
end
|
|
180
184
|
end
|
|
@@ -200,7 +204,7 @@ namespace :pl do
|
|
|
200
204
|
if Pkg::Util.ask_yes_or_no
|
|
201
205
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
202
206
|
command = 'sudo /usr/local/bin/s3_repo_sync.sh yum.puppetlabs.com'
|
|
203
|
-
Pkg::Util::Net.
|
|
207
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.yum_staging_server, command)
|
|
204
208
|
end
|
|
205
209
|
end
|
|
206
210
|
end
|
|
@@ -211,7 +215,7 @@ namespace :pl do
|
|
|
211
215
|
if Pkg::Util.ask_yes_or_no
|
|
212
216
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
213
217
|
command = 'sudo /usr/local/bin/s3_repo_sync.sh downloads.puppetlabs.com'
|
|
214
|
-
Pkg::Util::Net.
|
|
218
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
|
|
215
219
|
end
|
|
216
220
|
end
|
|
217
221
|
end
|
|
@@ -228,7 +232,7 @@ namespace :pl do
|
|
|
228
232
|
puts "Deploying nightly builds from #{Pkg::Config.staging_server} to AWS S3..."
|
|
229
233
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
|
230
234
|
command = 'sudo /usr/local/bin/s3_repo_sync.sh nightlies.puppet.com'
|
|
231
|
-
Pkg::Util::Net.
|
|
235
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
|
|
232
236
|
end
|
|
233
237
|
end
|
|
234
238
|
|
|
@@ -242,7 +246,7 @@ namespace :pl do
|
|
|
242
246
|
['apt', 'yum'].each do |repo|
|
|
243
247
|
# Don't --delete so that folks using archived packages can continue to do so
|
|
244
248
|
command = "sudo su - rsync --command 'rsync --verbose -a --exclude '*.html' /opt/repo-s3-stage/repositories/#{repo}.puppetlabs.com/ rsync@#{rsync_server}:/opt/repository/#{repo}'"
|
|
245
|
-
Pkg::Util::Net.
|
|
249
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
|
|
246
250
|
end
|
|
247
251
|
end
|
|
248
252
|
end
|
|
@@ -263,7 +267,7 @@ namespace :pl do
|
|
|
263
267
|
|
|
264
268
|
command += %(; sync)
|
|
265
269
|
|
|
266
|
-
Pkg::Util::Net.
|
|
270
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.gem_host, command)
|
|
267
271
|
end
|
|
268
272
|
end
|
|
269
273
|
|
|
@@ -499,7 +503,11 @@ namespace :pl do
|
|
|
499
503
|
# Check for ability to sign OSX. Should just need to be able to unlock keychain
|
|
500
504
|
begin
|
|
501
505
|
unless ssh_errs.include?(Pkg::Config.osx_signing_server)
|
|
502
|
-
Pkg::Util::Net.
|
|
506
|
+
Pkg::Util::Net.remote_execute(
|
|
507
|
+
Pkg::Config.osx_signing_server,
|
|
508
|
+
%(/usr/bin/security -q unlock-keychain -p "#{Pkg::Config.osx_signing_keychain_pw}" "#{Pkg::Config.osx_signing_keychain}"),
|
|
509
|
+
{ extra_options: '-oBatchMode=yes' }
|
|
510
|
+
)
|
|
503
511
|
end
|
|
504
512
|
rescue
|
|
505
513
|
errs << "Unlocking the OSX keychain failed! Check the password in your .bashrc on #{Pkg::Config.osx_signing_server}"
|
|
@@ -652,8 +660,8 @@ namespace :pl do
|
|
|
652
660
|
end
|
|
653
661
|
|
|
654
662
|
Pkg::Util::Execution.retry_on_fail(times: 3) do
|
|
655
|
-
Pkg::Util::Net.
|
|
656
|
-
Pkg::Util::Net.
|
|
663
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir --mode=775 -p #{project_basedir}")
|
|
664
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{artifact_dir}")
|
|
657
665
|
Pkg::Util::Net.rsync_to("#{local_dir}/", Pkg::Config.distribution_server, "#{artifact_dir}/", extra_flags: ['--ignore-existing', '--exclude repo_configs'])
|
|
658
666
|
end
|
|
659
667
|
|
data/tasks/sign.rake
CHANGED
|
@@ -144,10 +144,10 @@ cd #{remote_repo} ;
|
|
|
144
144
|
#{Pkg::Util::Net.remote_bundle_install_command}
|
|
145
145
|
bundle exec rake #{sign_tasks.map { |task| task + "[#{root_dir}]" }.join(" ")} PARAMS_FILE=#{build_params}
|
|
146
146
|
DOC
|
|
147
|
-
Pkg::Util::Net.
|
|
147
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, rake_command)
|
|
148
148
|
Pkg::Util::Net.rsync_from("#{remote_repo}/#{root_dir}/", Pkg::Config.signing_server, "#{root_dir}/")
|
|
149
|
-
Pkg::Util::Net.
|
|
150
|
-
Pkg::Util::Net.
|
|
149
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, "rm -rf #{remote_repo}")
|
|
150
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, "rm #{build_params}")
|
|
151
151
|
puts "Signed packages staged in #{root_dir}/ directory"
|
|
152
152
|
end
|
|
153
153
|
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.77
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet Labs
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-
|
|
11
|
+
date: 2021-06-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rspec
|
|
@@ -262,26 +262,26 @@ summary: Puppet Labs' packaging automation
|
|
|
262
262
|
test_files:
|
|
263
263
|
- spec/lib/packaging_spec.rb
|
|
264
264
|
- spec/lib/packaging/sign_spec.rb
|
|
265
|
-
- spec/lib/packaging/deb/repo_spec.rb
|
|
266
|
-
- spec/lib/packaging/retrieve_spec.rb
|
|
267
265
|
- spec/lib/packaging/paths_spec.rb
|
|
268
|
-
- spec/lib/packaging/
|
|
269
|
-
- spec/lib/packaging/
|
|
270
|
-
- spec/lib/packaging/gem_spec.rb
|
|
266
|
+
- spec/lib/packaging/artifactory_spec.rb
|
|
267
|
+
- spec/lib/packaging/tar_spec.rb
|
|
271
268
|
- spec/lib/packaging/deb_spec.rb
|
|
272
|
-
- spec/lib/packaging/
|
|
273
|
-
- spec/lib/packaging/
|
|
274
|
-
- spec/lib/packaging/
|
|
269
|
+
- spec/lib/packaging/retrieve_spec.rb
|
|
270
|
+
- spec/lib/packaging/deb/repo_spec.rb
|
|
271
|
+
- spec/lib/packaging/platforms_spec.rb
|
|
275
272
|
- spec/lib/packaging/util/execution_spec.rb
|
|
273
|
+
- spec/lib/packaging/util/jenkins_spec.rb
|
|
276
274
|
- spec/lib/packaging/util/gpg_spec.rb
|
|
275
|
+
- spec/lib/packaging/util/git_tag_spec.rb
|
|
276
|
+
- spec/lib/packaging/util/misc_spec.rb
|
|
277
277
|
- spec/lib/packaging/util/os_spec.rb
|
|
278
|
+
- spec/lib/packaging/util/rake_utils_spec.rb
|
|
279
|
+
- spec/lib/packaging/util/net_spec.rb
|
|
280
|
+
- spec/lib/packaging/util/file_spec.rb
|
|
278
281
|
- spec/lib/packaging/util/version_spec.rb
|
|
279
282
|
- spec/lib/packaging/util/git_spec.rb
|
|
280
|
-
- spec/lib/packaging/util/net_spec.rb
|
|
281
|
-
- spec/lib/packaging/util/rake_utils_spec.rb
|
|
282
|
-
- spec/lib/packaging/util/jenkins_spec.rb
|
|
283
|
-
- spec/lib/packaging/util/git_tag_spec.rb
|
|
284
283
|
- spec/lib/packaging/util/ship_spec.rb
|
|
285
|
-
- spec/lib/packaging/
|
|
286
|
-
- spec/lib/packaging/
|
|
287
|
-
- spec/lib/packaging/
|
|
284
|
+
- spec/lib/packaging/config_spec.rb
|
|
285
|
+
- spec/lib/packaging/rpm/repo_spec.rb
|
|
286
|
+
- spec/lib/packaging/repo_spec.rb
|
|
287
|
+
- spec/lib/packaging/gem_spec.rb
|