packaging 0.99.73 → 0.99.78
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/packaging/archive.rb +6 -6
- data/lib/packaging/config.rb +31 -1
- data/lib/packaging/config/params.rb +11 -0
- data/lib/packaging/config/validations.rb +13 -0
- data/lib/packaging/deb/repo.rb +5 -5
- data/lib/packaging/paths.rb +15 -3
- data/lib/packaging/platforms.rb +23 -36
- data/lib/packaging/repo.rb +9 -3
- data/lib/packaging/rpm/repo.rb +4 -4
- data/lib/packaging/sign/dmg.rb +61 -31
- data/lib/packaging/sign/ips.rb +8 -8
- data/lib/packaging/sign/msi.rb +9 -6
- data/lib/packaging/util/net.rb +54 -32
- 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 +10 -2
- data/spec/lib/packaging/platforms_spec.rb +15 -15
- 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/git_tag_spec.rb +1 -1
- 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/config.rake +5 -0
- data/tasks/education.rake +5 -5
- data/tasks/fetch.rake +17 -14
- data/tasks/gem.rake +0 -10
- data/tasks/nightly_repos.rake +9 -9
- data/tasks/pe_ship.rake +11 -19
- data/tasks/ship.rake +35 -45
- data/tasks/sign.rake +3 -3
- metadata +21 -20
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,26 +267,7 @@ namespace :pl do
|
|
263
267
|
|
264
268
|
command += %(; sync)
|
265
269
|
|
266
|
-
Pkg::Util::Net.
|
267
|
-
end
|
268
|
-
|
269
|
-
# PA-3356: temporary task to link puppet 7 nightly gem
|
270
|
-
# TODO: PA-3358 - remove when puppet 7 is officialy out
|
271
|
-
desc "Remotely link puppet 7 nightly shipped gems to latest versions on #{Pkg::Config.gem_host}"
|
272
|
-
task link_puppet_7_nightly_shipped_gems_to_latest: 'pl:fetch' do
|
273
|
-
Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
|
274
|
-
|
275
|
-
remote_path = Pkg::Config.nonfinal_gem_path
|
276
|
-
gems = FileList['pkg/*.gem'].map! { |path| path.gsub!('pkg/', '') }
|
277
|
-
command = %(cd #{remote_path}; )
|
278
|
-
|
279
|
-
command += gems.map! do |gem_name|
|
280
|
-
%(sudo ln -sf #{gem_name} #{gem_name.gsub(Pkg::Config.gemversion, 'latest')})
|
281
|
-
end.join(';')
|
282
|
-
|
283
|
-
command += %(; sync)
|
284
|
-
|
285
|
-
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
|
270
|
+
Pkg::Util::Net.remote_execute(Pkg::Config.gem_host, command)
|
286
271
|
end
|
287
272
|
end
|
288
273
|
|
@@ -463,6 +448,16 @@ namespace :pl do
|
|
463
448
|
end
|
464
449
|
end
|
465
450
|
|
451
|
+
desc 'Create the rolling repo links'
|
452
|
+
task create_repo_links: 'pl:fetch' do
|
453
|
+
Pkg::Util::Ship.create_rolling_repo_links
|
454
|
+
end
|
455
|
+
|
456
|
+
desc 'Create rolling repo links for nightlies'
|
457
|
+
task create_nightly_repo_links: 'pl:fetch' do
|
458
|
+
Pkg::Util::Ship.create_rolling_repo_links(true)
|
459
|
+
end
|
460
|
+
|
466
461
|
desc 'Test out the ship requirements'
|
467
462
|
task ship_check: 'pl:fetch' do
|
468
463
|
errs = []
|
@@ -508,7 +503,11 @@ namespace :pl do
|
|
508
503
|
# Check for ability to sign OSX. Should just need to be able to unlock keychain
|
509
504
|
begin
|
510
505
|
unless ssh_errs.include?(Pkg::Config.osx_signing_server)
|
511
|
-
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
|
+
)
|
512
511
|
end
|
513
512
|
rescue
|
514
513
|
errs << "Unlocking the OSX keychain failed! Check the password in your .bashrc on #{Pkg::Config.osx_signing_server}"
|
@@ -536,15 +535,6 @@ namespace :pl do
|
|
536
535
|
end
|
537
536
|
end
|
538
537
|
|
539
|
-
desc 'Create the rolling repo links'
|
540
|
-
task create_repo_links: 'pl:fetch' do
|
541
|
-
Pkg::Util::Ship.create_rolling_repo_links
|
542
|
-
end
|
543
|
-
|
544
|
-
desc 'Create rolling repo links for nightlies'
|
545
|
-
task create_nightly_repo_links: 'pl:fetch' do
|
546
|
-
Pkg::Util::Ship.create_rolling_repo_links(true)
|
547
|
-
end
|
548
538
|
end
|
549
539
|
|
550
540
|
# It is odd to namespace this ship task under :jenkins, but this task is
|
@@ -670,8 +660,8 @@ namespace :pl do
|
|
670
660
|
end
|
671
661
|
|
672
662
|
Pkg::Util::Execution.retry_on_fail(times: 3) do
|
673
|
-
Pkg::Util::Net.
|
674
|
-
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}")
|
675
665
|
Pkg::Util::Net.rsync_to("#{local_dir}/", Pkg::Config.distribution_server, "#{artifact_dir}/", extra_flags: ['--ignore-existing', '--exclude repo_configs'])
|
676
666
|
end
|
677
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.78
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-06-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -124,6 +124,7 @@ files:
|
|
124
124
|
- lib/packaging/artifactory/extensions.rb
|
125
125
|
- lib/packaging/config.rb
|
126
126
|
- lib/packaging/config/params.rb
|
127
|
+
- lib/packaging/config/validations.rb
|
127
128
|
- lib/packaging/deb.rb
|
128
129
|
- lib/packaging/deb/repo.rb
|
129
130
|
- lib/packaging/gem.rb
|
@@ -259,28 +260,28 @@ signing_key:
|
|
259
260
|
specification_version: 4
|
260
261
|
summary: Puppet Labs' packaging automation
|
261
262
|
test_files:
|
262
|
-
- spec/lib/
|
263
|
-
- spec/lib/packaging/
|
264
|
-
- spec/lib/packaging/
|
263
|
+
- spec/lib/packaging/sign_spec.rb
|
264
|
+
- spec/lib/packaging/rpm/repo_spec.rb
|
265
|
+
- spec/lib/packaging/retrieve_spec.rb
|
266
|
+
- spec/lib/packaging/deb/repo_spec.rb
|
267
|
+
- spec/lib/packaging/tar_spec.rb
|
265
268
|
- spec/lib/packaging/util/jenkins_spec.rb
|
266
269
|
- spec/lib/packaging/util/gpg_spec.rb
|
267
|
-
- spec/lib/packaging/util/git_tag_spec.rb
|
268
|
-
- spec/lib/packaging/util/git_spec.rb
|
269
|
-
- spec/lib/packaging/util/misc_spec.rb
|
270
270
|
- spec/lib/packaging/util/rake_utils_spec.rb
|
271
|
-
- spec/lib/packaging/util/
|
272
|
-
- spec/lib/packaging/util/net_spec.rb
|
271
|
+
- spec/lib/packaging/util/misc_spec.rb
|
273
272
|
- spec/lib/packaging/util/file_spec.rb
|
274
|
-
- spec/lib/packaging/util/os_spec.rb
|
275
273
|
- spec/lib/packaging/util/version_spec.rb
|
276
|
-
- spec/lib/packaging/
|
277
|
-
- spec/lib/packaging/
|
278
|
-
- spec/lib/packaging/
|
279
|
-
- spec/lib/packaging/
|
280
|
-
- spec/lib/packaging/
|
281
|
-
- spec/lib/packaging/
|
274
|
+
- spec/lib/packaging/util/os_spec.rb
|
275
|
+
- spec/lib/packaging/util/git_spec.rb
|
276
|
+
- spec/lib/packaging/util/net_spec.rb
|
277
|
+
- spec/lib/packaging/util/ship_spec.rb
|
278
|
+
- spec/lib/packaging/util/execution_spec.rb
|
279
|
+
- spec/lib/packaging/util/git_tag_spec.rb
|
282
280
|
- spec/lib/packaging/gem_spec.rb
|
283
|
-
- spec/lib/packaging/deb/repo_spec.rb
|
284
|
-
- spec/lib/packaging/repo_spec.rb
|
285
|
-
- spec/lib/packaging/sign_spec.rb
|
286
281
|
- spec/lib/packaging/deb_spec.rb
|
282
|
+
- spec/lib/packaging/repo_spec.rb
|
283
|
+
- spec/lib/packaging/platforms_spec.rb
|
284
|
+
- spec/lib/packaging/artifactory_spec.rb
|
285
|
+
- spec/lib/packaging/config_spec.rb
|
286
|
+
- spec/lib/packaging/paths_spec.rb
|
287
|
+
- spec/lib/packaging_spec.rb
|