packaging 0.99.67 → 0.99.68
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/packaging/artifactory.rb +1 -1
- data/tasks/gem.rake +10 -0
- data/tasks/ship.rake +19 -0
- metadata +20 -20
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 382d8df54b4e231f8dbe4464c1b83767f000fce144e34833898eb296e4aa1a07
|
4
|
+
data.tar.gz: 698fd55d8612e46b15b829a6fef4d8722e2527a010120f3a8955ac1b3e1d7515
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 16241153fc6f51335d0d5a7440c3b55a11575a33cc9123ac24a9a7812c53bcdfd4a7f7ea5301ecca53718ab48ba78534f1cc412102327cced1fd6d22057a310f
|
7
|
+
data.tar.gz: 4f64a0ce0c87758f156fca4776748ac81aef1eaf387508336bf47f859b76bdeedf6fdf5a4ba9b1966ff02a4668a30ca13d08d19b1e075221c67f7a9b3d1d4889
|
@@ -502,7 +502,7 @@ module Pkg
|
|
502
502
|
# @param local_path [String] local path to download tarballs to
|
503
503
|
def download_final_pe_tarballs(pe_version, repo, remote_path, local_path)
|
504
504
|
check_authorization
|
505
|
-
artifacts = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo)
|
505
|
+
artifacts = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo, exact_match: false)
|
506
506
|
artifacts.each do |artifact|
|
507
507
|
next unless artifact.download_uri.include? remote_path
|
508
508
|
next if artifact.download_uri.include? "-rc"
|
data/tasks/gem.rake
CHANGED
@@ -150,10 +150,20 @@ namespace :package do
|
|
150
150
|
Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version
|
151
151
|
package_gem
|
152
152
|
end
|
153
|
+
|
154
|
+
# PA-3356: temporary task to ship puppet 7 nightly gem
|
155
|
+
# TODO: PA-3358 - remove when puppet 7 is officialy out
|
156
|
+
task :puppet_7_nightly_gem => ["clean"] do
|
157
|
+
Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
|
158
|
+
package_gem
|
159
|
+
end
|
153
160
|
end
|
154
161
|
|
155
162
|
# An alias task to simplify our remote logic in jenkins.rake
|
156
163
|
namespace :pl do
|
157
164
|
task :gem => "package:gem"
|
158
165
|
task :nightly_gem => "package:nightly_gem"
|
166
|
+
# PA-3356: temporary task to ship puppet 7 nightly gem
|
167
|
+
# TODO: PA-3358 - remove when puppet 7 is officialy out
|
168
|
+
task :puppet_7_nightly_gem => "package:puppet_7_nightly_gem"
|
159
169
|
end
|
data/tasks/ship.rake
CHANGED
@@ -265,6 +265,25 @@ namespace :pl do
|
|
265
265
|
|
266
266
|
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
|
267
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)
|
286
|
+
end
|
268
287
|
end
|
269
288
|
|
270
289
|
desc "Ship mocked rpms to #{Pkg::Config.yum_staging_server}"
|
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.68
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-08-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -259,28 +259,28 @@ signing_key:
|
|
259
259
|
specification_version: 4
|
260
260
|
summary: Puppet Labs' packaging automation
|
261
261
|
test_files:
|
262
|
-
- spec/lib/
|
263
|
-
- spec/lib/packaging/paths_spec.rb
|
264
|
-
- spec/lib/packaging/repo_spec.rb
|
265
|
-
- spec/lib/packaging/deb_spec.rb
|
266
|
-
- spec/lib/packaging/deb/repo_spec.rb
|
267
|
-
- spec/lib/packaging/gem_spec.rb
|
262
|
+
- spec/lib/packaging_spec.rb
|
268
263
|
- spec/lib/packaging/artifactory_spec.rb
|
264
|
+
- spec/lib/packaging/config_spec.rb
|
265
|
+
- spec/lib/packaging/gem_spec.rb
|
269
266
|
- spec/lib/packaging/tar_spec.rb
|
270
|
-
- spec/lib/packaging/
|
271
|
-
- spec/lib/packaging/
|
272
|
-
- spec/lib/packaging/
|
273
|
-
- spec/lib/packaging/
|
267
|
+
- spec/lib/packaging/rpm/repo_spec.rb
|
268
|
+
- spec/lib/packaging/paths_spec.rb
|
269
|
+
- spec/lib/packaging/retrieve_spec.rb
|
270
|
+
- spec/lib/packaging/deb/repo_spec.rb
|
271
|
+
- spec/lib/packaging/repo_spec.rb
|
272
|
+
- spec/lib/packaging/platforms_spec.rb
|
274
273
|
- spec/lib/packaging/util/git_spec.rb
|
275
274
|
- spec/lib/packaging/util/rake_utils_spec.rb
|
275
|
+
- spec/lib/packaging/util/git_tag_spec.rb
|
276
276
|
- spec/lib/packaging/util/net_spec.rb
|
277
|
-
- spec/lib/packaging/util/file_spec.rb
|
278
277
|
- spec/lib/packaging/util/jenkins_spec.rb
|
279
|
-
- spec/lib/packaging/util/misc_spec.rb
|
280
|
-
- spec/lib/packaging/util/git_tag_spec.rb
|
281
278
|
- spec/lib/packaging/util/gpg_spec.rb
|
282
|
-
- spec/lib/packaging/
|
283
|
-
- spec/lib/packaging/
|
284
|
-
- spec/lib/packaging/
|
285
|
-
- spec/lib/packaging/
|
286
|
-
- spec/lib/
|
279
|
+
- spec/lib/packaging/util/file_spec.rb
|
280
|
+
- spec/lib/packaging/util/misc_spec.rb
|
281
|
+
- spec/lib/packaging/util/ship_spec.rb
|
282
|
+
- spec/lib/packaging/util/execution_spec.rb
|
283
|
+
- spec/lib/packaging/util/version_spec.rb
|
284
|
+
- spec/lib/packaging/util/os_spec.rb
|
285
|
+
- spec/lib/packaging/deb_spec.rb
|
286
|
+
- spec/lib/packaging/sign_spec.rb
|