packaging 0.105.0 → 0.106.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +4 -4
- data/lib/packaging/archive.rb +2 -2
- data/lib/packaging/artifactory/extensions.rb +1 -0
- data/lib/packaging/artifactory.rb +27 -23
- data/lib/packaging/config/params.rb +191 -199
- data/lib/packaging/config/validations.rb +0 -2
- data/lib/packaging/config.rb +8 -8
- data/lib/packaging/deb/repo.rb +11 -14
- data/lib/packaging/gem.rb +2 -2
- data/lib/packaging/metrics.rb +7 -7
- data/lib/packaging/nuget.rb +0 -1
- data/lib/packaging/paths.rb +11 -13
- data/lib/packaging/platforms.rb +10 -6
- data/lib/packaging/repo.rb +11 -12
- data/lib/packaging/retrieve.rb +1 -1
- data/lib/packaging/rpm/repo.rb +8 -8
- data/lib/packaging/sign/dmg.rb +8 -7
- data/lib/packaging/sign/ips.rb +64 -32
- data/lib/packaging/sign/msi.rb +84 -112
- data/lib/packaging/sign/rpm.rb +1 -1
- data/lib/packaging/sign.rb +0 -1
- data/lib/packaging/tar.rb +2 -4
- data/lib/packaging/util/date.rb +0 -1
- data/lib/packaging/util/distribution_server.rb +2 -2
- data/lib/packaging/util/execution.rb +2 -4
- data/lib/packaging/util/file.rb +2 -3
- data/lib/packaging/util/git.rb +1 -3
- data/lib/packaging/util/git_tags.rb +3 -3
- data/lib/packaging/util/gpg.rb +3 -4
- data/lib/packaging/util/jenkins.rb +0 -3
- data/lib/packaging/util/misc.rb +1 -1
- data/lib/packaging/util/net.rb +26 -22
- data/lib/packaging/util/repo.rb +0 -1
- data/lib/packaging/util/serialization.rb +1 -2
- data/lib/packaging/util/ship.rb +3 -3
- data/lib/packaging/util/sign.rb +8 -8
- data/lib/packaging/util/tool.rb +1 -4
- data/lib/packaging/util/version.rb +1 -5
- data/lib/packaging/util.rb +1 -1
- data/lib/packaging.rb +1 -2
- data/spec/lib/packaging/platforms_spec.rb +1 -1
- data/spec/lib/packaging/sign_spec.rb +1 -1
- data/spec/lib/packaging/util/git_spec.rb +2 -2
- data/spec/lib/packaging/util/git_tag_spec.rb +5 -5
- data/tasks/30_metrics.rake +2 -2
- data/tasks/apple.rake +8 -14
- data/tasks/archive.rake +1 -2
- data/tasks/deb.rake +7 -8
- data/tasks/doc.rake +5 -3
- data/tasks/education.rake +2 -4
- data/tasks/gem.rake +20 -12
- data/tasks/jenkins.rake +27 -15
- data/tasks/jenkins_dynamic.rake +10 -10
- data/tasks/mock.rake +8 -9
- data/tasks/nightly_repos.rake +14 -14
- data/tasks/pe_ship.rake +10 -17
- data/tasks/retrieve.rake +2 -2
- data/tasks/rpm.rake +1 -1
- data/tasks/ship.rake +23 -13
- data/tasks/sign.rake +5 -5
- data/tasks/tar.rake +2 -3
- data/tasks/update.rake +2 -2
- data/tasks/vendor_gems.rake +5 -7
- data/tasks/version.rake +2 -2
- metadata +62 -34
@@ -3,194 +3,191 @@ require "packaging/platforms"
|
|
3
3
|
# These are all of the parameters known to our packaging system.
|
4
4
|
# They are ingested by the config class as class instance variables
|
5
5
|
module Pkg::Params
|
6
|
-
BUILD_PARAMS = [
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
:yum_repo_path,
|
192
|
-
:yum_staging_server,
|
193
|
-
]
|
6
|
+
BUILD_PARAMS = %i[allow_dirty_tree
|
7
|
+
answer_override
|
8
|
+
apt_archive_path
|
9
|
+
apt_archive_repo_command
|
10
|
+
apt_host
|
11
|
+
apt_releases
|
12
|
+
apt_repo_command
|
13
|
+
apt_repo_name
|
14
|
+
apt_repo_path
|
15
|
+
apt_repo_staging_path
|
16
|
+
apt_repo_url
|
17
|
+
apt_signing_server
|
18
|
+
apt_staging_server
|
19
|
+
author
|
20
|
+
benchmark
|
21
|
+
build_data_repo
|
22
|
+
build_date
|
23
|
+
build_defaults
|
24
|
+
build_dmg
|
25
|
+
build_doc
|
26
|
+
build_gem
|
27
|
+
build_ips
|
28
|
+
build_msi
|
29
|
+
build_pe
|
30
|
+
build_tar
|
31
|
+
builder_data_file
|
32
|
+
builds_server
|
33
|
+
bundle_platforms
|
34
|
+
certificate_pem
|
35
|
+
cows
|
36
|
+
db_table
|
37
|
+
deb_build_host
|
38
|
+
deb_build_mirrors
|
39
|
+
deb_targets
|
40
|
+
debug
|
41
|
+
debversion
|
42
|
+
default_cow
|
43
|
+
default_mock
|
44
|
+
dev_build
|
45
|
+
description
|
46
|
+
distribution_server
|
47
|
+
dmg_host
|
48
|
+
dmg_path
|
49
|
+
dmg_staging_server
|
50
|
+
downloads_archive_path
|
51
|
+
email
|
52
|
+
files
|
53
|
+
final_mocks
|
54
|
+
foss_only
|
55
|
+
foss_platforms
|
56
|
+
freight_archive_path
|
57
|
+
freight_conf
|
58
|
+
gem_default_executables
|
59
|
+
gem_dependencies
|
60
|
+
gem_description
|
61
|
+
gem_devel_dependencies
|
62
|
+
gem_development_dependencies
|
63
|
+
gem_excludes
|
64
|
+
gem_executables
|
65
|
+
gem_files
|
66
|
+
gem_forge_project
|
67
|
+
gem_host
|
68
|
+
gem_license
|
69
|
+
gem_name
|
70
|
+
gem_path
|
71
|
+
gem_platform_dependencies
|
72
|
+
gem_rdoc_options
|
73
|
+
gem_require_path
|
74
|
+
gem_required_ruby_version
|
75
|
+
gem_required_rubygems_version
|
76
|
+
gem_runtime_dependencies
|
77
|
+
gem_summary
|
78
|
+
gem_test_files
|
79
|
+
gemversion
|
80
|
+
gpg_key
|
81
|
+
gpg_name
|
82
|
+
homepage
|
83
|
+
internal_gem_host
|
84
|
+
ips_build_host
|
85
|
+
ips_host
|
86
|
+
ips_inter_cert
|
87
|
+
ips_package_host
|
88
|
+
ips_path
|
89
|
+
ips_repo
|
90
|
+
ips_root_cert
|
91
|
+
ips_signing_cert
|
92
|
+
ips_signing_key
|
93
|
+
ips_signing_server
|
94
|
+
ips_signing_ssh_key
|
95
|
+
ips_store
|
96
|
+
jenkins_build_host
|
97
|
+
jenkins_packaging_job
|
98
|
+
jenkins_repo_path
|
99
|
+
metrics
|
100
|
+
metrics_url
|
101
|
+
msi_host
|
102
|
+
msi_name
|
103
|
+
msi_path
|
104
|
+
msi_signing_gcp_service_account_credentials
|
105
|
+
msi_signing_service_url
|
106
|
+
msi_staging_server
|
107
|
+
name
|
108
|
+
nonfinal_apt_repo_command
|
109
|
+
nonfinal_apt_repo_path
|
110
|
+
nonfinal_apt_repo_staging_path
|
111
|
+
nonfinal_dmg_path
|
112
|
+
nonfinal_gem_path
|
113
|
+
nonfinal_ips_path
|
114
|
+
nonfinal_msi_path
|
115
|
+
nonfinal_p5p_path
|
116
|
+
nonfinal_repo_name
|
117
|
+
nonfinal_repo_link_target
|
118
|
+
nonfinal_svr4_path
|
119
|
+
nonfinal_swix_path
|
120
|
+
nonfinal_yum_repo_path
|
121
|
+
notify
|
122
|
+
nuget_host
|
123
|
+
nuget_repo_path
|
124
|
+
origversion
|
125
|
+
osx_build_host
|
126
|
+
osx_signing_cert
|
127
|
+
osx_signing_keychain
|
128
|
+
osx_signing_keychain_pw
|
129
|
+
osx_signing_server
|
130
|
+
osx_signing_ssh_key
|
131
|
+
p5p_host
|
132
|
+
p5p_path
|
133
|
+
packager
|
134
|
+
packaging_repo
|
135
|
+
packaging_root
|
136
|
+
packaging_url
|
137
|
+
pbuild_conf
|
138
|
+
pe_feature_branch
|
139
|
+
pe_release_branch
|
140
|
+
pe_name
|
141
|
+
pe_platforms
|
142
|
+
pe_version
|
143
|
+
pg_major_version
|
144
|
+
platform_repos
|
145
|
+
pre_tar_task
|
146
|
+
pre_tasks
|
147
|
+
privatekey_pem
|
148
|
+
project
|
149
|
+
project_root
|
150
|
+
random_mockroot
|
151
|
+
rc_mocks
|
152
|
+
redis_hostname
|
153
|
+
ref
|
154
|
+
release
|
155
|
+
repo_link_target
|
156
|
+
repo_name
|
157
|
+
rpm_build_host
|
158
|
+
rpm_targets
|
159
|
+
rpmrelease
|
160
|
+
rpmversion
|
161
|
+
rsync_servers
|
162
|
+
s3_ship
|
163
|
+
short_ref
|
164
|
+
sign_tar
|
165
|
+
signing_server
|
166
|
+
staging_server
|
167
|
+
summary
|
168
|
+
svr4_host
|
169
|
+
svr4_path
|
170
|
+
swix_host
|
171
|
+
swix_path
|
172
|
+
swix_staging_server
|
173
|
+
tar_excludes
|
174
|
+
tar_host
|
175
|
+
tar_staging_server
|
176
|
+
tarball_path
|
177
|
+
task
|
178
|
+
team
|
179
|
+
templates
|
180
|
+
update_version_file
|
181
|
+
vanagon_project
|
182
|
+
version
|
183
|
+
version_file
|
184
|
+
version_strategy
|
185
|
+
yum_archive_path
|
186
|
+
yum_host
|
187
|
+
yum_repo_command
|
188
|
+
yum_repo_name
|
189
|
+
yum_repo_path
|
190
|
+
yum_staging_server]
|
194
191
|
|
195
192
|
# Environment variable overrides for Pkg::Config parameters
|
196
193
|
#
|
@@ -204,7 +201,7 @@ module Pkg::Params
|
|
204
201
|
{ :var => :apt_archive_path, :envvar => :APT_ARCHIVE_PATH },
|
205
202
|
{ :var => :apt_archive_repo_command, :envvar => :APT_ARCHIVE_REPO_COMMAND },
|
206
203
|
{ :var => :apt_host, :envvar => :APT_HOST },
|
207
|
-
{ :var => :apt_releases, :envvar => :APT_RELEASES,
|
204
|
+
{ :var => :apt_releases, :envvar => :APT_RELEASES, :type => :array },
|
208
205
|
{ :var => :apt_repo_path, :envvar => :APT_REPO },
|
209
206
|
{ :var => :apt_repo_staging_path, :envvar => :APT_REPO_STAGING_PATH },
|
210
207
|
{ :var => :apt_signing_server, :envvar => :APT_SIGNING_SERVER },
|
@@ -219,10 +216,10 @@ module Pkg::Params
|
|
219
216
|
{ :var => :build_tar, :envvar => :TAR, :type => :bool },
|
220
217
|
{ :var => :certificate_pem, :envvar => :CERT_PEM },
|
221
218
|
{ :var => :cows, :envvar => :COW },
|
222
|
-
{ :var => :debug, :envvar => :DEBUG,
|
219
|
+
{ :var => :debug, :envvar => :DEBUG, :type => :bool },
|
223
220
|
{ :var => :default_cow, :envvar => :COW },
|
224
221
|
{ :var => :default_mock, :envvar => :MOCK },
|
225
|
-
{ :var => :dev_build, :envvar => :DEV_BUILD,
|
222
|
+
{ :var => :dev_build, :envvar => :DEV_BUILD, :type => :bool },
|
226
223
|
{ :var => :dmg_host, :envvar => :DMG_HOST },
|
227
224
|
{ :var => :dmg_path, :envvar => :DMG_PATH },
|
228
225
|
{ :var => :dmg_staging_server, :envvar => :DMG_STAGING_SERVER },
|
@@ -245,13 +242,11 @@ module Pkg::Params
|
|
245
242
|
{ :var => :ips_signing_ssh_key, :envvar => :IPS_SIGNING_SSH_KEY },
|
246
243
|
{ :var => :msi_host, :envvar => :MSI_HOST },
|
247
244
|
{ :var => :msi_path, :envvar => :MSI_PATH },
|
248
|
-
{ :var => :
|
249
|
-
{ :var => :
|
250
|
-
{ :var => :msi_signing_server, :envvar => :MSI_SIGNING_SERVER },
|
251
|
-
{ :var => :msi_signing_ssh_key, :envvar => :MSI_SIGNING_SSH_KEY },
|
245
|
+
{ :var => :msi_signing_gcp_service_account_credentials, :envvar => :MSI_SIGNING_GCP_SERVICE_ACCOUNT_CREDENTIALS },
|
246
|
+
{ :var => :msi_signing_service_url, :envvar => :MSI_SIGNING_SERVICE_URL },
|
252
247
|
{ :var => :msi_staging_server, :envvar => :MSI_STAGING_SERVER },
|
253
248
|
{ :var => :nonfinal_apt_repo_command, :envvar => :NONFINAL_APT_REPO_COMMAND },
|
254
|
-
{ :var => :nonfinal_apt_repo_path,
|
249
|
+
{ :var => :nonfinal_apt_repo_path, :envvar => :NONFINAL_APT_REPO_PATH },
|
255
250
|
{ :var => :nonfinal_apt_repo_staging_path, :envvar => :NONFINAL_APT_REPO_STAGING_PATH },
|
256
251
|
{ :var => :nonfinal_dmg_path, :envvar => :NONFINAL_DMG_PATH },
|
257
252
|
{ :var => :nonfinal_gem_path, :envvar => :NONFINAL_GEM_PATH },
|
@@ -329,8 +324,6 @@ module Pkg::Params
|
|
329
324
|
{ :var => :ips_inter_cert, :val => '$IPS_INTER_CERT' },
|
330
325
|
{ :var => :ips_root_cert, :val => '$IPS_ROOT_CERT' },
|
331
326
|
{ :var => :ips_signing_key, :val => '$IPS_SIGNING_KEY' },
|
332
|
-
{ :var => :msi_signing_cert, :val => '$MSI_SIGNING_CERT' },
|
333
|
-
{ :var => :msi_signing_cert_pw, :val => '$MSI_SIGNING_CERT_PW' },
|
334
327
|
{ :var => :pe_feature_branch, :val => false },
|
335
328
|
{ :var => :pe_release_branch, :val => false },
|
336
329
|
{ :var => :s3_ship, :val => false },
|
@@ -384,5 +377,4 @@ module Pkg::Params
|
|
384
377
|
VALIDATIONS = [
|
385
378
|
{ :var => :project, :validations => [:not_empty?] }
|
386
379
|
]
|
387
|
-
|
388
380
|
end
|
data/lib/packaging/config.rb
CHANGED
@@ -81,11 +81,11 @@ module Pkg
|
|
81
81
|
dir = "/opt/jenkins-builds/#{self.project}/#{self.ref}"
|
82
82
|
cmd = "if [ -s \"#{dir}/artifacts\" ]; then cd #{dir};"\
|
83
83
|
"find ./artifacts -mindepth 2 -type f; fi"
|
84
|
-
artifacts,
|
85
|
-
|
84
|
+
artifacts, = Pkg::Util::Net.remote_execute(
|
85
|
+
self.builds_server,
|
86
86
|
cmd,
|
87
87
|
{ capture_output: true }
|
88
|
-
|
88
|
+
)
|
89
89
|
|
90
90
|
artifacts = artifacts.split("\n")
|
91
91
|
data = {}
|
@@ -118,8 +118,8 @@ module Pkg
|
|
118
118
|
if platform == 'solaris'
|
119
119
|
next if version == '10' && File.extname(artifact) != '.gz'
|
120
120
|
next if version == '11' && File.extname(artifact) != '.p5p'
|
121
|
-
|
122
|
-
next
|
121
|
+
elsif File.extname(artifact) != ".#{package_format}"
|
122
|
+
next
|
123
123
|
end
|
124
124
|
|
125
125
|
# Don't want to include debian debug packages
|
@@ -231,8 +231,8 @@ module Pkg
|
|
231
231
|
# the debian changelog.
|
232
232
|
#
|
233
233
|
def cow_list
|
234
|
-
self.cows.split(' ').map do
|
235
|
-
|
234
|
+
self.cows.split(' ').map do |cow|
|
235
|
+
cow.split('-')[1]
|
236
236
|
end.uniq.join(' ')
|
237
237
|
end
|
238
238
|
|
@@ -426,7 +426,7 @@ module Pkg
|
|
426
426
|
def string_to_array(str)
|
427
427
|
delimiters = /[,\s;]/
|
428
428
|
return str if str.respond_to?('each')
|
429
|
-
str.split(delimiters).reject
|
429
|
+
str.split(delimiters).reject(&:empty?).map(&:strip)
|
430
430
|
end
|
431
431
|
|
432
432
|
# This method is duplicated from enterprise-dist so we can access it here.
|
data/lib/packaging/deb/repo.rb
CHANGED
@@ -2,9 +2,7 @@
|
|
2
2
|
require 'fileutils'
|
3
3
|
|
4
4
|
module Pkg::Deb::Repo
|
5
|
-
|
6
5
|
class << self
|
7
|
-
|
8
6
|
# This is the default set of arches we are using for our reprepro repos. We
|
9
7
|
# take this list and combine it with the list of supported arches for each
|
10
8
|
# given platform to ensure a complete set of architectures. We use this
|
@@ -43,7 +41,7 @@ module Pkg::Deb::Repo
|
|
43
41
|
# First test if the directory even exists
|
44
42
|
#
|
45
43
|
begin
|
46
|
-
stdout,
|
44
|
+
stdout, = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 1 --no-parent #{repo_base} 2>&1")
|
47
45
|
rescue RuntimeError
|
48
46
|
warn "No debian repos available for #{Pkg::Config.project} at #{Pkg::Config.ref}."
|
49
47
|
return
|
@@ -62,7 +60,7 @@ module Pkg::Deb::Repo
|
|
62
60
|
# We want to skip the base_url, which wget returns as one of the results
|
63
61
|
next if "#{url}/" == repo_base
|
64
62
|
platform_tag = Pkg::Paths.tag_from_artifact_path(url)
|
65
|
-
platform, version,
|
63
|
+
platform, version, = Pkg::Platforms.parse_platform_tag(platform_tag)
|
66
64
|
codename = Pkg::Platforms.codename_for_platform_version(platform, version)
|
67
65
|
repoconfig = ["# Packages for #{Pkg::Config.project} built from ref #{Pkg::Config.ref}",
|
68
66
|
"deb #{url} #{codename} #{reprepro_repo_name}"]
|
@@ -76,9 +74,9 @@ module Pkg::Deb::Repo
|
|
76
74
|
wget = Pkg::Util::Tool.check_tool("wget")
|
77
75
|
FileUtils.mkdir_p("pkg/#{target}")
|
78
76
|
config_url = "#{base_url}/#{target}/deb/"
|
79
|
-
stdout,
|
77
|
+
stdout, = Pkg::Util::Execution.capture3("#{wget} -r -np -nH --cut-dirs 3 -P pkg/#{target} --reject 'index*' #{config_url}")
|
80
78
|
stdout
|
81
|
-
rescue => e
|
79
|
+
rescue StandardError => e
|
82
80
|
fail "Couldn't retrieve deb apt repo configs.\n#{e}"
|
83
81
|
end
|
84
82
|
|
@@ -95,13 +93,13 @@ module Pkg::Deb::Repo
|
|
95
93
|
|
96
94
|
artifact_paths.each do |path|
|
97
95
|
platform_tag = Pkg::Paths.tag_from_artifact_path(path)
|
98
|
-
platform, version,
|
96
|
+
platform, version, = Pkg::Platforms. parse_platform_tag(platform_tag)
|
99
97
|
codename = Pkg::Platforms.codename_for_platform_version(platform, version)
|
100
98
|
arches = Pkg::Platforms.arches_for_codename(codename)
|
101
99
|
|
102
100
|
cmd << "mkdir -p #{codename}/conf && "
|
103
101
|
cmd << "pushd #{codename} ; "
|
104
|
-
cmd << %
|
102
|
+
cmd << %( [ -e 'conf/distributions' ] || echo "
|
105
103
|
Origin: Puppet Labs
|
106
104
|
Label: Puppet Labs
|
107
105
|
Codename: #{codename}
|
@@ -139,7 +137,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
|
|
139
137
|
end
|
140
138
|
|
141
139
|
def ship_repo_configs(target = "repo_configs")
|
142
|
-
if
|
140
|
+
if !File.exist?("pkg/#{target}/deb") || Pkg::Util::File.empty_dir?("pkg/#{target}/deb")
|
143
141
|
warn "No repo configs have been generated! Try pl:deb_repo_configs."
|
144
142
|
return
|
145
143
|
end
|
@@ -178,7 +176,7 @@ Description: #{message} for #{dist}
|
|
178
176
|
SignWith: #{Pkg::Config.gpg_key}"
|
179
177
|
end
|
180
178
|
|
181
|
-
stdout,
|
179
|
+
stdout, = Pkg::Util::Execution.capture3("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
|
182
180
|
stdout
|
183
181
|
end
|
184
182
|
end
|
@@ -204,7 +202,7 @@ SignWith: #{Pkg::Config.gpg_key}"
|
|
204
202
|
# You may think "rsync doesn't actually remove the sticky bit, let's
|
205
203
|
# remove the Dugo-s from the chmod". However, that will make your rsyncs
|
206
204
|
# fail due to permission errors.
|
207
|
-
options = %w
|
205
|
+
options = %w[
|
208
206
|
rsync
|
209
207
|
--itemize-changes
|
210
208
|
--hard-links
|
@@ -222,14 +220,14 @@ SignWith: #{Pkg::Config.gpg_key}"
|
|
222
220
|
--no-group
|
223
221
|
--exclude='dists/*-*'
|
224
222
|
--exclude='pool/*-*'
|
225
|
-
|
223
|
+
]
|
226
224
|
|
227
225
|
options << '--dry-run' if dryrun
|
228
226
|
options << path
|
229
227
|
if !destination.nil?
|
230
228
|
options << "#{destination}:#{dest_path.parent}"
|
231
229
|
else
|
232
|
-
options <<
|
230
|
+
options << dest_path.parent.to_s
|
233
231
|
end
|
234
232
|
options.join("\s")
|
235
233
|
end
|
@@ -259,6 +257,5 @@ SignWith: #{Pkg::Config.gpg_key}"
|
|
259
257
|
Pkg::Util::Net.remote_execute(destination_server, cp_command)
|
260
258
|
end
|
261
259
|
end
|
262
|
-
|
263
260
|
end
|
264
261
|
end
|
data/lib/packaging/gem.rb
CHANGED
@@ -21,7 +21,7 @@ module Pkg::Gem
|
|
21
21
|
data['number'] == gem_version && data['platform'] == gem_platform
|
22
22
|
end
|
23
23
|
return !gem.empty?
|
24
|
-
rescue => e
|
24
|
+
rescue StandardError => e
|
25
25
|
puts "Something went wrong searching for gem '#{gem_name}':"
|
26
26
|
puts e
|
27
27
|
puts "Perhaps you're shipping '#{gem_name}' for the first time?"
|
@@ -49,7 +49,7 @@ module Pkg::Gem
|
|
49
49
|
gem_push_command << " --host #{options[:host]}" if options[:host]
|
50
50
|
gem_push_command << " --key #{options[:key]}" if options[:key]
|
51
51
|
Pkg::Util::Execution.capture3(gem_push_command)
|
52
|
-
rescue => e
|
52
|
+
rescue StandardError => e
|
53
53
|
puts "###########################################"
|
54
54
|
puts "# Publishing to rubygems failed. Make sure your .gem/credentials"
|
55
55
|
puts "# file is set up and you are an owner of #{Pkg::Config.gem_name}"
|
data/lib/packaging/metrics.rb
CHANGED
@@ -3,13 +3,13 @@ module Pkg::Metrics
|
|
3
3
|
|
4
4
|
def update_release_metrics
|
5
5
|
metrics_repo = 'release-metrics'
|
6
|
-
command =
|
7
|
-
git clone git@github.com:puppetlabs/#{metrics_repo}.git
|
8
|
-
cd #{metrics_repo}
|
9
|
-
bundle exec add-release --date #{Pkg::Util::Date.today} --project #{Pkg::Config.project} --version #{Pkg::Config.ref}
|
10
|
-
cd ..
|
11
|
-
rm -r #{metrics_repo}
|
12
|
-
CMD
|
6
|
+
command = <<~CMD
|
7
|
+
git clone git@github.com:puppetlabs/#{metrics_repo}.git
|
8
|
+
cd #{metrics_repo}
|
9
|
+
bundle exec add-release --date #{Pkg::Util::Date.today} --project #{Pkg::Config.project} --version #{Pkg::Config.ref}
|
10
|
+
cd ..
|
11
|
+
rm -r #{metrics_repo}
|
12
|
+
CMD
|
13
13
|
Pkg::Util::Execution.capture3(command, true)
|
14
14
|
end
|
15
15
|
end
|
data/lib/packaging/nuget.rb
CHANGED
@@ -32,7 +32,6 @@ module Pkg::Nuget
|
|
32
32
|
stdout, retval = Pkg::Util::Net.curl_form_data("#{uri}/#{package_path}", form_data + package_form_data)
|
33
33
|
end
|
34
34
|
fail "The Package upload (curl) failed with error #{retval}" unless Pkg::Util::Execution.success?(retval)
|
35
|
-
stdout
|
36
35
|
end
|
37
36
|
end
|
38
37
|
end
|