packaging 0.99.66 → 0.99.71
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/lib/packaging/paths.rb +1 -1
- data/lib/packaging/platforms.rb +9 -1
- data/tasks/00_utils.rake +4 -1
- data/tasks/gem.rake +10 -0
- data/tasks/ship.rake +19 -0
- metadata +31 -17
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: dc55afd9bcd5d03c49cd0ce6f89ae31a209356058fb3462bafc8c65fe49d4797
|
4
|
+
data.tar.gz: 502621e9b2c3596626e56e0a38855ced2b118bcf501dc8a87381fda4f1c06f76
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cb7d531d46d326390769e3c1f27210b3ae65907d9e48adae43248a13b850b5688e008f4d229267d0d936b8d80c6b0c8569b5823e41c55d60ed0145d4b47a9ec6
|
7
|
+
data.tar.gz: 5c9c2ee3f31fdfc657efb40e17ff9f5283707a883cc1c2bea3ec81dafed9da39a56ae58d6e791f657759ae419c96cfb726a1a30332dba174ab36a6087c50d4a7
|
@@ -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/lib/packaging/paths.rb
CHANGED
@@ -315,7 +315,7 @@ module Pkg::Paths
|
|
315
315
|
|
316
316
|
def debian_component_from_path(path)
|
317
317
|
# substitute '.' and '/' since those aren't valid characters for debian components
|
318
|
-
matches = path.match(/(
|
318
|
+
matches = path.match(/(\d+\.\d+|master|main)\/(\w+)/)
|
319
319
|
regex_for_substitution = /[\.\/]/
|
320
320
|
fail "Error: Could not determine Debian Component from path #{path}" if matches.nil?
|
321
321
|
base_component = matches[1]
|
data/lib/packaging/platforms.rb
CHANGED
@@ -100,7 +100,7 @@ module Pkg
|
|
100
100
|
repo: true,
|
101
101
|
},
|
102
102
|
'8' => {
|
103
|
-
architectures: ['x86_64'],
|
103
|
+
architectures: ['x86_64', 'aarch64'],
|
104
104
|
source_architecture: 'SRPMS',
|
105
105
|
package_format: 'rpm',
|
106
106
|
source_package_formats: ['src.rpm'],
|
@@ -134,6 +134,14 @@ module Pkg
|
|
134
134
|
signature_format: 'v4',
|
135
135
|
repo: true,
|
136
136
|
},
|
137
|
+
'32' => {
|
138
|
+
architectures: ['x86_64'],
|
139
|
+
source_architecture: 'SRPMS',
|
140
|
+
package_format: 'rpm',
|
141
|
+
source_package_formats: ['src.rpm'],
|
142
|
+
signature_format: 'v4',
|
143
|
+
repo: true,
|
144
|
+
},
|
137
145
|
},
|
138
146
|
|
139
147
|
'osx' => {
|
data/tasks/00_utils.rake
CHANGED
@@ -119,7 +119,10 @@ end
|
|
119
119
|
# purport to both return the results of the command execution (ala `%x{cmd}`)
|
120
120
|
# while also raising an exception if a command does not succeed (ala `sh "cmd"`).
|
121
121
|
def ex(command)
|
122
|
-
|
122
|
+
# We haven't done anything about this deprecation and our log files
|
123
|
+
# have too many warnings from this.
|
124
|
+
# Turn off the notice for now until packaging is refactored.
|
125
|
+
# Pkg::Util.deprecate("ex", "Pkg::Util::Execution.ex")
|
123
126
|
Pkg::Util::Execution.ex(command)
|
124
127
|
end
|
125
128
|
|
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.71
|
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-10-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -94,6 +94,20 @@ dependencies:
|
|
94
94
|
- - ">="
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '0'
|
97
|
+
- !ruby/object:Gem::Dependency
|
98
|
+
name: csv
|
99
|
+
requirement: !ruby/object:Gem::Requirement
|
100
|
+
requirements:
|
101
|
+
- - '='
|
102
|
+
- !ruby/object:Gem::Version
|
103
|
+
version: 3.1.5
|
104
|
+
type: :runtime
|
105
|
+
prerelease: false
|
106
|
+
version_requirements: !ruby/object:Gem::Requirement
|
107
|
+
requirements:
|
108
|
+
- - '='
|
109
|
+
- !ruby/object:Gem::Version
|
110
|
+
version: 3.1.5
|
97
111
|
description: Packaging automation written in Rake and Ruby. Easily build native packages
|
98
112
|
for most platforms with a few data files and git.
|
99
113
|
email: info@puppetlabs.com
|
@@ -245,28 +259,28 @@ signing_key:
|
|
245
259
|
specification_version: 4
|
246
260
|
summary: Puppet Labs' packaging automation
|
247
261
|
test_files:
|
262
|
+
- spec/lib/packaging/artifactory_spec.rb
|
248
263
|
- spec/lib/packaging/sign_spec.rb
|
249
|
-
- spec/lib/packaging/
|
264
|
+
- spec/lib/packaging/platforms_spec.rb
|
265
|
+
- spec/lib/packaging/rpm/repo_spec.rb
|
250
266
|
- spec/lib/packaging/repo_spec.rb
|
251
|
-
- spec/lib/packaging/
|
252
|
-
- spec/lib/packaging/deb/repo_spec.rb
|
267
|
+
- spec/lib/packaging/config_spec.rb
|
253
268
|
- spec/lib/packaging/gem_spec.rb
|
254
|
-
- spec/lib/packaging/artifactory_spec.rb
|
255
|
-
- spec/lib/packaging/tar_spec.rb
|
256
|
-
- spec/lib/packaging/util/version_spec.rb
|
257
269
|
- spec/lib/packaging/util/execution_spec.rb
|
258
|
-
- spec/lib/packaging/util/
|
259
|
-
- spec/lib/packaging/util/ship_spec.rb
|
270
|
+
- spec/lib/packaging/util/gpg_spec.rb
|
260
271
|
- spec/lib/packaging/util/git_spec.rb
|
272
|
+
- spec/lib/packaging/util/jenkins_spec.rb
|
261
273
|
- spec/lib/packaging/util/rake_utils_spec.rb
|
262
274
|
- spec/lib/packaging/util/net_spec.rb
|
263
|
-
- spec/lib/packaging/util/file_spec.rb
|
264
|
-
- spec/lib/packaging/util/jenkins_spec.rb
|
265
|
-
- spec/lib/packaging/util/misc_spec.rb
|
266
275
|
- spec/lib/packaging/util/git_tag_spec.rb
|
267
|
-
- spec/lib/packaging/util/
|
268
|
-
- spec/lib/packaging/
|
276
|
+
- spec/lib/packaging/util/misc_spec.rb
|
277
|
+
- spec/lib/packaging/util/ship_spec.rb
|
278
|
+
- spec/lib/packaging/util/file_spec.rb
|
279
|
+
- spec/lib/packaging/util/version_spec.rb
|
280
|
+
- spec/lib/packaging/util/os_spec.rb
|
281
|
+
- spec/lib/packaging/paths_spec.rb
|
282
|
+
- spec/lib/packaging/deb_spec.rb
|
269
283
|
- spec/lib/packaging/retrieve_spec.rb
|
270
|
-
- spec/lib/packaging/
|
271
|
-
- spec/lib/packaging/
|
284
|
+
- spec/lib/packaging/tar_spec.rb
|
285
|
+
- spec/lib/packaging/deb/repo_spec.rb
|
272
286
|
- spec/lib/packaging_spec.rb
|