simp-rake-helpers 2.4.2 → 2.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.rspec +2 -2
- data/CHANGELOG.md +4 -0
- data/Gemfile +2 -0
- data/lib/simp/rake/helpers/rpm_spec.rb +57 -27
- data/lib/simp/rake/helpers/version.rb +1 -1
- data/spec/acceptance/files/testpackage/CHANGELOG +2 -0
- data/spec/acceptance/files/testpackage/Rakefile +1 -1
- data/spec/acceptance/files/testpackage/build/rpm_metadata/requires +1 -0
- data/spec/acceptance/files/testpackage/metadata.json +33 -0
- data/spec/acceptance/mock_tests_spec.rb +56 -27
- data/spec/acceptance/nodesets/default.yml +57 -35
- data/spec/spec_helper_acceptance.rb +2 -2
- metadata +64 -63
- data/spec/acceptance/files/testpackage/build/testpackage.spec +0 -32
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 494aea481ee3ab79b5afa5512139ef1cf4c3a968
|
4
|
+
data.tar.gz: 0e917376911df1ec494e10b04e63c59586da14e2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a452d44fbd2bac560f44c0b7138fadb1e6406bff666886c7b79047d5144b6d7e816a2473f39544ddec1c9a76309d5fa20060b9f686279364aac01d5bea6ff1c3
|
7
|
+
data.tar.gz: 18f4b5ef9a3527230f1f8d59f4ef942219e4537352c8de80713032615d5f6370bd259c1bc43960af0e7108f10fd7348e3162acfd4ce9724515b8b7ff7b559167
|
data/.rspec
CHANGED
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,7 @@
|
|
1
|
+
### 2.4.3 / 2016-07-22
|
2
|
+
* Update all packages to use a consistent naming scheme and obsolete all that
|
3
|
+
came before.
|
4
|
+
|
1
5
|
### 2.4.2 / 2016-07-13
|
2
6
|
* Ensure that RPM names are properly structured between SIMP and non-SIMP RPMs
|
3
7
|
* Make sure that the install path is proper
|
data/Gemfile
CHANGED
@@ -26,12 +26,13 @@ end
|
|
26
26
|
|
27
27
|
-- These UNKNOWN entries should break the build if something bad happens
|
28
28
|
|
29
|
-
|
30
|
-
|
29
|
+
package_name = "UNKNOWN"
|
30
|
+
package_version = "UNKNOWN"
|
31
31
|
module_license = "UNKNOWN"
|
32
32
|
|
33
|
-
-- Default to
|
34
|
-
|
33
|
+
-- Default to 2016
|
34
|
+
-- This was done due to the change in naming scheme across all of the modules.
|
35
|
+
package_release = '2016'
|
35
36
|
|
36
37
|
}
|
37
38
|
|
@@ -42,6 +43,13 @@ metadata = ''
|
|
42
43
|
metadata_file = io.open(src_dir .. "/metadata.json","r")
|
43
44
|
if metadata_file then
|
44
45
|
metadata = metadata_file:read("*all")
|
46
|
+
|
47
|
+
-- Ignore the first curly brace
|
48
|
+
metadata = metadata:gsub("{}?", '|', 1)
|
49
|
+
|
50
|
+
-- Ignore all keys that are below the first level
|
51
|
+
metadata = metadata:gsub("{.-}", '')
|
52
|
+
metadata = metadata:gsub("%[.-%]", '')
|
45
53
|
end
|
46
54
|
|
47
55
|
-- This starts as an empty string so that we can build it later
|
@@ -55,26 +63,28 @@ module_requires = ''
|
|
55
63
|
|
56
64
|
local name_match = string.match(metadata, '"name":%s+"(.-)"%s*,')
|
57
65
|
|
58
|
-
|
66
|
+
module_author = ''
|
67
|
+
module_name = ''
|
59
68
|
|
60
69
|
if name_match then
|
70
|
+
package_name = ('pupmod-' .. name_match)
|
71
|
+
|
61
72
|
local i = 0
|
62
73
|
for str in string.gmatch(name_match,'[^-]+') do
|
63
74
|
if i == 0 then
|
64
|
-
|
65
|
-
|
75
|
+
module_author = str
|
76
|
+
else
|
77
|
+
if module_name == '' then
|
78
|
+
module_name = str
|
66
79
|
else
|
67
|
-
module_name = '
|
80
|
+
module_name = (module_name .. '-' .. str)
|
68
81
|
end
|
69
|
-
else
|
70
|
-
module_name = (module_name .. '-' .. str)
|
71
82
|
end
|
72
83
|
|
73
|
-
-- We want the last dash split item as our module path name
|
74
|
-
install_name = str
|
75
|
-
|
76
84
|
i = i+1
|
77
85
|
end
|
86
|
+
else
|
87
|
+
print("Error: Could not find valid package name in 'metadata.json'")
|
78
88
|
end
|
79
89
|
|
80
90
|
}
|
@@ -87,7 +97,7 @@ end
|
|
87
97
|
local version_match = string.match(metadata, '"version":%s+"(.-)"%s*,')
|
88
98
|
|
89
99
|
if version_match then
|
90
|
-
|
100
|
+
package_version = version_match
|
91
101
|
end
|
92
102
|
|
93
103
|
}
|
@@ -144,7 +154,7 @@ if rel_file then
|
|
144
154
|
is_blank = string.match(line, "^%s*$")
|
145
155
|
|
146
156
|
if not (is_comment or is_blank) then
|
147
|
-
|
157
|
+
package_release = line
|
148
158
|
break
|
149
159
|
end
|
150
160
|
end
|
@@ -167,8 +177,8 @@ if req_file then
|
|
167
177
|
end
|
168
178
|
}
|
169
179
|
|
170
|
-
%define
|
171
|
-
%define base_name %{lua: print(
|
180
|
+
%define module_name %{lua: print(module_name)}
|
181
|
+
%define base_name %{lua: print(package_name)}
|
172
182
|
|
173
183
|
%{lua:
|
174
184
|
-- Determine which Variant we are going to build
|
@@ -212,15 +222,15 @@ else
|
|
212
222
|
end
|
213
223
|
}
|
214
224
|
|
215
|
-
Summary: %{
|
225
|
+
Summary: %{module_name} Puppet Module
|
216
226
|
%if 0%{?_variant:1}
|
217
227
|
Name: %{base_name}-%{_variant}
|
218
228
|
%else
|
219
229
|
Name: %{base_name}
|
220
230
|
%endif
|
221
231
|
|
222
|
-
Version: %{lua: print(
|
223
|
-
Release: %{lua: print(
|
232
|
+
Version: %{lua: print(package_version)}
|
233
|
+
Release: %{lua: print(package_release)}
|
224
234
|
License: %{lua: print(module_license)}
|
225
235
|
Group: Applications/System
|
226
236
|
Source: %{base_name}-%{version}-%{release}.tar.gz
|
@@ -229,13 +239,33 @@ BuildRoot: %{_tmppath}/%{base_name}-%{version}-%{release}-buildroot
|
|
229
239
|
BuildArch: noarch
|
230
240
|
|
231
241
|
%if "%{variant}" == "pe"
|
232
|
-
Requires: pe-puppet
|
242
|
+
Requires: pe-puppet >= 3.8.6
|
233
243
|
%else
|
234
|
-
Requires: puppet
|
244
|
+
Requires: puppet >= 3.8.6
|
235
245
|
%endif
|
246
|
+
Requires: pupmod-simp-simplib >= 1.2.6
|
247
|
+
Requires: pupmod-puppetlabs-stdlib >= 4.9.0
|
248
|
+
Requires: pupmod-puppetlabs-stdlib < 6.0.0
|
236
249
|
|
237
250
|
%{lua: print(module_requires)}
|
238
251
|
|
252
|
+
Provides: pupmod-%{lua: print(module_name)} = %{lua: print(package_version .. "-" .. package_release)}
|
253
|
+
Obsoletes: pupmod-%{lua: print(module_name)} < %{lua: print(package_version .. "-" .. package_release)}
|
254
|
+
|
255
|
+
%{lua:
|
256
|
+
|
257
|
+
-- This is a workaround for the 'simp-rsync' real RPM conflict but is
|
258
|
+
-- required by some external modules.
|
259
|
+
-- This should be removed when SIMP 6 is stable
|
260
|
+
|
261
|
+
author_rpm_name = module_author .. "-" .. module_name
|
262
|
+
|
263
|
+
if author_rpm_name ~= 'simp-rsync' then
|
264
|
+
print("Provides: " .. author_rpm_name .. " = " .. package_version .. "-" .. package_release .. "\\n")
|
265
|
+
print("Obsoletes: " .. author_rpm_name .. " < " .. package_version .. "-" .. package_release .. "\\n")
|
266
|
+
end
|
267
|
+
}
|
268
|
+
|
239
269
|
Prefix: %{_sysconfdir}/environments/simp/modules
|
240
270
|
|
241
271
|
%description
|
@@ -260,7 +290,7 @@ rm -rf log
|
|
260
290
|
|
261
291
|
curdir=`pwd`
|
262
292
|
dirname=`basename $curdir`
|
263
|
-
cp -r ../$dirname %{buildroot}/%{prefix}/%{
|
293
|
+
cp -r ../$dirname %{buildroot}/%{prefix}/%{module_name}
|
264
294
|
|
265
295
|
%clean
|
266
296
|
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
|
@@ -269,7 +299,7 @@ mkdir -p %{buildroot}/%{prefix}
|
|
269
299
|
|
270
300
|
%files
|
271
301
|
%defattr(0640,root,%{puppet_user},0750)
|
272
|
-
%{prefix}/%{
|
302
|
+
%{prefix}/%{module_name}
|
273
303
|
|
274
304
|
%changelog
|
275
305
|
%{lua:
|
@@ -284,9 +314,9 @@ default_changelog = [===[
|
|
284
314
|
|
285
315
|
default_lookup_table = {
|
286
316
|
date = os.date("%a %b %d %Y"),
|
287
|
-
version =
|
288
|
-
release =
|
289
|
-
name =
|
317
|
+
version = package_version,
|
318
|
+
release = package_release,
|
319
|
+
name = package_name
|
290
320
|
}
|
291
321
|
|
292
322
|
changelog = io.open(src_dir .. "/CHANGELOG","r")
|
@@ -0,0 +1 @@
|
|
1
|
+
Requires: pupmod-simp-simplib >= 1.2.3
|
@@ -0,0 +1,33 @@
|
|
1
|
+
{
|
2
|
+
"name": "simp-testpackage",
|
3
|
+
"version": "0.0.1",
|
4
|
+
"author": "simp",
|
5
|
+
"summary": "A SIMP Test Package for Testing Test Things",
|
6
|
+
"license": "Apache-2.0",
|
7
|
+
"source": "https://github.com/simp/pupmod-imatest",
|
8
|
+
"project_page": "https://github.com/simp/pupmod-imatest",
|
9
|
+
"issues_url": "https://simp/project.atlassian.net",
|
10
|
+
"tags": [ "simp", "test"],
|
11
|
+
"dependencies": [
|
12
|
+
{
|
13
|
+
"name": "simp/simplib",
|
14
|
+
"version_requirement": ">= 1.1.0"
|
15
|
+
}
|
16
|
+
],
|
17
|
+
"operatingsystem_support": [
|
18
|
+
{
|
19
|
+
"operatingsystem": "CentOS",
|
20
|
+
"operatingsystemrelease": [
|
21
|
+
"6",
|
22
|
+
"7"
|
23
|
+
]
|
24
|
+
},
|
25
|
+
{
|
26
|
+
"operatingsystem": "RedHat",
|
27
|
+
"operatingsystemrelease": [
|
28
|
+
"6",
|
29
|
+
"7"
|
30
|
+
]
|
31
|
+
}
|
32
|
+
]
|
33
|
+
}
|
@@ -1,42 +1,71 @@
|
|
1
1
|
require 'spec_helper_acceptance'
|
2
2
|
|
3
3
|
|
4
|
-
describe 'rake pkg:rpm
|
5
|
-
before :all do
|
6
|
-
on 'container', 'bash --login -c "cd /host_files/spec/acceptance/files/testpackage; \
|
7
|
-
gem install bundler; \
|
8
|
-
bundle"'
|
9
|
-
end
|
4
|
+
describe 'rake pkg:rpm' do
|
10
5
|
|
11
|
-
|
12
|
-
before :each do
|
13
|
-
on 'container', 'mkdir -p -m 0755 /var/lib/mock'
|
14
|
-
on 'container', 'rm -rf /var/lib/mock/* /host_files/spec/acceptance/files/testpackage/dist',
|
15
|
-
:accept_all_exit_codes => true
|
16
|
-
end
|
6
|
+
run_cmd = 'runuser build_user -l -c '
|
17
7
|
|
18
|
-
|
8
|
+
let(:pkg_output_dir) { '/host_files/spec/acceptance/files/testpackage' }
|
9
|
+
let(:pkg_dest) { File.join(pkg_output_dir, 'dist/pupmod-simp-testpackage-0.0.1-2016.noarch.rpm') }
|
19
10
|
|
20
|
-
|
21
|
-
on 'container', 'SIMP_RAKE_MOCK_cleanup=no bash --login -c "cd /host_files/spec/acceptance/files/testpackage; bundle exec rake pkg:rpm[epel-6-x86_64,true]"'
|
11
|
+
dists = ['6', '7']
|
22
12
|
|
23
|
-
|
24
|
-
|
13
|
+
hosts.each do |host|
|
14
|
+
context 'with SIMP_RAKE_MOCK_cleanup=no' do
|
15
|
+
before :each do
|
16
|
+
on host, 'mkdir -p -m 0755 /var/lib/mock'
|
17
|
+
on host, 'rm -rf /var/lib/mock/* /host_files/spec/acceptance/files/testpackage/dist',
|
18
|
+
:accept_all_exit_codes => true
|
19
|
+
end
|
25
20
|
|
26
|
-
|
27
|
-
|
28
|
-
|
21
|
+
context 'prep' do
|
22
|
+
it 'should set up the Ruby gems' do
|
23
|
+
on host, %(#{run_cmd} "cd #{pkg_output_dir}; rvm use default; bundle update")
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
dists.each do |dist|
|
28
|
+
context "on #{dist}" do
|
29
|
+
it "should create an RPM for #{dist} and leave the mock directory" do
|
30
|
+
|
31
|
+
test_name %(runs SIMP_RAKE_MOCK_cleanup=no pkg:rpm[epel-#{dist}-x86_64,true])
|
32
|
+
on host, %(#{run_cmd} "cd #{pkg_output_dir}; SIMP_RAKE_MOCK_cleanup=no rake pkg:rpm[epel-#{dist}-x86_64,true]")
|
33
|
+
|
34
|
+
test_name 'produces RPM'
|
35
|
+
on host, %(test -f #{pkg_dest})
|
36
|
+
|
37
|
+
test_name 'produces RPM with appropriate dependencies'
|
38
|
+
on host, %(rpm -qpR #{pkg_dest} | grep -q pupmod-simp-simplib)
|
39
|
+
on host, %(rpm -qp --provides #{pkg_dest} | grep -q "^pupmod-testpackage = 0.0.1-2016$")
|
40
|
+
on host, %(rpm -qp --provides #{pkg_dest} | grep -q "^simp-testpackage = 0.0.1-2016$")
|
41
|
+
on host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{pkg_dest} | grep -q "^pupmod-testpackage")
|
42
|
+
on host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{pkg_dest} | grep -q "^simp-testpackage")
|
43
|
+
|
44
|
+
test_name 'produces RPM with a sourced CHANGELOG'
|
45
|
+
on host, %(rpm --changelog -qp #{pkg_dest} | grep -q Stallman)
|
46
|
+
|
47
|
+
test_name 'keeps mock chroot when SIMP_RAKE_MOCK_cleanup=no'
|
48
|
+
on host, %(test -d /var/lib/mock/epel-#{dist}-x86_64-pupmod-simp-testpackage__build_user)
|
49
|
+
end
|
29
50
|
|
30
|
-
|
51
|
+
it 'should create an RPM and remove the mock directory' do
|
52
|
+
test_name 'runs pkg:rpm'
|
53
|
+
on host, %(#{run_cmd} "cd #{pkg_output_dir}; SIMP_RAKE_MOCK_cleanup=yes rake pkg:rpm[epel-#{dist}-x86_64,true]")
|
31
54
|
|
32
|
-
|
33
|
-
|
55
|
+
test_name 'produces RPM'
|
56
|
+
on host, %(test -f #{pkg_dest})
|
34
57
|
|
35
|
-
|
36
|
-
|
58
|
+
test_name 'deletes mock chroot when SIMP_RAKE_MOCK_cleanup=yes'
|
59
|
+
on host, %(test -d /var/lib/mock/epel-#{dist}-x86_64-pupmod-simp-testpackage__$USER), {:acceptable_exit_codes => [1]}
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
37
63
|
|
38
|
-
|
39
|
-
|
64
|
+
context 'cleanup' do
|
65
|
+
it 'should clean up after itself' do
|
66
|
+
on host, %(#{run_cmd} "cd #{pkg_output_dir}; rake clean")
|
67
|
+
end
|
68
|
+
end
|
40
69
|
end
|
41
70
|
end
|
42
71
|
end
|
@@ -1,23 +1,32 @@
|
|
1
1
|
HOSTS:
|
2
|
-
|
2
|
+
el6-build-server:
|
3
3
|
roles:
|
4
4
|
- default
|
5
5
|
- master
|
6
6
|
- agent
|
7
|
-
|
8
|
-
|
9
|
-
|
7
|
+
- build_server
|
8
|
+
platform: el-6-x86_64
|
9
|
+
hypervisor: docker
|
10
|
+
image: centos:6
|
10
11
|
docker_image_commands:
|
11
|
-
- "echo 'Defaults !requiretty' >> /etc/sudoers"
|
12
12
|
- 'yum install -y epel-release'
|
13
|
+
- "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
|
14
|
+
- "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
|
15
|
+
- 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
|
13
16
|
# simp build-deps
|
14
17
|
- 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel mock rpmdevtools clamav which'
|
18
|
+
- 'usermod -a -G mock build_user'
|
15
19
|
# rvm build-deps
|
16
20
|
- 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
|
17
|
-
- 'gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3'
|
18
|
-
- '
|
19
|
-
- '
|
20
|
-
- '
|
21
|
+
- 'runuser build_user -l -c "gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"'
|
22
|
+
- 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1"'
|
23
|
+
- 'runuser build_user -l -c "rvm use --default 2.1"'
|
24
|
+
- 'runuser build_user -l -c "rvm all do gem install bundler"'
|
25
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc simp-rake-helpers"'
|
26
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc rake"'
|
27
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc json"'
|
28
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc charlock_holmes"'
|
29
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc posix-spawn"'
|
21
30
|
# NOTE: the './' syntax requires BKR-704
|
22
31
|
mount_folders:
|
23
32
|
folder1:
|
@@ -25,32 +34,45 @@ HOSTS:
|
|
25
34
|
host_path: ./
|
26
35
|
container_path: /host_files
|
27
36
|
docker_preserve_image: true
|
37
|
+
|
38
|
+
el7-build-server:
|
39
|
+
roles:
|
40
|
+
- build_server
|
41
|
+
platform: el-7-x86_64
|
42
|
+
hypervisor: docker
|
43
|
+
image: centos:7
|
44
|
+
docker_cmd: '/sbin/sshd; tail -f /dev/null'
|
45
|
+
docker_image_commands:
|
46
|
+
- 'yum install -y epel-release'
|
47
|
+
- 'ln -sf /bin/true /usr/bin/systemctl'
|
48
|
+
- "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
|
49
|
+
- "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
|
50
|
+
- 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
|
51
|
+
# simp build-deps
|
52
|
+
- 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel mock rpmdevtools clamav clamav-update which'
|
53
|
+
- 'usermod -a -G mock build_user'
|
54
|
+
# rvm build-deps
|
55
|
+
- 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
|
56
|
+
- 'runuser build_user -l -c "gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"'
|
57
|
+
- 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1"'
|
58
|
+
- 'runuser build_user -l -c "rvm use --default 2.1"'
|
59
|
+
- 'runuser build_user -l -c "rvm all do gem install bundler"'
|
60
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc simp-rake-helpers"'
|
61
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc json"'
|
62
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc charlock_holmes"'
|
63
|
+
- 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc posix-spawn"'
|
64
|
+
# NOTE: the './' syntax requires BKR-704
|
65
|
+
mount_folders:
|
66
|
+
folder1:
|
67
|
+
# must be an absolute path, seemingly
|
68
|
+
host_path: ./
|
69
|
+
container_path: /host_files
|
70
|
+
docker_preserve_image: true
|
71
|
+
ssh:
|
72
|
+
password: root
|
73
|
+
auth_methods:
|
74
|
+
- password
|
75
|
+
|
28
76
|
CONFIG:
|
29
77
|
log_level: verbose
|
30
78
|
type: foss
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
# - 'sed -i "s/UsePAM.*/UsePAM yes/g" /etc/ssh/sshd_config'
|
53
|
-
# - 'sed -i "s/#UsePrivilegeSeparation.*/UsePrivilegeSeparation no/g" /etc/ssh/sshd_config'
|
54
|
-
# - "ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ''"
|
55
|
-
# - "ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''"
|
56
|
-
#docker_cmd: '["/usr/sbin/sshd -e"]'
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: simp-rake-helpers
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.4.
|
4
|
+
version: 2.4.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chris Tessmer
|
@@ -9,368 +9,368 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2016-07-
|
12
|
+
date: 2016-07-28 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
17
17
|
requirements:
|
18
|
-
- -
|
18
|
+
- - ~>
|
19
19
|
- !ruby/object:Gem::Version
|
20
20
|
version: '1.0'
|
21
21
|
type: :runtime
|
22
22
|
prerelease: false
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
24
24
|
requirements:
|
25
|
-
- -
|
25
|
+
- - ~>
|
26
26
|
- !ruby/object:Gem::Version
|
27
27
|
version: '1.0'
|
28
28
|
- !ruby/object:Gem::Dependency
|
29
29
|
name: rake
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
31
31
|
requirements:
|
32
|
-
- -
|
32
|
+
- - '>='
|
33
33
|
- !ruby/object:Gem::Version
|
34
34
|
version: '10.0'
|
35
|
-
- -
|
35
|
+
- - <
|
36
36
|
- !ruby/object:Gem::Version
|
37
37
|
version: '12.0'
|
38
38
|
type: :runtime
|
39
39
|
prerelease: false
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
41
41
|
requirements:
|
42
|
-
- -
|
42
|
+
- - '>='
|
43
43
|
- !ruby/object:Gem::Version
|
44
44
|
version: '10.0'
|
45
|
-
- -
|
45
|
+
- - <
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '12.0'
|
48
48
|
- !ruby/object:Gem::Dependency
|
49
49
|
name: coderay
|
50
50
|
requirement: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - ~>
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '1.0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
57
|
version_requirements: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
59
|
+
- - ~>
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '1.0'
|
62
62
|
- !ruby/object:Gem::Dependency
|
63
63
|
name: puppet
|
64
64
|
requirement: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- -
|
66
|
+
- - '>='
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '3.0'
|
69
69
|
type: :runtime
|
70
70
|
prerelease: false
|
71
71
|
version_requirements: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- -
|
73
|
+
- - '>='
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: '3.0'
|
76
76
|
- !ruby/object:Gem::Dependency
|
77
77
|
name: puppet-lint
|
78
78
|
requirement: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- -
|
80
|
+
- - ~>
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '1.0'
|
83
83
|
type: :runtime
|
84
84
|
prerelease: false
|
85
85
|
version_requirements: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- -
|
87
|
+
- - ~>
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: '1.0'
|
90
90
|
- !ruby/object:Gem::Dependency
|
91
91
|
name: puppetlabs_spec_helper
|
92
92
|
requirement: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- -
|
94
|
+
- - ~>
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '0.0'
|
97
97
|
type: :runtime
|
98
98
|
prerelease: false
|
99
99
|
version_requirements: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- -
|
101
|
+
- - ~>
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: '0.0'
|
104
104
|
- !ruby/object:Gem::Dependency
|
105
105
|
name: parallel
|
106
106
|
requirement: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- -
|
108
|
+
- - ~>
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '1.0'
|
111
111
|
type: :runtime
|
112
112
|
prerelease: false
|
113
113
|
version_requirements: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- -
|
115
|
+
- - ~>
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: '1.0'
|
118
118
|
- !ruby/object:Gem::Dependency
|
119
119
|
name: simp-rspec-puppet-facts
|
120
120
|
requirement: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
|
-
- -
|
122
|
+
- - ~>
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: '1.0'
|
125
125
|
type: :runtime
|
126
126
|
prerelease: false
|
127
127
|
version_requirements: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
|
-
- -
|
129
|
+
- - ~>
|
130
130
|
- !ruby/object:Gem::Version
|
131
131
|
version: '1.0'
|
132
132
|
- !ruby/object:Gem::Dependency
|
133
133
|
name: puppet-blacksmith
|
134
134
|
requirement: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
|
-
- -
|
136
|
+
- - ~>
|
137
137
|
- !ruby/object:Gem::Version
|
138
138
|
version: '3.3'
|
139
139
|
type: :runtime
|
140
140
|
prerelease: false
|
141
141
|
version_requirements: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
|
-
- -
|
143
|
+
- - ~>
|
144
144
|
- !ruby/object:Gem::Version
|
145
145
|
version: '3.3'
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: simp-beaker-helpers
|
148
148
|
requirement: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
|
-
- -
|
150
|
+
- - ~>
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '1.0'
|
153
153
|
type: :runtime
|
154
154
|
prerelease: false
|
155
155
|
version_requirements: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
|
-
- -
|
157
|
+
- - ~>
|
158
158
|
- !ruby/object:Gem::Version
|
159
159
|
version: '1.0'
|
160
160
|
- !ruby/object:Gem::Dependency
|
161
161
|
name: parallel_tests
|
162
162
|
requirement: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
|
-
- -
|
164
|
+
- - ~>
|
165
165
|
- !ruby/object:Gem::Version
|
166
166
|
version: '2.4'
|
167
167
|
type: :runtime
|
168
168
|
prerelease: false
|
169
169
|
version_requirements: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
|
-
- -
|
171
|
+
- - ~>
|
172
172
|
- !ruby/object:Gem::Version
|
173
173
|
version: '2.4'
|
174
174
|
- !ruby/object:Gem::Dependency
|
175
175
|
name: r10k
|
176
176
|
requirement: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
|
-
- -
|
178
|
+
- - ~>
|
179
179
|
- !ruby/object:Gem::Version
|
180
180
|
version: '2.2'
|
181
181
|
type: :runtime
|
182
182
|
prerelease: false
|
183
183
|
version_requirements: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
|
-
- -
|
185
|
+
- - ~>
|
186
186
|
- !ruby/object:Gem::Version
|
187
187
|
version: '2.2'
|
188
188
|
- !ruby/object:Gem::Dependency
|
189
189
|
name: pager
|
190
190
|
requirement: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
|
-
- -
|
192
|
+
- - '>='
|
193
193
|
- !ruby/object:Gem::Version
|
194
194
|
version: '0'
|
195
195
|
type: :runtime
|
196
196
|
prerelease: false
|
197
197
|
version_requirements: !ruby/object:Gem::Requirement
|
198
198
|
requirements:
|
199
|
-
- -
|
199
|
+
- - '>='
|
200
200
|
- !ruby/object:Gem::Version
|
201
201
|
version: '0'
|
202
202
|
- !ruby/object:Gem::Dependency
|
203
203
|
name: rspec
|
204
204
|
requirement: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
|
-
- -
|
206
|
+
- - ~>
|
207
207
|
- !ruby/object:Gem::Version
|
208
208
|
version: '3.0'
|
209
209
|
type: :runtime
|
210
210
|
prerelease: false
|
211
211
|
version_requirements: !ruby/object:Gem::Requirement
|
212
212
|
requirements:
|
213
|
-
- -
|
213
|
+
- - ~>
|
214
214
|
- !ruby/object:Gem::Version
|
215
215
|
version: '3.0'
|
216
216
|
- !ruby/object:Gem::Dependency
|
217
217
|
name: beaker
|
218
218
|
requirement: !ruby/object:Gem::Requirement
|
219
219
|
requirements:
|
220
|
-
- -
|
220
|
+
- - ~>
|
221
221
|
- !ruby/object:Gem::Version
|
222
222
|
version: '2.0'
|
223
223
|
type: :runtime
|
224
224
|
prerelease: false
|
225
225
|
version_requirements: !ruby/object:Gem::Requirement
|
226
226
|
requirements:
|
227
|
-
- -
|
227
|
+
- - ~>
|
228
228
|
- !ruby/object:Gem::Version
|
229
229
|
version: '2.0'
|
230
230
|
- !ruby/object:Gem::Dependency
|
231
231
|
name: beaker-rspec
|
232
232
|
requirement: !ruby/object:Gem::Requirement
|
233
233
|
requirements:
|
234
|
-
- -
|
234
|
+
- - ~>
|
235
235
|
- !ruby/object:Gem::Version
|
236
236
|
version: '5.0'
|
237
237
|
type: :runtime
|
238
238
|
prerelease: false
|
239
239
|
version_requirements: !ruby/object:Gem::Requirement
|
240
240
|
requirements:
|
241
|
-
- -
|
241
|
+
- - ~>
|
242
242
|
- !ruby/object:Gem::Version
|
243
243
|
version: '5.0'
|
244
244
|
- !ruby/object:Gem::Dependency
|
245
245
|
name: rspec-core
|
246
246
|
requirement: !ruby/object:Gem::Requirement
|
247
247
|
requirements:
|
248
|
-
- -
|
248
|
+
- - ~>
|
249
249
|
- !ruby/object:Gem::Version
|
250
250
|
version: '3.0'
|
251
251
|
type: :runtime
|
252
252
|
prerelease: false
|
253
253
|
version_requirements: !ruby/object:Gem::Requirement
|
254
254
|
requirements:
|
255
|
-
- -
|
255
|
+
- - ~>
|
256
256
|
- !ruby/object:Gem::Version
|
257
257
|
version: '3.0'
|
258
258
|
- !ruby/object:Gem::Dependency
|
259
259
|
name: listen
|
260
260
|
requirement: !ruby/object:Gem::Requirement
|
261
261
|
requirements:
|
262
|
-
- -
|
262
|
+
- - ~>
|
263
263
|
- !ruby/object:Gem::Version
|
264
264
|
version: 3.0.6
|
265
265
|
type: :runtime
|
266
266
|
prerelease: false
|
267
267
|
version_requirements: !ruby/object:Gem::Requirement
|
268
268
|
requirements:
|
269
|
-
- -
|
269
|
+
- - ~>
|
270
270
|
- !ruby/object:Gem::Version
|
271
271
|
version: 3.0.6
|
272
272
|
- !ruby/object:Gem::Dependency
|
273
273
|
name: gitlog-md
|
274
274
|
requirement: !ruby/object:Gem::Requirement
|
275
275
|
requirements:
|
276
|
-
- -
|
276
|
+
- - ~>
|
277
277
|
- !ruby/object:Gem::Version
|
278
278
|
version: '0'
|
279
279
|
type: :development
|
280
280
|
prerelease: false
|
281
281
|
version_requirements: !ruby/object:Gem::Requirement
|
282
282
|
requirements:
|
283
|
-
- -
|
283
|
+
- - ~>
|
284
284
|
- !ruby/object:Gem::Version
|
285
285
|
version: '0'
|
286
286
|
- !ruby/object:Gem::Dependency
|
287
287
|
name: pry
|
288
288
|
requirement: !ruby/object:Gem::Requirement
|
289
289
|
requirements:
|
290
|
-
- -
|
290
|
+
- - ~>
|
291
291
|
- !ruby/object:Gem::Version
|
292
292
|
version: '0.0'
|
293
293
|
type: :development
|
294
294
|
prerelease: false
|
295
295
|
version_requirements: !ruby/object:Gem::Requirement
|
296
296
|
requirements:
|
297
|
-
- -
|
297
|
+
- - ~>
|
298
298
|
- !ruby/object:Gem::Version
|
299
299
|
version: '0.0'
|
300
300
|
- !ruby/object:Gem::Dependency
|
301
301
|
name: pry-doc
|
302
302
|
requirement: !ruby/object:Gem::Requirement
|
303
303
|
requirements:
|
304
|
-
- -
|
304
|
+
- - ~>
|
305
305
|
- !ruby/object:Gem::Version
|
306
306
|
version: '0.0'
|
307
307
|
type: :development
|
308
308
|
prerelease: false
|
309
309
|
version_requirements: !ruby/object:Gem::Requirement
|
310
310
|
requirements:
|
311
|
-
- -
|
311
|
+
- - ~>
|
312
312
|
- !ruby/object:Gem::Version
|
313
313
|
version: '0.0'
|
314
314
|
- !ruby/object:Gem::Dependency
|
315
315
|
name: highline
|
316
316
|
requirement: !ruby/object:Gem::Requirement
|
317
317
|
requirements:
|
318
|
-
- -
|
318
|
+
- - ~>
|
319
319
|
- !ruby/object:Gem::Version
|
320
320
|
version: '1.6'
|
321
|
-
- -
|
321
|
+
- - '>'
|
322
322
|
- !ruby/object:Gem::Version
|
323
323
|
version: 1.6.1
|
324
324
|
type: :development
|
325
325
|
prerelease: false
|
326
326
|
version_requirements: !ruby/object:Gem::Requirement
|
327
327
|
requirements:
|
328
|
-
- -
|
328
|
+
- - ~>
|
329
329
|
- !ruby/object:Gem::Version
|
330
330
|
version: '1.6'
|
331
|
-
- -
|
331
|
+
- - '>'
|
332
332
|
- !ruby/object:Gem::Version
|
333
333
|
version: 1.6.1
|
334
334
|
- !ruby/object:Gem::Dependency
|
335
335
|
name: guard
|
336
336
|
requirement: !ruby/object:Gem::Requirement
|
337
337
|
requirements:
|
338
|
-
- -
|
338
|
+
- - ~>
|
339
339
|
- !ruby/object:Gem::Version
|
340
340
|
version: '2.0'
|
341
341
|
type: :development
|
342
342
|
prerelease: false
|
343
343
|
version_requirements: !ruby/object:Gem::Requirement
|
344
344
|
requirements:
|
345
|
-
- -
|
345
|
+
- - ~>
|
346
346
|
- !ruby/object:Gem::Version
|
347
347
|
version: '2.0'
|
348
348
|
- !ruby/object:Gem::Dependency
|
349
349
|
name: guard-shell
|
350
350
|
requirement: !ruby/object:Gem::Requirement
|
351
351
|
requirements:
|
352
|
-
- -
|
352
|
+
- - ~>
|
353
353
|
- !ruby/object:Gem::Version
|
354
354
|
version: '0.0'
|
355
355
|
type: :development
|
356
356
|
prerelease: false
|
357
357
|
version_requirements: !ruby/object:Gem::Requirement
|
358
358
|
requirements:
|
359
|
-
- -
|
359
|
+
- - ~>
|
360
360
|
- !ruby/object:Gem::Version
|
361
361
|
version: '0.0'
|
362
362
|
- !ruby/object:Gem::Dependency
|
363
363
|
name: guard-rspec
|
364
364
|
requirement: !ruby/object:Gem::Requirement
|
365
365
|
requirements:
|
366
|
-
- -
|
366
|
+
- - ~>
|
367
367
|
- !ruby/object:Gem::Version
|
368
368
|
version: '4.0'
|
369
369
|
type: :development
|
370
370
|
prerelease: false
|
371
371
|
version_requirements: !ruby/object:Gem::Requirement
|
372
372
|
requirements:
|
373
|
-
- -
|
373
|
+
- - ~>
|
374
374
|
- !ruby/object:Gem::Version
|
375
375
|
version: '4.0'
|
376
376
|
description: |2
|
@@ -380,9 +380,9 @@ executables: []
|
|
380
380
|
extensions: []
|
381
381
|
extra_rdoc_files: []
|
382
382
|
files:
|
383
|
-
-
|
384
|
-
-
|
385
|
-
-
|
383
|
+
- .gitignore
|
384
|
+
- .rspec
|
385
|
+
- .travis.yml
|
386
386
|
- CHANGELOG.md
|
387
387
|
- CONTRIBUTING.md
|
388
388
|
- Gemfile
|
@@ -414,8 +414,10 @@ files:
|
|
414
414
|
- lib/simp/rake/pupmod/helpers.rb
|
415
415
|
- lib/simp/rake/rubygem.rb
|
416
416
|
- lib/simp/rpm.rb
|
417
|
+
- spec/acceptance/files/testpackage/CHANGELOG
|
417
418
|
- spec/acceptance/files/testpackage/Rakefile
|
418
|
-
- spec/acceptance/files/testpackage/build/
|
419
|
+
- spec/acceptance/files/testpackage/build/rpm_metadata/requires
|
420
|
+
- spec/acceptance/files/testpackage/metadata.json
|
419
421
|
- spec/acceptance/mock_tests_spec.rb
|
420
422
|
- spec/acceptance/nodesets/default.yml
|
421
423
|
- spec/lib/simp/files/build/testpackage.spec
|
@@ -440,12 +442,12 @@ require_paths:
|
|
440
442
|
- lib
|
441
443
|
required_ruby_version: !ruby/object:Gem::Requirement
|
442
444
|
requirements:
|
443
|
-
- -
|
445
|
+
- - '>='
|
444
446
|
- !ruby/object:Gem::Version
|
445
447
|
version: '0'
|
446
448
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
447
449
|
requirements:
|
448
|
-
- -
|
450
|
+
- - '>='
|
449
451
|
- !ruby/object:Gem::Version
|
450
452
|
version: '0'
|
451
453
|
requirements: []
|
@@ -455,4 +457,3 @@ signing_key:
|
|
455
457
|
specification_version: 4
|
456
458
|
summary: SIMP rake helpers
|
457
459
|
test_files: []
|
458
|
-
has_rdoc:
|
@@ -1,32 +0,0 @@
|
|
1
|
-
Name: testpackage
|
2
|
-
Version: 1
|
3
|
-
Release: 0
|
4
|
-
Summary: dummy test package
|
5
|
-
BuildArch: noarch
|
6
|
-
|
7
|
-
License: Apache-2.0
|
8
|
-
URL: http://foo.bar
|
9
|
-
|
10
|
-
%description
|
11
|
-
A dummy package used to test Simp::RPM methods
|
12
|
-
|
13
|
-
%prep
|
14
|
-
exit 0
|
15
|
-
|
16
|
-
%build
|
17
|
-
exit 0
|
18
|
-
|
19
|
-
|
20
|
-
%install
|
21
|
-
exit 0
|
22
|
-
|
23
|
-
%clean
|
24
|
-
exit 0
|
25
|
-
|
26
|
-
%files
|
27
|
-
%doc
|
28
|
-
|
29
|
-
|
30
|
-
%changelog
|
31
|
-
* Wed Jun 10 2015 nobody
|
32
|
-
- some comment
|