simp-beaker-helpers 1.24.2 → 1.24.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/tag_deploy_rubygem.yml +28 -16
- data/CHANGELOG.md +4 -0
- data/lib/simp/beaker_helpers/ssg.rb +4 -2
- data/lib/simp/beaker_helpers/version.rb +1 -1
- data/spec/acceptance/nodesets/default.yml +0 -8
- data/spec/acceptance/suites/default/nodesets +1 -1
- data/spec/acceptance/suites/fips_from_fixtures/nodesets +1 -1
- data/spec/acceptance/suites/inspec/nodesets +1 -1
- data/spec/acceptance/suites/snapshot/nodesets +1 -1
- data/spec/acceptance/suites/ssg/nodesets +1 -1
- metadata +44 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f276688200465dbee32f6af8cf2e31a665004ab297b5b0d664d94289d198c0db
|
4
|
+
data.tar.gz: 64c8554ce99bb2bd90b77cfdf08347e484c50ed5729fdb1920c19d9b268115bc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a47fe8210f0b72074befb37c61f09bec2ac90e3e967e677c7fcbee20f1f72c2b66216553b0caaaaee6ecf593e39fba7ce82ec260dca0f0d9d3a3499d41e7cc54
|
7
|
+
data.tar.gz: bbe694671ca0ce55f70075bb40260ca114b10937294558318b164bd94e60f3c1bbc9fc84e64fb877731e1f9c031da431ac9f0c33381257527a89ee803cda5915
|
@@ -21,7 +21,7 @@
|
|
21
21
|
#
|
22
22
|
# NOTES:
|
23
23
|
#
|
24
|
-
# * The
|
24
|
+
# * The CHANGELOG text is altered to remove RPM-style date headers, which don't
|
25
25
|
# render well as markdown on the GitHub release pages
|
26
26
|
#
|
27
27
|
# * By default, the gem is built and released using the standard rake tasks
|
@@ -37,12 +37,15 @@
|
|
37
37
|
# All keys are optional.
|
38
38
|
#
|
39
39
|
---
|
40
|
-
name: 'Tag: Release to GitHub
|
40
|
+
name: 'Tag: Release to GitHub + rubygems.org (no RPMS)'
|
41
41
|
|
42
42
|
on:
|
43
43
|
push:
|
44
44
|
tags:
|
45
|
+
# NOTE: These filter patterns aren't actually regexes:
|
46
|
+
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
|
45
47
|
- '[0-9]+\.[0-9]+\.[0-9]+'
|
48
|
+
- '[0-9]+\.[0-9]+\.[0-9]+\-[a-z]+[0-9]+'
|
46
49
|
|
47
50
|
env:
|
48
51
|
PUPPET_VERSION: '~> 6'
|
@@ -52,11 +55,7 @@ jobs:
|
|
52
55
|
releng-checks:
|
53
56
|
name: "RELENG checks"
|
54
57
|
if: github.repository_owner == 'simp'
|
55
|
-
runs-on: ubuntu-
|
56
|
-
outputs:
|
57
|
-
build_command: ${{ steps.commands.outputs.build_command }}
|
58
|
-
release_command: ${{ steps.commands.outputs.release_command }}
|
59
|
-
pkg_dir: ${{ steps.commands.outputs.pkg_dir }}
|
58
|
+
runs-on: ubuntu-latest
|
60
59
|
steps:
|
61
60
|
- name: "Assert '${{ github.ref }}' is a tag"
|
62
61
|
run: '[[ "$GITHUB_REF" =~ ^refs/tags/ ]] || { echo "::error ::GITHUB_REF is not a tag: ${GITHUB_REF}"; exit 1 ; }'
|
@@ -64,7 +63,7 @@ jobs:
|
|
64
63
|
with:
|
65
64
|
ref: ${{ github.ref }}
|
66
65
|
clean: true
|
67
|
-
- name:
|
66
|
+
- name: Determine build and release commands
|
68
67
|
id: commands
|
69
68
|
run: |
|
70
69
|
# By default, these are the standard tasks from "bundler/gem_tasks"
|
@@ -92,9 +91,7 @@ jobs:
|
|
92
91
|
ruby-version: 2.5
|
93
92
|
bundler-cache: true
|
94
93
|
- name: Test build the package
|
95
|
-
|
96
|
-
GEM_BUILD_COMMAND: ${{ steps.commands.outputs.build_command }}
|
97
|
-
run: "$GEM_BUILD_COMMAND"
|
94
|
+
run: "${{ steps.commands.outputs.build_command }}"
|
98
95
|
- name: "Assert '${{ github.ref }}' matches the package version"
|
99
96
|
run: |
|
100
97
|
tag="${GITHUB_REF/refs\/tags\//}"
|
@@ -109,7 +106,9 @@ jobs:
|
|
109
106
|
name: Deploy GitHub Release
|
110
107
|
needs: [ releng-checks ]
|
111
108
|
if: github.repository_owner == 'simp'
|
112
|
-
runs-on: ubuntu-
|
109
|
+
runs-on: ubuntu-latest
|
110
|
+
outputs:
|
111
|
+
prerelease: ${{ steps.tag-check.outputs.prerelease }}
|
113
112
|
steps:
|
114
113
|
- name: Checkout code
|
115
114
|
uses: actions/checkout@v2
|
@@ -117,6 +116,7 @@ jobs:
|
|
117
116
|
ref: ${{ github.ref }}
|
118
117
|
clean: true
|
119
118
|
fetch-depth: 0
|
119
|
+
|
120
120
|
- name: Get tag & annotation info (${{github.ref}})
|
121
121
|
id: tag-check
|
122
122
|
run: |
|
@@ -124,7 +124,19 @@ jobs:
|
|
124
124
|
annotation="$(git for-each-ref "$GITHUB_REF" --format='%(contents)' --count=1)"
|
125
125
|
annotation_title="$(echo "$annotation" | head -1)"
|
126
126
|
|
127
|
+
|
128
|
+
if [[ "$tag" =~ ^(simp-|v)?[0-9]+\.[0-9]+\.[0-9]+(-(rc|alpha|beta|pre|post)?([0-9]+)?)?$ ]]; then
|
129
|
+
if [ -n "${BASH_REMATCH[2]}" ]; then
|
130
|
+
prerelease=yes
|
131
|
+
annotation_title="Pre-release of ${tag}"
|
132
|
+
fi
|
133
|
+
else
|
134
|
+
printf '::error ::Release Tag format is not SemVer, X.Y.Z-R, X.Y.Z-<prerelease>: "%s"\n' "$RELEASE_TAG"
|
135
|
+
exit 88
|
136
|
+
fi
|
137
|
+
|
127
138
|
echo "::set-output name=tag::${tag}"
|
139
|
+
echo "::set-output name=prerelease::${prerelease}"
|
128
140
|
echo "::set-output name=annotation_title::${annotation_title}"
|
129
141
|
|
130
142
|
# Prepare annotation body as a file for the next step
|
@@ -146,14 +158,14 @@ jobs:
|
|
146
158
|
tag_name: ${{ github.ref }}
|
147
159
|
release_name: ${{ steps.tag-check.outputs.annotation_title }}
|
148
160
|
body_path: /tmp/annotation.body
|
161
|
+
prerelease: ${{ steps.tag-check.outputs.prerelease == 'yes'}}
|
149
162
|
draft: false
|
150
|
-
prerelease: false
|
151
163
|
|
152
164
|
deploy-rubygem:
|
153
165
|
name: Deploy RubyGem Release
|
154
|
-
needs: [ releng-checks ]
|
155
|
-
if: github.repository_owner == 'simp'
|
156
|
-
runs-on: ubuntu-
|
166
|
+
needs: [ releng-checks, create-github-release ]
|
167
|
+
if: (github.repository_owner == 'simp') && (needs.create-github-release.outputs.prerelease != 'yes')
|
168
|
+
runs-on: ubuntu-latest
|
157
169
|
env:
|
158
170
|
RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
|
159
171
|
BUILD_COMMAND: ${{ needs.releng-checks.outputs.build_command }}
|
data/CHANGELOG.md
CHANGED
@@ -23,11 +23,12 @@ module Simp::BeakerHelpers
|
|
23
23
|
'PyYAML',
|
24
24
|
'cmake',
|
25
25
|
'git',
|
26
|
-
'openscap-scanner',
|
27
26
|
'openscap-python',
|
27
|
+
'openscap-scanner',
|
28
28
|
'openscap-utils',
|
29
29
|
'python-jinja2',
|
30
|
-
'python-lxml'
|
30
|
+
'python-lxml',
|
31
|
+
'python-setuptools'
|
31
32
|
]
|
32
33
|
|
33
34
|
EL8_PACKAGES = [
|
@@ -41,6 +42,7 @@ module Simp::BeakerHelpers
|
|
41
42
|
'python3-jinja2',
|
42
43
|
'python3-lxml',
|
43
44
|
'python3-pyyaml',
|
45
|
+
'python3-setuptools',
|
44
46
|
'libarchive'
|
45
47
|
]
|
46
48
|
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
../../nodesets
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
../../nodesets
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
../../nodesets
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
../../nodesets
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
../../nodesets
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: simp-beaker-helpers
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.24.
|
4
|
+
version: 1.24.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chris Tessmer
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2022-
|
12
|
+
date: 2022-04-17 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: beaker
|
@@ -279,9 +279,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
279
279
|
- !ruby/object:Gem::Version
|
280
280
|
version: '0'
|
281
281
|
requirements: []
|
282
|
-
|
283
|
-
rubygems_version: 2.7.6.3
|
282
|
+
rubygems_version: 3.0.9
|
284
283
|
signing_key:
|
285
284
|
specification_version: 4
|
286
285
|
summary: beaker helper methods for SIMP
|
287
|
-
test_files:
|
286
|
+
test_files:
|
287
|
+
- spec/acceptance/nodesets/default.yml
|
288
|
+
- spec/acceptance/nodesets/docker.yml
|
289
|
+
- spec/acceptance/nodesets/oel.yml
|
290
|
+
- spec/acceptance/nodesets/ubuntu.yml
|
291
|
+
- spec/acceptance/suites/default/check_puppet_version_spec.rb
|
292
|
+
- spec/acceptance/suites/default/enable_fips_spec.rb
|
293
|
+
- spec/acceptance/suites/default/fixture_modules_spec.rb
|
294
|
+
- spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
|
295
|
+
- spec/acceptance/suites/default/nodesets
|
296
|
+
- spec/acceptance/suites/default/pki_tests_spec.rb
|
297
|
+
- spec/acceptance/suites/default/set_hieradata_on_spec.rb
|
298
|
+
- spec/acceptance/suites/default/write_hieradata_to_spec.rb
|
299
|
+
- spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb
|
300
|
+
- spec/acceptance/suites/fips_from_fixtures/metadata.yml
|
301
|
+
- spec/acceptance/suites/fips_from_fixtures/nodesets
|
302
|
+
- spec/acceptance/suites/inspec/00_default_spec.rb
|
303
|
+
- spec/acceptance/suites/inspec/metadata.yml
|
304
|
+
- spec/acceptance/suites/inspec/nodesets
|
305
|
+
- spec/acceptance/suites/offline/00_default_spec.rb
|
306
|
+
- spec/acceptance/suites/offline/README
|
307
|
+
- spec/acceptance/suites/offline/nodesets/default.yml
|
308
|
+
- spec/acceptance/suites/puppet_collections/00_default_spec.rb
|
309
|
+
- spec/acceptance/suites/puppet_collections/metadata.yml
|
310
|
+
- spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
|
311
|
+
- spec/acceptance/suites/snapshot/10_general_usage_spec.rb
|
312
|
+
- spec/acceptance/suites/snapshot/nodesets
|
313
|
+
- spec/acceptance/suites/ssg/00_default_spec.rb
|
314
|
+
- spec/acceptance/suites/ssg/metadata.yml
|
315
|
+
- spec/acceptance/suites/ssg/nodesets
|
316
|
+
- spec/acceptance/suites/windows/00_default_spec.rb
|
317
|
+
- spec/acceptance/suites/windows/metadata.yml
|
318
|
+
- spec/acceptance/suites/windows/nodesets/default.yml
|
319
|
+
- spec/acceptance/suites/windows/nodesets/win2016.yml
|
320
|
+
- spec/acceptance/suites/windows/nodesets/win2019.yml
|
321
|
+
- spec/fixtures/inspec_profiles/CentOS-7-disa_stig
|
322
|
+
- spec/fixtures/inspec_profiles/RedHat-7-disa_stig/controls/00_Control_Selector.rb
|
323
|
+
- spec/fixtures/inspec_profiles/RedHat-7-disa_stig/inspec.yml
|
324
|
+
- spec/lib/simp/beaker_helpers_spec.rb
|
325
|
+
- spec/spec_helper.rb
|
326
|
+
- spec/spec_helper_acceptance.rb
|