packaging 0.99.0 → 0.99.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/packaging/deb/repo.rb +1 -1
- data/lib/packaging/platforms.rb +16 -5
- data/lib/packaging/rpm/repo.rb +1 -1
- data/lib/packaging/util/net.rb +1 -1
- data/spec/lib/packaging/deb/repo_spec.rb +1 -1
- data/spec/lib/packaging/platforms_spec.rb +12 -0
- data/spec/lib/packaging/rpm/repo_spec.rb +1 -1
- data/tasks/nightly_repos.rake +1 -1
- data/tasks/sign.rake +1 -1
- metadata +9 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0ae6398f2a9568e9a9d75426480aa85940ac5df1
|
4
|
+
data.tar.gz: d1e290e42fb8c1604ad1b18d938bb7b7567cd11a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 32df3b1cc9f5f1ec0bc2a41438aa27f2f49bd67d200790d42df368251138eaa90b4d0de76d508e72eb3041beff8dc8aeb5d2e2c4a6f0af157335ac0484a2ccea
|
7
|
+
data.tar.gz: bea38c34983114bd4b445390233da4b0677fb8404e7dd819fec1ba766cb5eeae4bd4e18af68eee0d436671c45953e63db0058e288e84027b335892b009aa2f17
|
data/lib/packaging/deb/repo.rb
CHANGED
@@ -144,7 +144,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
|
|
144
144
|
return
|
145
145
|
end
|
146
146
|
|
147
|
-
invoke_task("pl:fetch")
|
147
|
+
Pkg::Util::RakeUtils.invoke_task("pl:fetch")
|
148
148
|
repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target}/deb"
|
149
149
|
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
|
150
150
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
data/lib/packaging/platforms.rb
CHANGED
@@ -291,7 +291,7 @@ module Pkg::Platforms # rubocop:disable Metrics/ModuleLength
|
|
291
291
|
|
292
292
|
|
293
293
|
# For platform names with a dash in them, because everything is special
|
294
|
-
supported_arches = arches_for_platform_version(platform, version)
|
294
|
+
supported_arches = arches_for_platform_version(platform, version, true)
|
295
295
|
architecture = platform_tag.sub(/^(#{platform}-#{version}|#{codename})-?/, '')
|
296
296
|
|
297
297
|
fail unless supported_arches.include?(architecture) || architecture.empty?
|
@@ -389,9 +389,9 @@ module Pkg::Platforms # rubocop:disable Metrics/ModuleLength
|
|
389
389
|
end
|
390
390
|
|
391
391
|
# Given a debian codename, return the arches that we build for that codename
|
392
|
-
def arches_for_codename(codename)
|
392
|
+
def arches_for_codename(codename, include_source = false)
|
393
393
|
platform, version = codename_to_platform_version(codename)
|
394
|
-
arches_for_platform_version(platform, version)
|
394
|
+
arches_for_platform_version(platform, version, include_source)
|
395
395
|
end
|
396
396
|
|
397
397
|
# Given a codename, return an array of associated tags
|
@@ -406,8 +406,19 @@ module Pkg::Platforms # rubocop:disable Metrics/ModuleLength
|
|
406
406
|
|
407
407
|
# Given a platform and version, return the arches that we build for that
|
408
408
|
# platform
|
409
|
-
def arches_for_platform_version(platform, version)
|
410
|
-
get_attribute_for_platform_version(platform, version, :architectures)
|
409
|
+
def arches_for_platform_version(platform, version, include_source = false)
|
410
|
+
platform_architectures = get_attribute_for_platform_version(platform, version, :architectures)
|
411
|
+
# get_attribute_for_platform_version will raise an exception if the attribute
|
412
|
+
# isn't found. We don't want this to be a fatal error, we just want to append
|
413
|
+
# the source architecture if it's found
|
414
|
+
source_architecture = []
|
415
|
+
if include_source
|
416
|
+
begin
|
417
|
+
source_architecture = Array(get_attribute_for_platform_version(platform, version, :source_architecture))
|
418
|
+
rescue
|
419
|
+
end
|
420
|
+
end
|
421
|
+
return (platform_architectures + source_architecture).flatten
|
411
422
|
end
|
412
423
|
|
413
424
|
# Returns an array of all currently valid platform tags
|
data/lib/packaging/rpm/repo.rb
CHANGED
@@ -14,7 +14,7 @@ module Pkg::Rpm::Repo
|
|
14
14
|
return
|
15
15
|
end
|
16
16
|
|
17
|
-
invoke_task("pl:fetch")
|
17
|
+
Pkg::Util::RakeUtils.invoke_task("pl:fetch")
|
18
18
|
repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target}/rpm"
|
19
19
|
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
|
20
20
|
Pkg::Util::Execution.retry_on_fail(:times => 3) do
|
data/lib/packaging/util/net.rb
CHANGED
@@ -351,7 +351,7 @@ module Pkg::Util::Net
|
|
351
351
|
tarball_name = File.basename(tarball).gsub('.tar.gz', '')
|
352
352
|
Pkg::Util::Net.rsync_to(tarball, host, '/tmp')
|
353
353
|
appendix = Pkg::Util.rand_string
|
354
|
-
Pkg::Util::Net.remote_ssh_cmd(host, "#{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ; git clone --recursive /tmp/#{tarball_name} /tmp/#{Pkg::Config.project}-#{appendix} ; cd /tmp/#{Pkg::Config.project}-#{appendix} ; rake package:bootstrap")
|
354
|
+
Pkg::Util::Net.remote_ssh_cmd(host, "#{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ; git clone --recursive /tmp/#{tarball_name} /tmp/#{Pkg::Config.project}-#{appendix} ; cd /tmp/#{Pkg::Config.project}-#{appendix} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake package:bootstrap")
|
355
355
|
"/tmp/#{Pkg::Config.project}-#{appendix}"
|
356
356
|
end
|
357
357
|
|
@@ -114,7 +114,7 @@ describe "Pkg::Deb::Repo" do
|
|
114
114
|
Pkg::Config.distribution_server = "a.host.that.wont.exist"
|
115
115
|
repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/repo_configs/deb"
|
116
116
|
Pkg::Util::File.should_receive(:empty_dir?).with("pkg/repo_configs/deb").and_return(false)
|
117
|
-
Pkg::
|
117
|
+
Pkg::Util::RakeUtils.should_receive(:invoke_task).with("pl:fetch")
|
118
118
|
Pkg::Util::Net.should_receive(:remote_ssh_cmd).with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
|
119
119
|
Pkg::Util::Execution.should_receive(:retry_on_fail).with(:times => 3)
|
120
120
|
Pkg::Deb::Repo.ship_repo_configs
|
@@ -61,6 +61,10 @@ describe 'Pkg::Platforms' do
|
|
61
61
|
it 'should return an array of arches corresponding to a given codename' do
|
62
62
|
expect(Pkg::Platforms.arches_for_codename('trusty')).to match_array(['i386', 'amd64'])
|
63
63
|
end
|
64
|
+
|
65
|
+
it 'should be able to include source archietectures' do
|
66
|
+
expect(Pkg::Platforms.arches_for_codename('trusty', true)).to match_array(['i386', 'amd64', 'source'])
|
67
|
+
end
|
64
68
|
end
|
65
69
|
|
66
70
|
describe '#codename_to_tags' do
|
@@ -73,6 +77,10 @@ describe 'Pkg::Platforms' do
|
|
73
77
|
it 'should return an array of arches for a given platform and version' do
|
74
78
|
expect(Pkg::Platforms.arches_for_platform_version('sles', '11')).to match_array(['i386', 'x86_64', 's390x'])
|
75
79
|
end
|
80
|
+
|
81
|
+
it 'should be able to include source architectures' do
|
82
|
+
expect(Pkg::Platforms.arches_for_platform_version('sles', '11', true)).to match_array(['i386', 'x86_64', 's390x', 'SRPMS'])
|
83
|
+
end
|
76
84
|
end
|
77
85
|
|
78
86
|
describe '#platform_tags' do
|
@@ -127,6 +135,8 @@ describe 'Pkg::Platforms' do
|
|
127
135
|
'xenial' => ['ubuntu', '16.04', ''],
|
128
136
|
'windows-2012' => ['windows', '2012', ''],
|
129
137
|
'redhat-fips-7-x86_64' => ['redhat-fips', '7', 'x86_64'],
|
138
|
+
'el-7-SRPMS' => ['el', '7', 'SRPMS'],
|
139
|
+
'ubuntu-14.04-source' => ['ubuntu', '14.04', 'source'],
|
130
140
|
}
|
131
141
|
|
132
142
|
fail_cases = [
|
@@ -136,6 +146,8 @@ describe 'Pkg::Platforms' do
|
|
136
146
|
'windows-x86',
|
137
147
|
'el-7-notarch',
|
138
148
|
'debian-7-x86_64',
|
149
|
+
'el-7-source',
|
150
|
+
'debian-7-SRPMS',
|
139
151
|
]
|
140
152
|
|
141
153
|
test_cases.each do |platform_tag, results|
|
@@ -124,7 +124,7 @@ describe "Pkg::Rpm::Repo" do
|
|
124
124
|
Pkg::Config.distribution_server = "a.host.that.wont.exist"
|
125
125
|
repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/repo_configs/rpm"
|
126
126
|
Pkg::Util::File.should_receive(:empty_dir?).with("pkg/repo_configs/rpm").and_return(false)
|
127
|
-
Pkg::
|
127
|
+
Pkg::Util::RakeUtils.should_receive(:invoke_task).with("pl:fetch")
|
128
128
|
Pkg::Util::Net.should_receive(:remote_ssh_cmd).with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
|
129
129
|
Pkg::Util::Execution.should_receive(:retry_on_fail).with(:times => 3)
|
130
130
|
Pkg::Rpm::Repo.ship_repo_configs
|
data/tasks/nightly_repos.rake
CHANGED
@@ -21,7 +21,7 @@ namespace :pl do
|
|
21
21
|
remote_repo = Pkg::Util::Net.remote_bootstrap(signing_server, 'HEAD', nil, signing_bundle)
|
22
22
|
build_params = Pkg::Util::Net.remote_buildparams(signing_server, Pkg::Config)
|
23
23
|
Pkg::Util::Net.rsync_to('repos', signing_server, remote_repo)
|
24
|
-
Pkg::Util::Net.remote_ssh_cmd(signing_server, "cd #{remote_repo} ; rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}")
|
24
|
+
Pkg::Util::Net.remote_ssh_cmd(signing_server, "cd #{remote_repo} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}")
|
25
25
|
Pkg::Util::Net.rsync_from("#{remote_repo}/repos/", signing_server, target)
|
26
26
|
Pkg::Util::Net.remote_ssh_cmd(signing_server, "rm -rf #{remote_repo}")
|
27
27
|
Pkg::Util::Net.remote_ssh_cmd(signing_server, "rm #{build_params}")
|
data/tasks/sign.rake
CHANGED
@@ -216,7 +216,7 @@ namespace :pl do
|
|
216
216
|
remote_repo = Pkg::Util::Net.remote_bootstrap(Pkg::Config.signing_server, 'HEAD', nil, signing_bundle)
|
217
217
|
build_params = Pkg::Util::Net.remote_buildparams(Pkg::Config.signing_server, Pkg::Config)
|
218
218
|
Pkg::Util::Net.rsync_to('pkg', Pkg::Config.signing_server, remote_repo)
|
219
|
-
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "cd #{remote_repo} ; rake #{sign_tasks.join(' ')} PARAMS_FILE=#{build_params}")
|
219
|
+
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "cd #{remote_repo} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake #{sign_tasks.join(' ')} PARAMS_FILE=#{build_params}")
|
220
220
|
Pkg::Util::Net.rsync_from("#{remote_repo}/pkg/", Pkg::Config.signing_server, "pkg/")
|
221
221
|
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm -rf #{remote_repo}")
|
222
222
|
Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm #{build_params}")
|
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.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-02-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -42,16 +42,16 @@ dependencies:
|
|
42
42
|
name: rake
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - "
|
45
|
+
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: 12.2.1
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- - "
|
52
|
+
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: 12.2.1
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: artifactory
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -186,7 +186,8 @@ files:
|
|
186
186
|
- templates/packaging.xml.erb
|
187
187
|
- templates/repo.xml.erb
|
188
188
|
homepage: http://github.com/puppetlabs/packaging
|
189
|
-
licenses:
|
189
|
+
licenses:
|
190
|
+
- Apache-2.0
|
190
191
|
metadata: {}
|
191
192
|
post_install_message:
|
192
193
|
rdoc_options: []
|
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
196
197
|
requirements:
|
197
198
|
- - ">="
|
198
199
|
- !ruby/object:Gem::Version
|
199
|
-
version:
|
200
|
+
version: 1.9.3
|
200
201
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
201
202
|
requirements:
|
202
203
|
- - ">="
|