packaging 0.99.60 → 0.99.61
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/packaging/platforms.rb +123 -4
- data/spec/lib/packaging/artifactory_spec.rb +19 -8
- data/spec/lib/packaging/config_spec.rb +11 -7
- data/spec/lib/packaging/paths_spec.rb +11 -8
- data/spec/lib/packaging/platforms_spec.rb +14 -14
- data/spec/lib/packaging/sign_spec.rb +1 -0
- data/spec/lib/packaging/util/ship_spec.rb +19 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ad27ca2f1724bfea741b3e69538fdb238acc76ea1662a6e40a44f433eb66e457
|
|
4
|
+
data.tar.gz: 87aad9c6e3f8e13abcaf437fbe1fceb113ee596073d04a3e997f4d12c38d6edc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d6af0709a72179d3489e2ea6c3940be0f69d715e34c81cd19e5378badd136d7ec6db068d18d610cbb8448ba4053aa04f5fdda4708e273d27b38ffb786cd55da2
|
|
7
|
+
data.tar.gz: 22f8aab7c11a57fa87f836047b5ee441a1cfbaf04df579b00b3cb15d8eeec2a7c32500ec56d9c2edf86e2c4e4b267076cc345e2bd8731962a904046b2d4219fd
|
data/lib/packaging/platforms.rb
CHANGED
|
@@ -47,7 +47,26 @@ module Pkg
|
|
|
47
47
|
},
|
|
48
48
|
},
|
|
49
49
|
|
|
50
|
+
'cumulus' => {
|
|
51
|
+
'2.2' => {
|
|
52
|
+
codename: 'cumulus',
|
|
53
|
+
architectures: ['amd64'],
|
|
54
|
+
source_architecture: 'source',
|
|
55
|
+
package_format: 'deb',
|
|
56
|
+
source_package_formats: DEBIAN_SOURCE_FORMATS,
|
|
57
|
+
repo: true,
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
|
|
50
61
|
'debian' => {
|
|
62
|
+
'7' => {
|
|
63
|
+
codename: 'wheezy',
|
|
64
|
+
architectures: ['amd64', 'i386'],
|
|
65
|
+
source_architecture: 'source',
|
|
66
|
+
package_format: 'deb',
|
|
67
|
+
source_package_formats: DEBIAN_SOURCE_FORMATS,
|
|
68
|
+
repo: true,
|
|
69
|
+
},
|
|
51
70
|
'8' => {
|
|
52
71
|
codename: 'jessie',
|
|
53
72
|
architectures: ['amd64', 'i386', 'powerpc'],
|
|
@@ -84,7 +103,7 @@ module Pkg
|
|
|
84
103
|
repo: true,
|
|
85
104
|
},
|
|
86
105
|
'6' => {
|
|
87
|
-
architectures: ['x86_64', 'i386'],
|
|
106
|
+
architectures: ['x86_64', 'i386', 's390x'],
|
|
88
107
|
source_architecture: 'SRPMS',
|
|
89
108
|
package_format: 'rpm',
|
|
90
109
|
source_package_formats: ['src.rpm'],
|
|
@@ -92,7 +111,7 @@ module Pkg
|
|
|
92
111
|
repo: true,
|
|
93
112
|
},
|
|
94
113
|
'7' => {
|
|
95
|
-
architectures: ['x86_64', 'ppc64le', 'aarch64'],
|
|
114
|
+
architectures: ['x86_64', 's390x', 'ppc64le', 'aarch64'],
|
|
96
115
|
source_architecture: 'SRPMS',
|
|
97
116
|
package_format: 'rpm',
|
|
98
117
|
source_package_formats: ['src.rpm'],
|
|
@@ -109,7 +128,87 @@ module Pkg
|
|
|
109
128
|
}
|
|
110
129
|
},
|
|
111
130
|
|
|
131
|
+
'eos' => {
|
|
132
|
+
'4' => {
|
|
133
|
+
architectures: ['i386'],
|
|
134
|
+
package_format: 'swix',
|
|
135
|
+
repo: false,
|
|
136
|
+
},
|
|
137
|
+
},
|
|
138
|
+
|
|
112
139
|
'fedora' => {
|
|
140
|
+
'f25' => {
|
|
141
|
+
architectures: ['x86_64', 'i386'],
|
|
142
|
+
source_architecture: 'SRPMS',
|
|
143
|
+
package_format: 'rpm',
|
|
144
|
+
source_package_formats: ['src.rpm'],
|
|
145
|
+
signature_format: 'v4',
|
|
146
|
+
repo: true,
|
|
147
|
+
},
|
|
148
|
+
'f26' => {
|
|
149
|
+
architectures: ['x86_64'],
|
|
150
|
+
source_architecture: 'SRPMS',
|
|
151
|
+
package_format: 'rpm',
|
|
152
|
+
source_package_formats: ['src.rpm'],
|
|
153
|
+
signature_format: 'v4',
|
|
154
|
+
repo: true,
|
|
155
|
+
},
|
|
156
|
+
'f27' => {
|
|
157
|
+
architectures: ['x86_64'],
|
|
158
|
+
source_architecture: 'SRPMS',
|
|
159
|
+
package_format: 'rpm',
|
|
160
|
+
source_package_formats: ['src.rpm'],
|
|
161
|
+
signature_format: 'v4',
|
|
162
|
+
repo: true,
|
|
163
|
+
},
|
|
164
|
+
'f28' => {
|
|
165
|
+
architectures: ['x86_64'],
|
|
166
|
+
source_architecture: 'SRPMS',
|
|
167
|
+
package_format: 'rpm',
|
|
168
|
+
source_package_formats: ['src.rpm'],
|
|
169
|
+
signature_format: 'v4',
|
|
170
|
+
repo: true,
|
|
171
|
+
},
|
|
172
|
+
'25' => {
|
|
173
|
+
architectures: ['x86_64', 'i386'],
|
|
174
|
+
source_architecture: 'SRPMS',
|
|
175
|
+
package_format: 'rpm',
|
|
176
|
+
source_package_formats: ['src.rpm'],
|
|
177
|
+
signature_format: 'v4',
|
|
178
|
+
repo: true,
|
|
179
|
+
},
|
|
180
|
+
'26' => {
|
|
181
|
+
architectures: ['x86_64'],
|
|
182
|
+
source_architecture: 'SRPMS',
|
|
183
|
+
package_format: 'rpm',
|
|
184
|
+
source_package_formats: ['src.rpm'],
|
|
185
|
+
signature_format: 'v4',
|
|
186
|
+
repo: true,
|
|
187
|
+
},
|
|
188
|
+
'27' => {
|
|
189
|
+
architectures: ['x86_64'],
|
|
190
|
+
source_architecture: 'SRPMS',
|
|
191
|
+
package_format: 'rpm',
|
|
192
|
+
source_package_formats: ['src.rpm'],
|
|
193
|
+
signature_format: 'v4',
|
|
194
|
+
repo: true,
|
|
195
|
+
},
|
|
196
|
+
'28' => {
|
|
197
|
+
architectures: ['x86_64'],
|
|
198
|
+
source_architecture: 'SRPMS',
|
|
199
|
+
package_format: 'rpm',
|
|
200
|
+
source_package_formats: ['src.rpm'],
|
|
201
|
+
signature_format: 'v4',
|
|
202
|
+
repo: true,
|
|
203
|
+
},
|
|
204
|
+
'29' => {
|
|
205
|
+
architectures: ['x86_64'],
|
|
206
|
+
source_architecture: 'SRPMS',
|
|
207
|
+
package_format: 'rpm',
|
|
208
|
+
source_package_formats: ['src.rpm'],
|
|
209
|
+
signature_format: 'v4',
|
|
210
|
+
repo: true,
|
|
211
|
+
},
|
|
113
212
|
'30' => {
|
|
114
213
|
architectures: ['x86_64'],
|
|
115
214
|
source_architecture: 'SRPMS',
|
|
@@ -129,6 +228,26 @@ module Pkg
|
|
|
129
228
|
},
|
|
130
229
|
|
|
131
230
|
'osx' => {
|
|
231
|
+
'10.10' => {
|
|
232
|
+
architectures: ['x86_64'],
|
|
233
|
+
package_format: 'dmg',
|
|
234
|
+
repo: false,
|
|
235
|
+
},
|
|
236
|
+
'10.11' => {
|
|
237
|
+
architectures: ['x86_64'],
|
|
238
|
+
package_format: 'dmg',
|
|
239
|
+
repo: false,
|
|
240
|
+
},
|
|
241
|
+
'10.12' => {
|
|
242
|
+
architectures: ['x86_64'],
|
|
243
|
+
package_format: 'dmg',
|
|
244
|
+
repo: false,
|
|
245
|
+
},
|
|
246
|
+
'10.13' => {
|
|
247
|
+
architectures: ['x86_64'],
|
|
248
|
+
package_format: 'dmg',
|
|
249
|
+
repo: false,
|
|
250
|
+
},
|
|
132
251
|
'10.14' => {
|
|
133
252
|
architectures: ['x86_64'],
|
|
134
253
|
package_format: 'dmg',
|
|
@@ -154,7 +273,7 @@ module Pkg
|
|
|
154
273
|
|
|
155
274
|
'sles' => {
|
|
156
275
|
'11' => {
|
|
157
|
-
architectures: ['x86_64', 'i386'],
|
|
276
|
+
architectures: ['x86_64', 'i386', 's390x'],
|
|
158
277
|
source_architecture: 'SRPMS',
|
|
159
278
|
package_format: 'rpm',
|
|
160
279
|
source_package_formats: ['src.rpm'],
|
|
@@ -162,7 +281,7 @@ module Pkg
|
|
|
162
281
|
repo: true,
|
|
163
282
|
},
|
|
164
283
|
'12' => {
|
|
165
|
-
architectures: ['x86_64', 'ppc64le'],
|
|
284
|
+
architectures: ['x86_64', 's390x', 'ppc64le'],
|
|
166
285
|
source_architecture: 'SRPMS',
|
|
167
286
|
package_format: 'rpm',
|
|
168
287
|
source_package_formats: ['src.rpm'],
|
|
@@ -36,10 +36,15 @@ describe 'artifactory.rb' do
|
|
|
36
36
|
:repo_config => '',
|
|
37
37
|
:additional_artifacts => ["./windowsfips/puppet-agent-extras-5.3.1.34-x64.msi"],
|
|
38
38
|
},
|
|
39
|
-
'
|
|
40
|
-
:artifact => "./
|
|
39
|
+
'eos-4-i386' => {
|
|
40
|
+
:artifact => "./eos/4/PC1/i386/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix",
|
|
41
41
|
:repo_config => '',
|
|
42
|
-
:additional_artifacts => ["./
|
|
42
|
+
:additional_artifacts => ["./eos/4/PC1/i386/puppet-agent-extras-5.3.1.34.gf65f9ef-1.eos4.i386.swix"],
|
|
43
|
+
},
|
|
44
|
+
'osx-10.12-x86_64' => {
|
|
45
|
+
:artifact => "./apple/10.12/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.12.dmg",
|
|
46
|
+
:repo_config => '',
|
|
47
|
+
:additional_artifacts => ["./apple/10.12/PC1/x86_64/puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.12.dmg"],
|
|
43
48
|
},
|
|
44
49
|
'solaris-10-sparc' => {
|
|
45
50
|
:artifact => "./solaris/10/PC1/puppet-agent-5.3.1.34.gf65f9ef-1.sparc.pkg.gz",
|
|
@@ -72,7 +77,7 @@ describe 'artifactory.rb' do
|
|
|
72
77
|
:package_name => 'path/to/a/buster/package/puppetdb_5.3.1.34.gf65f9ef-1buster_all.deb',
|
|
73
78
|
:all_package_names => ['puppetdb_5.3.1.34.gf65f9ef-1buster_all.deb', 'puppetdb-termini_5.3.1.34.gf65f9ef-1buster_all.deb']
|
|
74
79
|
},
|
|
75
|
-
|
|
80
|
+
'windows-2012-x86' => {
|
|
76
81
|
:toplevel_repo => 'generic',
|
|
77
82
|
:repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/windows-x86",
|
|
78
83
|
:package_name => 'path/to/a/windows/package/puppet-agent-5.3.1.34-x86.msi',
|
|
@@ -84,11 +89,17 @@ describe 'artifactory.rb' do
|
|
|
84
89
|
:package_name => 'path/to/a/windowsfips/package/puppet-agent-5.3.1.34-x64.msi',
|
|
85
90
|
:all_package_names => ['puppet-agent-5.3.1.34-x64.msi','puppet-agent-extras-5.3.1.34-x64.msi']
|
|
86
91
|
},
|
|
87
|
-
'
|
|
92
|
+
'eos-4-i386' => {
|
|
93
|
+
:toplevel_repo => 'generic',
|
|
94
|
+
:repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/eos-4-i386",
|
|
95
|
+
:package_name => 'path/to/an/eos/4/package/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix',
|
|
96
|
+
:all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.eos4.i386.swix']
|
|
97
|
+
},
|
|
98
|
+
'osx-10.12-x86_64' => {
|
|
88
99
|
:toplevel_repo => 'generic',
|
|
89
|
-
:repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.
|
|
90
|
-
:package_name => 'path/to/an/osx/10.
|
|
91
|
-
:all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.osx10.
|
|
100
|
+
:repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.12-x86_64",
|
|
101
|
+
:package_name => 'path/to/an/osx/10.12/package/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.12.dmg',
|
|
102
|
+
:all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.osx10.12.dmg', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.12.dmg']
|
|
92
103
|
},
|
|
93
104
|
'solaris-10-sparc' => {
|
|
94
105
|
:toplevel_repo => 'generic',
|
|
@@ -202,19 +202,23 @@ describe "Pkg::Config" do
|
|
|
202
202
|
|
|
203
203
|
describe "#platform_data" do
|
|
204
204
|
platform_tags = [
|
|
205
|
-
'
|
|
205
|
+
'eos-4-i386',
|
|
206
|
+
'osx-10.12-x86_64',
|
|
206
207
|
'cisco-wrlinux-7-x86_64',
|
|
207
208
|
'ubuntu-16.04-i386',
|
|
208
|
-
'
|
|
209
|
+
'cumulus-2.2-amd64',
|
|
210
|
+
'el-6-s390x',
|
|
209
211
|
'el-7-ppc64le',
|
|
210
212
|
'sles-12-x86_64',
|
|
211
213
|
]
|
|
212
214
|
|
|
213
215
|
artifacts = \
|
|
214
|
-
"./artifacts/
|
|
216
|
+
"./artifacts/eos/4/PC1/i386/puppet-agent-5.3.2-1.eos4.i386.swix\n" \
|
|
217
|
+
"./artifacts/apple/10.12/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.12.dmg\n" \
|
|
215
218
|
"./artifacts/cisco-wrlinux/7/PC1/x86_64/puppet-agent-5.3.2-1.cisco_wrlinux7.x86_64.rpm\n" \
|
|
216
219
|
"./artifacts/deb/xenial/PC1/puppet-agent_5.3.2-1xenial_i386.deb\n" \
|
|
217
|
-
"./artifacts/
|
|
220
|
+
"./artifacts/deb/cumulus/PC1/puppet-agent_5.3.2-1cumulus_amd64.deb\n" \
|
|
221
|
+
"./artifacts/el/6/PC1/s390x/puppet-agent-5.3.2.658.gc79ef9a-1.el6.s390x.rpm\n" \
|
|
218
222
|
"./artifacts/el/7/PC1/ppc64le/puppet-agent-5.3.2-1.el7.ppc64le.rpm\n" \
|
|
219
223
|
"./artifacts/sles/12/PC1/x86_64/puppet-agent-5.3.2-1.sles12.x86_64.rpm"
|
|
220
224
|
|
|
@@ -222,7 +226,7 @@ describe "Pkg::Config" do
|
|
|
222
226
|
"./artifacts/aix/6.1/PC1/ppc/puppet-agent-5.3.2-1.aix6.1.ppc.rpm"
|
|
223
227
|
|
|
224
228
|
fedora_artifacts = \
|
|
225
|
-
"./artifacts/fedora/
|
|
229
|
+
"./artifacts/fedora/f25/PC1/x86_64/puppet-agent-5.3.2-1.fedoraf25.x86_64.rpm"
|
|
226
230
|
|
|
227
231
|
windows_artifacts = \
|
|
228
232
|
"./artifacts/windows/puppet-agent-x64.msi\n" \
|
|
@@ -279,8 +283,8 @@ describe "Pkg::Config" do
|
|
|
279
283
|
it "should not use 'f' in fedora platform tags" do
|
|
280
284
|
allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(fedora_artifacts, nil)
|
|
281
285
|
data = Pkg::Config.platform_data
|
|
282
|
-
expect(data).to include('fedora-
|
|
283
|
-
expect(data).not_to include('fedora-
|
|
286
|
+
expect(data).to include('fedora-25-x86_64')
|
|
287
|
+
expect(data).not_to include('fedora-f25-x86_64')
|
|
284
288
|
end
|
|
285
289
|
|
|
286
290
|
it "should collect packages whose extname differ from package_format" do
|
|
@@ -25,14 +25,17 @@ describe 'Pkg::Paths' do
|
|
|
25
25
|
'pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb' => 'ubuntu-16.04-amd64',
|
|
26
26
|
'pkg/windows-x64/puppet-agent-4.99.0-x64.msi' => 'windows-2012-x64',
|
|
27
27
|
'artifacts/el/6/products/x86_64/pe-r10k-2.5.4.3-1.el6.x86_64.rpm' => 'el-6-x86_64',
|
|
28
|
+
'pkg/deb/trusty/pe-r10k_2.5.4.3-1trusty_amd64.deb' => 'ubuntu-14.04-amd64',
|
|
28
29
|
'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.noarch.rpm' => 'el-6-i386',
|
|
29
30
|
'pkg/deb/trusty/pe-r10k_2.5.4.3-1trusty_amd64.deb' => 'ubuntu-14.04-amd64',
|
|
30
31
|
'pkg/pe/deb/xenial/pe-puppetserver_2017.3.0.3-1puppet1_all.deb' => 'ubuntu-16.04-amd64',
|
|
31
32
|
'pkg/pe/deb/xenial/super-trusty-package_1.0.0-1puppet1_all.deb' => 'ubuntu-16.04-amd64',
|
|
32
|
-
'artifacts/deb/
|
|
33
|
+
'artifacts/deb/wheezy/PC1/puppetdb_4.3.1-1puppetlabs1_all.deb' => 'debian-7-amd64',
|
|
33
34
|
'pkg/el/7/PC1/x86_64/puppetdb-4.3.1-1.el7.noarch.rpm' => 'el-7-x86_64',
|
|
34
|
-
'pkg/apple/10.
|
|
35
|
-
'artifacts/mac/10.
|
|
35
|
+
'pkg/apple/10.11/PC1/x86_64/puppet-agent-1.9.0-1.osx10.11.dmg' => 'osx-10.11-x86_64',
|
|
36
|
+
'artifacts/mac/10.11/PC1/x86_64/puppet-agent-1.9.0-1.osx10.11.dmg' => 'osx-10.11-x86_64',
|
|
37
|
+
'artifacts/eos/4/PC1/i386/puppet-agent-1.9.0-1.eos4.i386.swix' => 'eos-4-i386',
|
|
38
|
+
'pkg/deb/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb' => 'cumulus-2.2-amd64',
|
|
36
39
|
'pkg/windows/puppet-agent-1.9.0-x86.msi' => 'windows-2012-x86',
|
|
37
40
|
'artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz' => 'ubuntu-16.04-source',
|
|
38
41
|
'http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial' => 'ubuntu-16.04-amd64',
|
|
@@ -94,8 +97,8 @@ describe 'Pkg::Paths' do
|
|
|
94
97
|
expect(Pkg::Paths.artifacts_path('el-7-x86_64')).to eq('artifacts/puppet5/el/7/x86_64')
|
|
95
98
|
end
|
|
96
99
|
|
|
97
|
-
it 'should be correct for
|
|
98
|
-
expect(Pkg::Paths.artifacts_path('ubuntu-
|
|
100
|
+
it 'should be correct for trusty' do
|
|
101
|
+
expect(Pkg::Paths.artifacts_path('ubuntu-14.04-amd64')).to eq('artifacts/trusty/puppet5')
|
|
99
102
|
end
|
|
100
103
|
|
|
101
104
|
it 'should be correct for solaris 11' do
|
|
@@ -103,7 +106,7 @@ describe 'Pkg::Paths' do
|
|
|
103
106
|
end
|
|
104
107
|
|
|
105
108
|
it 'should be correct for osx' do
|
|
106
|
-
expect(Pkg::Paths.artifacts_path('osx-10.
|
|
109
|
+
expect(Pkg::Paths.artifacts_path('osx-10.10-x86_64')).to eq('artifacts/mac/puppet5/10.10/x86_64')
|
|
107
110
|
end
|
|
108
111
|
|
|
109
112
|
it 'should be correct for windows' do
|
|
@@ -248,7 +251,7 @@ describe 'Pkg::Paths' do
|
|
|
248
251
|
expect(Pkg::Paths.remote_repo_base('ubuntu-18.04-amd64')).to eq('bar')
|
|
249
252
|
end
|
|
250
253
|
it 'returns nonfinal_yum_repo_path for nonfinal rpms' do
|
|
251
|
-
expect(Pkg::Paths.remote_repo_base('fedora-
|
|
254
|
+
expect(Pkg::Paths.remote_repo_base('fedora-29-x86_64', true)).to eq('foo-nightly')
|
|
252
255
|
end
|
|
253
256
|
it 'returns nonfinal_apt_repo_path for nonfinal debs' do
|
|
254
257
|
expect(Pkg::Paths.remote_repo_base('debian-9-amd64', true)).to eq('bar-nightly')
|
|
@@ -302,7 +305,7 @@ describe 'Pkg::Paths' do
|
|
|
302
305
|
expect(Pkg::Paths.release_package_link_path('debian-9-i386', true)).to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-stretch.deb")
|
|
303
306
|
end
|
|
304
307
|
it 'returns nil for package formats that do not have release packages' do
|
|
305
|
-
expect(Pkg::Paths.release_package_link_path('osx-10.
|
|
308
|
+
expect(Pkg::Paths.release_package_link_path('osx-10.13-x86_64')).to eq(nil)
|
|
306
309
|
expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
|
|
307
310
|
end
|
|
308
311
|
end
|
|
@@ -3,7 +3,7 @@ require 'spec_helper'
|
|
|
3
3
|
describe 'Pkg::Platforms' do
|
|
4
4
|
describe '#by_package_format' do
|
|
5
5
|
it 'should return an array of platforms that use a given format' do
|
|
6
|
-
deb_platforms = ['debian', 'ubuntu']
|
|
6
|
+
deb_platforms = ['cumulus', 'debian', 'ubuntu']
|
|
7
7
|
rpm_platforms = ['aix', 'cisco-wrlinux', 'el', 'fedora', 'redhatfips', 'sles']
|
|
8
8
|
expect(Pkg::Platforms.by_package_format('deb')).to match_array(deb_platforms)
|
|
9
9
|
expect(Pkg::Platforms.by_package_format('rpm')).to match_array(rpm_platforms)
|
|
@@ -12,14 +12,14 @@ describe 'Pkg::Platforms' do
|
|
|
12
12
|
|
|
13
13
|
describe '#formats' do
|
|
14
14
|
it 'should return all package formats' do
|
|
15
|
-
fmts = ['rpm', 'deb', 'dmg', 'svr4', 'ips', 'msi']
|
|
15
|
+
fmts = ['rpm', 'deb', 'swix', 'dmg', 'svr4', 'ips', 'msi']
|
|
16
16
|
expect(Pkg::Platforms.formats).to match_array(fmts)
|
|
17
17
|
end
|
|
18
18
|
end
|
|
19
19
|
|
|
20
20
|
describe '#supported_platforms' do
|
|
21
21
|
it 'should return all supported platforms' do
|
|
22
|
-
platforms = ['aix', 'cisco-wrlinux', 'debian', 'el', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
|
|
22
|
+
platforms = ['aix', 'cisco-wrlinux', 'cumulus', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
|
|
23
23
|
expect(Pkg::Platforms.supported_platforms).to match_array(platforms)
|
|
24
24
|
end
|
|
25
25
|
end
|
|
@@ -36,7 +36,7 @@ describe 'Pkg::Platforms' do
|
|
|
36
36
|
|
|
37
37
|
describe '#codenames' do
|
|
38
38
|
it 'should return all codenames for a given platform' do
|
|
39
|
-
codenames = ['focal', 'bionic', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
|
|
39
|
+
codenames = ['focal', 'bionic', 'buster', 'cosmic', 'cumulus', 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial']
|
|
40
40
|
expect(Pkg::Platforms.codenames).to match_array(codenames)
|
|
41
41
|
end
|
|
42
42
|
end
|
|
@@ -59,27 +59,27 @@ describe 'Pkg::Platforms' do
|
|
|
59
59
|
|
|
60
60
|
describe '#arches_for_codename' do
|
|
61
61
|
it 'should return an array of arches corresponding to a given codename' do
|
|
62
|
-
expect(Pkg::Platforms.arches_for_codename('
|
|
62
|
+
expect(Pkg::Platforms.arches_for_codename('trusty')).to match_array(['i386', 'amd64'])
|
|
63
63
|
end
|
|
64
64
|
|
|
65
65
|
it 'should be able to include source archietectures' do
|
|
66
|
-
expect(Pkg::Platforms.arches_for_codename('
|
|
66
|
+
expect(Pkg::Platforms.arches_for_codename('trusty', true)).to match_array(['i386', 'amd64', 'source'])
|
|
67
67
|
end
|
|
68
68
|
end
|
|
69
69
|
|
|
70
70
|
describe '#codename_to_tags' do
|
|
71
71
|
it 'should return an array of platform tags corresponding to a given codename' do
|
|
72
|
-
expect(Pkg::Platforms.codename_to_tags('
|
|
72
|
+
expect(Pkg::Platforms.codename_to_tags('trusty')).to match_array(['ubuntu-14.04-i386', 'ubuntu-14.04-amd64'])
|
|
73
73
|
end
|
|
74
74
|
end
|
|
75
75
|
|
|
76
76
|
describe '#arches_for_platform_version' do
|
|
77
77
|
it 'should return an array of arches for a given platform and version' do
|
|
78
|
-
expect(Pkg::Platforms.arches_for_platform_version('sles', '
|
|
78
|
+
expect(Pkg::Platforms.arches_for_platform_version('sles', '11')).to match_array(['i386', 'x86_64', 's390x'])
|
|
79
79
|
end
|
|
80
80
|
|
|
81
81
|
it 'should be able to include source architectures' do
|
|
82
|
-
expect(Pkg::Platforms.arches_for_platform_version('sles', '
|
|
82
|
+
expect(Pkg::Platforms.arches_for_platform_version('sles', '11', true)).to match_array(['i386', 'x86_64', 's390x', 'SRPMS'])
|
|
83
83
|
end
|
|
84
84
|
end
|
|
85
85
|
|
|
@@ -98,12 +98,12 @@ describe 'Pkg::Platforms' do
|
|
|
98
98
|
|
|
99
99
|
describe '#platform_lookup' do
|
|
100
100
|
it 'should return a hash of platform info' do
|
|
101
|
-
expect(Pkg::Platforms.platform_lookup('osx-10.
|
|
101
|
+
expect(Pkg::Platforms.platform_lookup('osx-10.10-x86_64')).to be_instance_of(Hash)
|
|
102
102
|
end
|
|
103
103
|
|
|
104
104
|
it 'should include at least arch and package format keys' do
|
|
105
|
-
expect(Pkg::Platforms.platform_lookup('osx-10.
|
|
106
|
-
expect(Pkg::Platforms.platform_lookup('osx-10.
|
|
105
|
+
expect(Pkg::Platforms.platform_lookup('osx-10.10-x86_64').keys).to include(:architectures)
|
|
106
|
+
expect(Pkg::Platforms.platform_lookup('osx-10.10-x86_64').keys).to include(:package_format)
|
|
107
107
|
end
|
|
108
108
|
end
|
|
109
109
|
|
|
@@ -113,7 +113,7 @@ describe 'Pkg::Platforms' do
|
|
|
113
113
|
end
|
|
114
114
|
|
|
115
115
|
it 'fails with a reasonable error when specified attribute is not defined' do
|
|
116
|
-
expect { Pkg::Platforms.get_attribute('
|
|
116
|
+
expect { Pkg::Platforms.get_attribute('eos-4-i386', :signature_format) }.to raise_error(/doesn't have information/)
|
|
117
117
|
end
|
|
118
118
|
end
|
|
119
119
|
|
|
@@ -137,7 +137,7 @@ describe 'Pkg::Platforms' do
|
|
|
137
137
|
'windows-2012' => ['windows', '2012', ''],
|
|
138
138
|
'redhatfips-7-x86_64' => ['redhatfips', '7', 'x86_64'],
|
|
139
139
|
'el-7-SRPMS' => ['el', '7', 'SRPMS'],
|
|
140
|
-
'ubuntu-
|
|
140
|
+
'ubuntu-14.04-source' => ['ubuntu', '14.04', 'source'],
|
|
141
141
|
}
|
|
142
142
|
|
|
143
143
|
fail_cases = [
|
|
@@ -74,6 +74,7 @@ DOC
|
|
|
74
74
|
] }
|
|
75
75
|
let(:v4_rpms) { [
|
|
76
76
|
"#{rpm_directory}/el/7/PC1/aarch64/puppet-agent-5.5.3-1.el7.aarch64.rpm",
|
|
77
|
+
"#{rpm_directory}/sles/12/PC1/s390x/puppet-agent-5.5.3-1.sles12.s390x.rpm",
|
|
77
78
|
] }
|
|
78
79
|
let(:rpms) { rpms_not_to_sign + v3_rpms + v4_rpms }
|
|
79
80
|
let(:already_signed_rpms) { [
|
|
@@ -8,6 +8,15 @@ describe '#Pkg::Util::Ship' do
|
|
|
8
8
|
'pkg/windowsfips/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x64.msi',
|
|
9
9
|
'pkg/windowsfips/puppet5/puppet-agent-x64.msi'
|
|
10
10
|
]
|
|
11
|
+
swix_pkgs = [
|
|
12
|
+
'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
|
|
13
|
+
'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
|
|
14
|
+
]
|
|
15
|
+
|
|
16
|
+
it 'returns an array of packages found on the filesystem' do
|
|
17
|
+
allow(Dir).to receive(:glob).with('pkg/**/*.swix*').and_return(swix_pkgs)
|
|
18
|
+
expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.swix*'])).to eq(swix_pkgs)
|
|
19
|
+
end
|
|
11
20
|
|
|
12
21
|
describe 'define excludes' do
|
|
13
22
|
before :each do
|
|
@@ -34,19 +43,27 @@ describe '#Pkg::Util::Ship' do
|
|
|
34
43
|
end
|
|
35
44
|
|
|
36
45
|
local_pkgs = [
|
|
37
|
-
'pkg/deb/
|
|
46
|
+
'pkg/deb/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb',
|
|
47
|
+
'pkg/deb/wheezy/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1wheezy_i386.deb',
|
|
38
48
|
'pkg/el/5/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.el5.x86_64.rpm',
|
|
39
49
|
'pkg/sles/11/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
|
|
40
50
|
'pkg/sles/12/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.sles12.x86_64.rpm',
|
|
41
51
|
'pkg/mac/10.15/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.15.dmg',
|
|
52
|
+
'pkg/mac/10.10/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.10.dmg',
|
|
53
|
+
'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
|
|
54
|
+
'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
|
|
42
55
|
'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
|
|
43
56
|
]
|
|
44
57
|
new_pkgs = [
|
|
45
|
-
'pkg/
|
|
58
|
+
'pkg/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb',
|
|
59
|
+
'pkg/wheezy/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1wheezy_i386.deb',
|
|
46
60
|
'pkg/puppet5/el/5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.el5.x86_64.rpm',
|
|
47
61
|
'pkg/puppet5/sles/11/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
|
|
48
62
|
'pkg/puppet5/sles/12/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.sles12.x86_64.rpm',
|
|
49
63
|
'pkg/mac/puppet5/10.15/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.15.dmg',
|
|
64
|
+
'pkg/mac/puppet5/10.10/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.10.dmg',
|
|
65
|
+
'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
|
|
66
|
+
'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
|
|
50
67
|
'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
|
|
51
68
|
]
|
|
52
69
|
|
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.61
|
|
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-04-
|
|
11
|
+
date: 2020-04-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rspec
|