simp-rake-helpers 5.12.1 → 5.12.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3 -0
- data/Gemfile +0 -3
- data/README.md +2 -37
- data/Rakefile +2 -3
- data/lib/simp/rake/helpers/assets/rpm_spec/simp6.spec +3 -3
- data/lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec +3 -3
- data/lib/simp/rake/helpers/version.rb +1 -1
- data/spec/acceptance/nodesets/default.yml +0 -16
- data/spec/acceptance/{00_pkg_rpm_custom_scriptlets_spec.rb → suites/default/00_pkg_rpm_custom_scriptlets_spec.rb} +3 -3
- data/spec/acceptance/{10_pkg_rpm_spec.rb → suites/default/10_pkg_rpm_spec.rb} +4 -4
- data/spec/acceptance/{30_pkg_misc_spec.rb → suites/default/30_pkg_misc_spec.rb} +1 -1
- data/spec/acceptance/{50_local_gpg_signing_key_spec.rb → suites/default/50_local_gpg_signing_key_spec.rb} +0 -0
- data/spec/acceptance/{55_build_pkg_signing_spec.rb → suites/default/55_build_pkg_signing_spec.rb} +1 -1
- data/spec/acceptance/{development → suites/default/development}/docker_env.sh +0 -0
- data/spec/acceptance/{development → suites/default/development}/rerun_acceptance_tests.sh +0 -0
- data/spec/acceptance/{development → suites/default/development}/vagrant_rsync.sh +0 -0
- data/spec/acceptance/{files → suites/default/files}/asset/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/asset/build/asset.spec +0 -0
- data/spec/acceptance/{files → suites/default/files}/asset_with_misordered_entries/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/asset_with_misordered_entries/build/asset_with_misordered_entries.spec +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/pkg/gpg-keydir.expired.2018-04-06/RPM-GPG-KEY-SIMP-Dev +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/pkg/gpg-keydir.expired.2018-04-06/gengpgkey +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/pkg/gpg-keydir.expired.2018-04-06/pubring.gpg +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/pkg/gpg-keydir.expired.2018-04-06/random_seed +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/pkg/gpg-keydir.expired.2018-04-06/run_gpg_agent +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/pkg/gpg-keydir.expired.2018-04-06/secring.gpg +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/pkg/gpg-keydir.expired.2018-04-06/trustdb.gpg +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/project_skeleton/Puppetfile.tracking +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/project_skeleton/README.md +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/project_skeleton/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/build/project_skeleton/src/assets/simp/build/simp.spec +0 -0
- data/spec/acceptance/{files → suites/default/files}/module/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/module/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/module/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/module_with_misordered_entries/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/module_with_misordered_entries/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/module_with_misordered_entries/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/simplib/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/simplib/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/simplib/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/simplib/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage/README +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage/spec/classes/init_spec.rb +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage/spec/files/mock_something.rb +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage/utils/convert_v1_to_v2.rb +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_custom_scriptlet/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_custom_scriptlet/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_custom_scriptlet/build/rpm_metadata/custom/overrides +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_custom_scriptlet/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_custom_scriptlet/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_license/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_license/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_license/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_license/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_metadata_file/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_metadata_file/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_metadata_file/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_name/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_name/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_name/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_name/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_source/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_source/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_source/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_source/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_summary/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_summary/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_summary/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_summary/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_version/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_version/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_version/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_missing_version/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_bad_changelog_date/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_bad_changelog_date/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_bad_changelog_date/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_bad_changelog_date/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_release/CHANGELOG +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_release/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_release/build/rpm_metadata/release +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_release/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_with_release/metadata.json +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_without_changelog/Rakefile +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_without_changelog/build/rpm_metadata/requires +0 -0
- data/spec/acceptance/{files → suites/default/files}/testpackage_without_changelog/metadata.json +0 -0
- data/spec/acceptance/{support → suites/default/support}/build_project_helpers.rb +1 -1
- data/spec/acceptance/{support → suites/default/support}/build_user_helpers.rb +0 -0
- data/spec/acceptance/{support → suites/default/support}/pkg_rpm_helpers.rb +0 -0
- data/spec/spec_helper_acceptance.rb +4 -0
- metadata +86 -88
- data/lib/simp/rake/helpers/assets/rpm_spec/simp4.spec +0 -388
- data/lib/simp/rake/helpers/assets/rpm_spec/simp5.spec +0 -388
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4da7d0cf624209586f4a159cd06bf86cc61da199ddecc3d2730e53a267225316
|
4
|
+
data.tar.gz: 44fcb7049d7a6a39b433e88de24894db6817fc06620fddc6ac7f67d3481c6a42
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6f4a80dd4864f3ade29b60932b83d87b8d2fd56384fd03bc5df9de9a03f70f54445333e3654b3d2225d67e0ffdc5f1f772c5a23908a0ea40378c648043c00fb2
|
7
|
+
data.tar.gz: 862aaaac472efde1959b314d66ddb254379be34f2ecbfa1f4715fc58882010fcfc14c5caf41a090947b2d3955b2c27eb146bec1b2236a817caebc95ada01f857
|
data/CHANGELOG.md
CHANGED
data/Gemfile
CHANGED
@@ -13,9 +13,6 @@ gem 'simp-build-helpers'
|
|
13
13
|
gem 'simp-beaker-helpers'
|
14
14
|
gem 'beaker-puppet_install_helper'
|
15
15
|
gem 'rake', '>= 12.3.3'
|
16
|
-
# You'll need the following if using podman until they are released upstream
|
17
|
-
#gem 'beaker-docker', :git => 'https://github.com/trevor-vaughan/beaker-docker', :branch => 'support_rootless_podman'
|
18
|
-
#gem 'docker-api', :git => 'https://github.com/trevor-vaughan/docker-api', :branch => 'podman-compat'
|
19
16
|
gem 'beaker-docker'
|
20
17
|
|
21
18
|
if puppetversion
|
data/README.md
CHANGED
@@ -26,7 +26,6 @@
|
|
26
26
|
* [`rake pkg:rpm`](#rake-pkgrpm)
|
27
27
|
* [`rake pkg:tar`](#rake-pkgtar)
|
28
28
|
* [Limitations](#limitations)
|
29
|
-
* [Some versions of bundler fail on FIPS-enabled Systems](#some-versions-of-bundler-fail-on-fips-enabled-systems)
|
30
29
|
* [Development](#development)
|
31
30
|
* [License](#license)
|
32
31
|
* [History](#history)
|
@@ -66,25 +65,6 @@ group :test do
|
|
66
65
|
gem 'puppet', puppetversion
|
67
66
|
gem 'beaker-rspec'
|
68
67
|
gem 'vagrant-wrapper'
|
69
|
-
|
70
|
-
# Puppet 4+ has issues with Hiera 3.1+
|
71
|
-
if puppetversion.to_s =~ />(\d+)/
|
72
|
-
pversion = $1
|
73
|
-
else
|
74
|
-
pversion = puppetversion
|
75
|
-
end
|
76
|
-
|
77
|
-
if Gem::Dependency.new('puppet', '~> 4.0').match?('puppet', pversion)
|
78
|
-
gem 'hiera', '~> 3.0.0'
|
79
|
-
end
|
80
|
-
|
81
|
-
# simp-rake-helpers does not suport puppet 2.7.X
|
82
|
-
if "#{ENV['PUPPET_VERSION']}".scan(/\d+/).first != '2' &&
|
83
|
-
# simp-rake-helpers and ruby 1.8.7 bomb Travis tests
|
84
|
-
# TODO: fix upstream deps (parallel in simp-rake-helpers)
|
85
|
-
RUBY_VERSION.sub(/\.\d+$/,'') != '1.8'
|
86
|
-
gem 'simp-rake-helpers'
|
87
|
-
end
|
88
68
|
end
|
89
69
|
```
|
90
70
|
|
@@ -164,7 +144,7 @@ directory . The full list of files considered are:
|
|
164
144
|
├── CHANGELOG # OPTIONAL written in RPM's CHANGELOG format
|
165
145
|
└── build/ # OPTIONAL
|
166
146
|
└── rpm_metadata/ # OPTIONAL
|
167
|
-
├── release # OPTIONAL defines the RPM's "
|
147
|
+
├── release # OPTIONAL defines the RPM's "-<qualifier>" release qualifier
|
168
148
|
├── requires # OPTIONAL supplementary 'Requires','Provides','Obsoletes'
|
169
149
|
└── custom/ # OPTIONAL
|
170
150
|
└── * # OPTIONAL custom snippets in RPM .spec format
|
@@ -187,7 +167,7 @@ level of the project, if it exists.
|
|
187
167
|
|
188
168
|
Example:
|
189
169
|
|
190
|
-
* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0
|
170
|
+
* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0
|
191
171
|
- Add feature x
|
192
172
|
|
193
173
|
**Important:** Note the leading zero in "`Nov 05`". It is a convention
|
@@ -227,21 +207,6 @@ Build the tar package for the current SIMP project
|
|
227
207
|
|
228
208
|
## Limitations
|
229
209
|
|
230
|
-
### Some versions of bundler fail on FIPS-enabled Systems
|
231
|
-
|
232
|
-
This is a limitation of Bundler, not the gem.
|
233
|
-
|
234
|
-
If you are running on a FIPS-enabled system, you will need to use
|
235
|
-
`bundler '~> 1.14.0'` or `bundler '~> 1.16'`
|
236
|
-
|
237
|
-
If you are using RVM, the appropriate steps are as follows:
|
238
|
-
|
239
|
-
```shell
|
240
|
-
rm Gemfile.lock ||:
|
241
|
-
rvm @global do gem uninstall bundler -a -x
|
242
|
-
rvm @global do gem install bundler -v '~> 1.14.0'
|
243
|
-
```
|
244
|
-
|
245
210
|
## Development
|
246
211
|
|
247
212
|
Please see the [SIMP Contribution Guidelines](https://simp-project.atlassian.net/wiki/display/SD/Contributing+to+SIMP).
|
data/Rakefile
CHANGED
@@ -1,5 +1,3 @@
|
|
1
|
-
# -*- ruby -*-
|
2
|
-
|
3
1
|
require "rubygems"
|
4
2
|
require 'rake/clean'
|
5
3
|
require 'find'
|
@@ -12,5 +10,6 @@ require 'rspec/core/rake_task'
|
|
12
10
|
require 'simp/rake/rubygem'
|
13
11
|
Simp::Rake::Rubygem.new(@package, @rakefile_dir)
|
14
12
|
|
13
|
+
require 'simp/rake/beaker'
|
15
14
|
|
16
|
-
|
15
|
+
Simp::Rake::Beaker.new(Dir.pwd)
|
@@ -106,8 +106,8 @@ package_name = "UNKNOWN"
|
|
106
106
|
package_version = "UNKNOWN"
|
107
107
|
module_license = "UNKNOWN"
|
108
108
|
|
109
|
-
-- Default to
|
110
|
-
package_release =
|
109
|
+
-- Default to 1
|
110
|
+
package_release = 1
|
111
111
|
|
112
112
|
lua_stderr("\n")
|
113
113
|
lua_stderr("--------------------------------------------------------------------------------\n")
|
@@ -202,7 +202,7 @@ end
|
|
202
202
|
-- only accepts release in SemVer \d+\.\d+\.\d+ release format)
|
203
203
|
--
|
204
204
|
-- This code will remove a '-rc0' style prerelease string from the RPM
|
205
|
-
-- Version, and use it as the default RPM Release (instead of '-
|
205
|
+
-- Version, and use it as the default RPM Release (instead of '-1')
|
206
206
|
|
207
207
|
local version_match = metadata:match('"version":%s+"(.-)"%s*,'):gsub('-.*','')
|
208
208
|
if version_match then
|
@@ -106,8 +106,8 @@ package_name = "UNKNOWN"
|
|
106
106
|
package_version = "UNKNOWN"
|
107
107
|
module_license = "UNKNOWN"
|
108
108
|
|
109
|
-
-- Default to
|
110
|
-
package_release =
|
109
|
+
-- Default to 1
|
110
|
+
package_release = 1
|
111
111
|
|
112
112
|
lua_stderr("\n")
|
113
113
|
lua_stderr("--------------------------------------------------------------------------------\n")
|
@@ -202,7 +202,7 @@ end
|
|
202
202
|
-- only accepts release in SemVer \d+\.\d+\.\d+ release format)
|
203
203
|
--
|
204
204
|
-- This code will remove a '-rc0' style prerelease string from the RPM
|
205
|
-
-- Version, and use it as the default RPM Release (instead of '-
|
205
|
+
-- Version, and use it as the default RPM Release (instead of '-1')
|
206
206
|
|
207
207
|
local version_match = metadata:match('"version":%s+"(.-)"%s*,'):gsub('-.*','')
|
208
208
|
if version_match then
|
@@ -30,23 +30,7 @@ CONFIG:
|
|
30
30
|
auth_methods:
|
31
31
|
- password
|
32
32
|
docker_preserve_image: true
|
33
|
-
# This is necessary for pretty much all containers
|
34
|
-
docker_cap_add:
|
35
|
-
- AUDIT_WRITE
|
36
33
|
mount_folders:
|
37
34
|
host_files:
|
38
35
|
host_path: ./
|
39
36
|
container_path: /host_files
|
40
|
-
# All items below this point are required for systemd
|
41
|
-
cgroup:
|
42
|
-
host_path: /sys/fs/cgroup
|
43
|
-
container_path: /sys/fs/cgroup
|
44
|
-
opts: 'ro'
|
45
|
-
dockeropts:
|
46
|
-
HostConfig:
|
47
|
-
Tmpfs:
|
48
|
-
'/run': 'rw,noexec,nosuid,nodev,size=65536k'
|
49
|
-
'/run/lock': 'rw,noexec,nosuid,nodev,size=65536k'
|
50
|
-
'/tmp': 'rw,exec,nosuid,nodev,size=65536k'
|
51
|
-
'/sys/fs/cgroup/systemd': 'rw,size=65536k'
|
52
|
-
'/var/log/journal': 'rw,noexec,nodev,nosuid,size=65536k'
|
@@ -11,7 +11,7 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
|
|
11
11
|
scriptlets = rpm_scriptlets_for(
|
12
12
|
host,
|
13
13
|
"#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
|
14
|
-
'pupmod-simp-testpackage-0.0.1-
|
14
|
+
'pupmod-simp-testpackage-0.0.1-1.noarch.rpm'
|
15
15
|
)
|
16
16
|
|
17
17
|
comment '...the expected scriptlet types are present'
|
@@ -69,7 +69,7 @@ shared_examples_for 'an RPM generator with customized triggers' do
|
|
69
69
|
triggers = rpm_triggers_for(
|
70
70
|
host,
|
71
71
|
"#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
|
72
|
-
'pupmod-simp-testpackage-0.0.1-
|
72
|
+
'pupmod-simp-testpackage-0.0.1-1.noarch.rpm'
|
73
73
|
)
|
74
74
|
|
75
75
|
|
@@ -101,7 +101,7 @@ describe 'rake pkg:rpm with customized content' do
|
|
101
101
|
copy_host_files_into_build_user_homedir(hosts)
|
102
102
|
end
|
103
103
|
|
104
|
-
let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/files'}
|
104
|
+
let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/suites/default/files'}
|
105
105
|
let(:testpackage_dir){"#{pkg_root_dir}/testpackage"}
|
106
106
|
|
107
107
|
hosts.each do |_host|
|
@@ -80,7 +80,7 @@ describe 'rake pkg:rpm' do
|
|
80
80
|
|
81
81
|
context 'rpm building' do
|
82
82
|
|
83
|
-
let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/files'}
|
83
|
+
let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/suites/default/files'}
|
84
84
|
let(:testpackage_dir){"#{pkg_root_dir}/testpackage"}
|
85
85
|
|
86
86
|
it 'can prep the package directories' do
|
@@ -107,7 +107,7 @@ describe 'rake pkg:rpm' do
|
|
107
107
|
context 'using simpdefault.spec' do
|
108
108
|
|
109
109
|
let(:build_type) {:default}
|
110
|
-
let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-
|
110
|
+
let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-1.noarch.rpm') }
|
111
111
|
|
112
112
|
it 'should create an RPM' do
|
113
113
|
comment "produces RPM on #{host}"
|
@@ -119,8 +119,8 @@ describe 'rake pkg:rpm' do
|
|
119
119
|
on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-foo), :acceptable_exit_codes => [1]
|
120
120
|
on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-simplib)
|
121
121
|
on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-puppetlabs-stdlib)
|
122
|
-
on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'pupmod-testpackage = 0.0.1-
|
123
|
-
on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'simp-testpackage = 0.0.1-
|
122
|
+
on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'pupmod-testpackage = 0.0.1-1')
|
123
|
+
on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'simp-testpackage = 0.0.1-1')
|
124
124
|
on host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^pupmod-testpackage")
|
125
125
|
on host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^simp-testpackage")
|
126
126
|
|
@@ -40,7 +40,7 @@ describe 'rake pkg:check_rpm_changelog' do
|
|
40
40
|
hosts.each do |_host|
|
41
41
|
context "on #{_host}" do
|
42
42
|
let!(:host){ _host }
|
43
|
-
let(:pkg_root_dir) { '/home/build_user/host_files/spec/acceptance/files' }
|
43
|
+
let(:pkg_root_dir) { '/home/build_user/host_files/spec/acceptance/suites/default/files' }
|
44
44
|
|
45
45
|
it 'can prep the package directories' do
|
46
46
|
testpackages = [
|
File without changes
|
data/spec/acceptance/{55_build_pkg_signing_spec.rb → suites/default/55_build_pkg_signing_spec.rb}
RENAMED
@@ -85,7 +85,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
|
|
85
85
|
# NOTE: This expired keydir actually works on EL7 and EL8, even though
|
86
86
|
# the newer gpg version creates different files than those in this
|
87
87
|
# directory.
|
88
|
-
"#{build_user_host_files}/spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06"
|
88
|
+
"#{build_user_host_files}/spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06"
|
89
89
|
end
|
90
90
|
|
91
91
|
shared_examples 'it does not leave the gpg-agent daemon running' do
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/build/project_skeleton/Puppetfile.tracking
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/module_with_misordered_entries/CHANGELOG
RENAMED
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/module_with_misordered_entries/metadata.json
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage/spec/files/mock_something.rb
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_custom_scriptlet/metadata.json
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_missing_license/metadata.json
RENAMED
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_missing_metadata_file/CHANGELOG
RENAMED
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_missing_metadata_file/Rakefile
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_missing_source/metadata.json
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_missing_summary/metadata.json
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_missing_version/metadata.json
RENAMED
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_with_bad_changelog_date/CHANGELOG
RENAMED
File without changes
|
data/spec/acceptance/{files → suites/default/files}/testpackage_with_bad_changelog_date/Rakefile
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|