simp-beaker-helpers 1.29.0 → 1.30.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 25fe1e94533f021b08b45d117546d0117a068a85e2087848917554341db0bff8
4
- data.tar.gz: 907168ef1038666cffeee8101f66471a6eda6b6a69e925c2731fa17b2cb2ef2a
3
+ metadata.gz: 43a26304e3c73ccdceb260efe742031b4586f21f4bd2bf5dd1bf4b27bb0b8336
4
+ data.tar.gz: 8d3d7ed70d8a0ffd9da29e1b588c2af5c21ab4dca4660e6e2cdafc17db8883d3
5
5
  SHA512:
6
- metadata.gz: f4cf5a2c52657b1d16ca89679e64c9ac5de4d82def72b4f9dd383538c77dfc7ca642f44f5db74c2cbf68700bd44f9ac3907adb8db98b4af262efa6fd7d08930d
7
- data.tar.gz: 15ff184de51d666174c1294ae38bdc33ba662f562a4aea5cc5b0497efccc2cf9285a14e37b3e81c621754f5b26654b623787b3dc3161ee9e5b79cccb26b2f276
6
+ metadata.gz: 672d98b8d677b728cc19859daabd67e7914497d3dec98e0708ac6ca5efa6395efbf3156e194093e7043af1153bcc2431c49e11a754e45e3f21412b5e483b2126
7
+ data.tar.gz: 9af14a14f18493d44c1af69ce2cbf02f1458349268e856073fa5e95178387ece6bfc736ec60d3e83343a7586a436ca03cc27a05d6f87595fc2f46144445cbfc9
@@ -0,0 +1,21 @@
1
+ ---
2
+ name: Add new issues to triage project
3
+
4
+ on:
5
+ issues:
6
+ types:
7
+ - opened
8
+ - reopened
9
+ pull_request_target:
10
+ types:
11
+ - opened
12
+
13
+ jobs:
14
+ add-to-project:
15
+ name: Add issue to project
16
+ runs-on: ubuntu-latest
17
+ steps:
18
+ - uses: actions/add-to-project@v0.5.0
19
+ with:
20
+ project-url: https://github.com/orgs/simp/projects/11
21
+ github-token: ${{ secrets.AUTO_TRIAGE_TOKEN }}
@@ -10,20 +10,46 @@ on:
10
10
 
11
11
  jobs:
12
12
  acceptance:
13
+ name: '${{matrix.beaker.suite}}, Puppet ${{matrix.puppet.puppet_version}}'
13
14
  runs-on:
14
15
  - ubuntu-latest
15
16
  strategy:
16
17
  matrix:
17
- ruby:
18
- - 2.6
18
+ puppet:
19
+ - label: 'Puppet 7.x [SIMP 6.6/PE 2021.7]'
20
+ puppet_version: '~> 7.0'
21
+ ruby_version: '2.7'
22
+ experimental: false
23
+ - label: 'Puppet 8.x'
24
+ puppet_version: '~> 8.0'
25
+ ruby_version: 3.1
26
+ experimental: true
27
+ beaker:
28
+ - label: beaker
29
+ suite: default
30
+ allowed_to_fail: false
31
+ - label: beaker puppet_collections
32
+ suite: puppet_collections
33
+ allowed_to_fail: false
34
+ - label: beaker ssg
35
+ suite: ssg
36
+ allowed_to_fail: false
37
+ # The inspec suite fails for unclear reasons during an scp.
38
+ # Sicura tests compliance at the framework level, so troubleshooting
39
+ # inspec acceptance tests is not a priority at present.
40
+ - label: beaker inspec
41
+ suite: inspec
42
+ allowed_to_fail: true
19
43
  fail-fast: false
44
+ env:
45
+ PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
20
46
  steps:
21
47
  - name: checkout repo
22
48
  uses: actions/checkout@v2
23
49
  - name: setup ruby
24
50
  uses: ruby/setup-ruby@v1
25
51
  with:
26
- ruby-version: ${{ matrix.ruby }}
52
+ ruby-version: ${{ matrix.puppet.ruby_version }}
27
53
  - name: ensure entropy
28
54
  run: |
29
55
  sudo apt-get update -y
@@ -41,15 +67,8 @@ jobs:
41
67
  run: |
42
68
  gem install bundler
43
69
  bundle update
44
- - name: beaker
45
- run: |
46
- bundle exec rake beaker:suites[default,docker]
47
- - name: beaker puppet_collections
48
- run: |
49
- bundle exec rake beaker:suites[puppet_collections,docker]
50
- - name: beaker ssg
51
- run: |
52
- bundle exec rake beaker:suites[ssg,docker]
53
- - name: beaker inspec
54
- run: |
55
- bundle exec rake beaker:suites[inspec,docker]
70
+ - name: 'run beaker:suite "${{matrix.beaker.label}}"'
71
+ continue-on-error: ${{matrix.puppet.experimental || matrix.beaker.allowed_to_fail}}
72
+ env:
73
+ BEAKER_SUITE: ${{matrix.beaker.suite}}
74
+ run: bundle exec rake beaker:suites[$BEAKER_SUITE,docker]
@@ -1,19 +1,10 @@
1
1
  # Run Puppet checks and test matrix on Pull Requests
2
2
  # ------------------------------------------------------------------------------
3
- # NOTICE: **This file is maintained with puppetsync**
4
- #
5
- # This file is updated automatically as part of a puppet module baseline.
6
- #
7
- # The next baseline sync will overwrite any local changes to this file!
8
- #
9
- # ==============================================================================
10
- #
11
3
  # The testing matrix considers ruby/puppet versions supported by SIMP and PE:
12
4
  # ------------------------------------------------------------------------------
13
5
  # Release Puppet Ruby EOL
14
- # SIMP 6.4 5.5 2.40 TBD
15
- # PE 2018.1 5.5 2.40 2021-01 (LTS overlap)
16
- # PE 2019.8 6.18 2.5 2022-12 (LTS)
6
+ # PE 2019.8 6.22 2.7 2022-12 (LTS)
7
+ # PE 2021.Y 7.x 2.7 Quarterly updates
17
8
  #
18
9
  # https://puppet.com/docs/pe/2018.1/component_versions_in_recent_pe_releases.html
19
10
  # https://puppet.com/misc/puppet-enterprise-lifecycle
@@ -39,14 +30,14 @@ jobs:
39
30
  ruby-style:
40
31
  if: false # TODO Modules will need: rubocop in Gemfile, .rubocop.yml
41
32
  name: 'Ruby Style (experimental)'
42
- runs-on: ubuntu-18.04
33
+ runs-on: ubuntu-latest
43
34
  continue-on-error: true
44
35
  steps:
45
36
  - uses: actions/checkout@v2
46
37
  - name: "Install Ruby ${{matrix.puppet.ruby_version}}"
47
38
  uses: ruby/setup-ruby@v1
48
39
  with:
49
- ruby-version: 2.5
40
+ ruby-version: 2.7
50
41
  bundler-cache: true
51
42
  - run: |
52
43
  bundle show
@@ -54,18 +45,20 @@ jobs:
54
45
 
55
46
  spec-tests:
56
47
  name: 'Spec'
57
- runs-on: ubuntu-18.04
48
+ runs-on: ubuntu-latest
58
49
  strategy:
59
50
  matrix:
60
51
  puppet:
61
- - label: 'Puppet 6.x [SIMP 6.5/PE 2019.8]'
62
- puppet_version: '~> 6.0'
63
- ruby_version: '2.5'
64
- - label: 'Puppet 7.x'
52
+ - label: 'Puppet 7.x [SIMP 6.6/PE 2021.7]'
65
53
  puppet_version: '~> 7.0'
66
54
  ruby_version: '2.7'
55
+ experimental: false
56
+ - label: 'Puppet 8.x'
57
+ puppet_version: '~> 8.0'
58
+ ruby_version: 3.1
59
+ experimental: true
67
60
  env:
68
- PUPPET_VERSION: '${{matrix.puppet.puppet_version}}'
61
+ PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
69
62
  steps:
70
63
  - uses: actions/checkout@v2
71
64
  - name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
@@ -75,10 +68,11 @@ jobs:
75
68
  bundler-cache: true
76
69
  - run: 'command -v rpm || if command -v apt-get; then sudo apt-get update; sudo apt-get install -y rpm; fi ||:'
77
70
  - run: 'bundle exec rake spec'
71
+ continue-on-error: ${{matrix.puppet.experimental}}
78
72
 
79
73
  # dump_contexts:
80
74
  # name: 'Examine Context contents'
81
- # runs-on: ubuntu-16.04
75
+ # runs-on: ubuntu-latest
82
76
  # steps:
83
77
  # - name: Dump contexts
84
78
  # env:
@@ -48,7 +48,7 @@ on:
48
48
  - '[0-9]+\.[0-9]+\.[0-9]+\-[a-z]+[0-9]+'
49
49
 
50
50
  env:
51
- PUPPET_VERSION: '~> 6'
51
+ PUPPET_VERSION: '~> 7'
52
52
  LOCAL_WORKFLOW_CONFIG_FILE: .github/workflows.local.json
53
53
 
54
54
  jobs:
@@ -87,12 +87,12 @@ jobs:
87
87
  grep -w '"gem_release_command"' &> /dev/null; then
88
88
  GEM_RELEASE_COMMAND="$(jq -r .gem_release_command "$LOCAL_WORKFLOW_CONFIG_FILE" )"
89
89
  fi
90
- echo "::set-output name=build_command::${GEM_BUILD_COMMAND}"
91
- echo "::set-output name=pkg_dir::${GEM_PKG_DIR}"
92
- echo "::set-output name=release_command::${GEM_RELEASE_COMMAND}"
90
+ echo "build_command=$GEM_BUILD_COMMAND" | tee -a "$GITHUB_OUTPUT"
91
+ echo "pkg_dir=$GEM_PKG_DIR" | tee -a "$GITHUB_OUTPUT"
92
+ echo "release_command=$GEM_RELEASE_COMMAND" | tee -a "$GITHUB_OUTPUT"
93
93
  - uses: ruby/setup-ruby@v1
94
94
  with:
95
- ruby-version: 2.5
95
+ ruby-version: 2.7
96
96
  bundler-cache: true
97
97
  - name: Test build the package
98
98
  run: "${{ steps.commands.outputs.build_command }}"
@@ -113,6 +113,7 @@ jobs:
113
113
  runs-on: ubuntu-latest
114
114
  outputs:
115
115
  prerelease: ${{ steps.tag-check.outputs.prerelease }}
116
+ tag: ${{ steps.tag-check.outputs.tag }}
116
117
  steps:
117
118
  - name: Checkout code
118
119
  uses: actions/checkout@v3
@@ -128,7 +129,6 @@ jobs:
128
129
  annotation="$(git for-each-ref "$GITHUB_REF" --format='%(contents)' --count=1)"
129
130
  annotation_title="$(echo "$annotation" | head -1)"
130
131
 
131
-
132
132
  if [[ "$tag" =~ ^(simp-|v)?[0-9]+\.[0-9]+\.[0-9]+(-(rc|alpha|beta|pre|post)?([0-9]+)?)?$ ]]; then
133
133
  if [ -n "${BASH_REMATCH[2]}" ]; then
134
134
  prerelease=yes
@@ -139,31 +139,32 @@ jobs:
139
139
  exit 88
140
140
  fi
141
141
 
142
- echo "::set-output name=tag::${tag}"
143
- echo "::set-output name=prerelease::${prerelease}"
144
- echo "::set-output name=annotation_title::${annotation_title}"
142
+ echo "tag=$tag" | tee -a "$GITHUB_OUTPUT"
143
+ echo "prerelease=$prerelease" | tee -a "$GITHUB_OUTPUT"
144
+ echo "TARGET_TAG=$tag" | tee -a "$GITHUB_ENV"
145
145
 
146
146
  # Prepare annotation body as a file for the next step
147
147
  #
148
- # * The GitHub Release render the text in this file as markdown
149
- # * The file is needed because :set-output only supports single lines
148
+ # * The GitHub Release renders the text in this file as markdown
150
149
  # * The `perl -pe` removes RPM-style date headers from the CHANGELOG,
151
150
  # because they don't render well as markdown on the Release page
152
- #
151
+ echo "RELEASE_MESSAGE<<EOF$$" >> "$GITHUB_ENV"
152
+ printf '%s\n\n' "$annotation_title" >> "$GITHUB_ENV"
153
153
  echo "$annotation" | tail -n +2 | \
154
- perl -pe 'BEGIN{undef $/;} s/\n\* (Mon|Tue|Wed|Thu|Fri|Sat|Sun) .*?\n//smg;' > /tmp/annotation.body
154
+ perl -pe 'BEGIN{undef $/;} s/\n\* (Mon|Tue|Wed|Thu|Fri|Sat|Sun) .*?\n//smg;' >> "$GITHUB_ENV"
155
+ echo "EOF$$" >> "$GITHUB_ENV"
155
156
 
156
157
  - name: Create Release
157
- uses: actions/create-release@v1
158
158
  id: create_release
159
159
  env:
160
160
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
161
- with:
162
- tag_name: ${{ github.ref }}
163
- release_name: ${{ steps.tag-check.outputs.annotation_title }}
164
- body_path: /tmp/annotation.body
165
- prerelease: ${{ steps.tag-check.outputs.prerelease == 'yes'}}
166
- draft: false
161
+ IS_PRERELEASE: ${{ steps.tag-check.outputs.prerelease }}
162
+ run: |
163
+ echo "${RELEASE_MESSAGE}" > /tmp/.commit-msg.txt
164
+ args=(--file /tmp/.commit-msg.txt)
165
+ [[ $IS_PRERELEASE == yes ]] && args+=(--prerelease)
166
+
167
+ hub release create ${args[@]} "$TARGET_TAG"
167
168
 
168
169
  deploy-rubygem:
169
170
  name: Deploy RubyGem Release
@@ -183,7 +184,7 @@ jobs:
183
184
  clean: true
184
185
  - uses: ruby/setup-ruby@v1
185
186
  with:
186
- ruby-version: 2.5
187
+ ruby-version: 2.7
187
188
  bundler-cache: true
188
189
  - name: Build RubyGem
189
190
  run: |
data/CHANGELOG.md CHANGED
@@ -1,7 +1,24 @@
1
+ ### 1.30.0 / 2023-05-15
2
+ * Added:
3
+ * Default `puppet_collection` to `puppet7`
4
+ * Support for new pulp-slimmed repo names in `install_simp_repos` logic
5
+ * Modernize GHA PR test matrix
6
+ * Support for experimental (Puppet 8.x/ruby 3.1)
7
+ * Add GHA acceptance test matrix (puppet version x suite)
8
+ * Support for experimental (Puppet 8.x/ruby 3.1)
9
+ * Allow problematic inspec suite to fail
10
+ * Fixed:
11
+ * Update to `beaker-rspec` 8.x depsolve with `simp-rake-helpers` 5.20.0+
12
+ * Update `beaker` to permit 5.x
13
+ * Update default `puppet-agent` to 7.x
14
+ * Use less fragile yum/dnf `repolist` in `install_simp_repos` logic
15
+ * Removed
16
+ * inspec acceptance suite no longer required in GHA matrix
17
+
1
18
  ### 1.29.0 / 2022-10-25
2
19
  * Fixed:
3
20
  * Compress fixtures before copy to Windows nodes
4
-
21
+
5
22
  ### 1.28.0 / 2022-08-05
6
23
  * Added:
7
24
  * Support RHEL versions without RHN credentials
@@ -31,7 +48,7 @@
31
48
  on non-RHEL systems
32
49
  * Added:
33
50
  * Updated all dependencies to their latest versions where possible and removed
34
- depdendencies on deprecated libraries.
51
+ dependencies on deprecated libraries.
35
52
 
36
53
  ### 1.24.5 / 2022-05-06
37
54
  * Fixed:
@@ -5,7 +5,7 @@ module Simp::BeakerHelpers
5
5
  #
6
6
  # This is done so that we know if some new thing that we're using breaks the
7
7
  # oldest system that we support
8
- DEFAULT_PUPPET_AGENT_VERSION = '~> 6.0'
8
+ DEFAULT_PUPPET_AGENT_VERSION = '~> 7.0'
9
9
 
10
10
  SSG_REPO_URL = ENV['BEAKER_ssg_repo'] || 'https://github.com/ComplianceAsCode/content.git'
11
11
 
@@ -1,5 +1,5 @@
1
1
  module Simp; end
2
2
 
3
3
  module Simp::BeakerHelpers
4
- VERSION = '1.29.0'
4
+ VERSION = '1.30.0'
5
5
  end
@@ -399,7 +399,7 @@ module Simp::BeakerHelpers
399
399
  begin
400
400
  zipfile = "#{Simp::BeakerHelpers.tmpname}.zip"
401
401
  files = []
402
-
402
+
403
403
  # 'zip -x' does not reliably exclude paths, so we need to remove them from
404
404
  # the list of files to zip
405
405
  Dir.glob('*') do |module_root|
@@ -421,7 +421,7 @@ module Simp::BeakerHelpers
421
421
  copy_to(sut, zipfile, target_module_path, opts)
422
422
 
423
423
  # Windows 2012 and R2 does not natively include PowerShell 5, in which
424
- # the Expand-Archive cmdlet was introduced
424
+ # the Expand-Archive cmdlet was introduced
425
425
  if fact_on(sut, 'os.release.major').include?('2012')
426
426
  unzip_cmd = [
427
427
  "\"[System.Reflection.Assembly]::LoadWithPartialName(\'System.IO.Compression.FileSystem\')",
@@ -1423,7 +1423,7 @@ module Simp::BeakerHelpers
1423
1423
  unless result
1424
1424
  puppet_gems = nil
1425
1425
 
1426
- Bundler.with_clean_env do
1426
+ Bundler.with_unbundled_env do
1427
1427
  puppet_gems = %x(gem search -ra -e puppet).match(/\((.+)\)/)
1428
1428
  end
1429
1429
 
@@ -1571,25 +1571,43 @@ module Simp::BeakerHelpers
1571
1571
  to_disable += ENV.fetch('BEAKER_SIMP_disable_repos', '').split(',').map(&:strip)
1572
1572
 
1573
1573
  unless to_disable.empty?
1574
- if to_disable.include?('simp')
1574
+ if to_disable.include?('simp') || to_disable.include?('simp-community-simp')
1575
1575
  to_disable.delete('simp')
1576
+
1577
+ # legacy community RPM
1576
1578
  to_disable << 'simp-community-simp'
1579
+
1580
+ # SIMP 6.6+ community RPM
1581
+ to_disable << 'SIMP--simp'
1577
1582
  end
1578
1583
 
1579
1584
  if to_disable.include?('simp_deps')
1580
1585
  to_disable.delete('simp_deps')
1586
+ # legacy community RPM
1581
1587
  to_disable << 'simp-community-epel'
1582
1588
  to_disable << 'simp-community-postgres'
1583
1589
  to_disable << 'simp-community-puppet'
1590
+
1591
+ # SIMP 6.6+ community RPM
1592
+ to_disable << 'epel--simp'
1593
+ to_disable << 'postgresql--simp'
1594
+ to_disable << 'puppet--simp'
1595
+ to_disable << 'puppet7--simp'
1596
+ to_disable << 'puppet6--simp'
1584
1597
  end
1585
1598
 
1599
+ logger.info(%{INFO: repos to disable: '#{to_disable.join("', '")}'.})
1600
+
1586
1601
  # NOTE: This --enablerepo enables the repos for listing and is inherited
1587
1602
  # from YUM. This does not actually "enable" the repos, that would require
1588
1603
  # the "--enable" option (from yum-config-manager) :-D.
1589
1604
  #
1590
1605
  # Note: Certain versions of EL8 do not dump by default and EL7 does not
1591
1606
  # have the '--dump' option.
1592
- available_repos = on(sut, %{yum-config-manager --enablerepo="*" || yum-config-manager --enablerepo="*" --dump}).stdout.lines.grep(/\A\[(.+)\]\Z/){|x| $1}
1607
+ x = on(sut, %{yum repolist all || dnf repolist --all}).stdout.lines
1608
+ y = x.map{|z| z.gsub(%r{/.*\Z},'')}
1609
+ available_repos = y.grep(/\A([a-zA-Z][a-zA-Z0-9:_-]+)\s*/){|x| $1}
1610
+ logger.info(%{INFO: available repos: '#{available_repos.join("', '")}'.})
1593
1611
 
1594
1612
  invalid_repos = (to_disable - available_repos)
1595
1613
 
@@ -1598,6 +1616,7 @@ module Simp::BeakerHelpers
1598
1616
  logger.warn(%{WARN: install_simp_repo - requested repos to disable do not exist on the target system '#{invalid_repos.join("', '")}'.})
1599
1617
  end
1600
1618
 
1619
+
1601
1620
  (to_disable - invalid_repos).each do |repo|
1602
1621
  on(sut, %{yum-config-manager --disable "#{repo}"})
1603
1622
  end
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
21
21
 
22
22
  s.required_ruby_version = '>= 2.3.0'
23
23
 
24
- s.add_runtime_dependency 'beaker' , ['>= 4.17.0', '< 5.0.0']
25
- s.add_runtime_dependency 'beaker-rspec' , '~> 7.1'
24
+ s.add_runtime_dependency 'beaker' , ['>= 4.17.0', '< 6.0.0']
25
+ s.add_runtime_dependency 'beaker-rspec' , '~> 8.0'
26
26
  s.add_runtime_dependency 'beaker-puppet' , ['>= 1.18.14', '< 2.0.0']
27
27
  s.add_runtime_dependency 'beaker-docker' , ['>= 0.8.3', '< 2.0.0']
28
28
  s.add_runtime_dependency 'docker-api' , ['>= 2.1.0', '< 3.0.0']
@@ -7,7 +7,7 @@ HOSTS:
7
7
  hypervisor: docker
8
8
  image: simpproject/simp_beaker_el7
9
9
  docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
10
-
10
+
11
11
  el8.test.net:
12
12
  roles:
13
13
  - el8
@@ -1,22 +1,22 @@
1
1
  require 'spec_helper_acceptance'
2
2
 
3
+ unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
4
+ fail('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
5
+ end
6
+
7
+ if ENV['BEAKER_PUPPET_COLLECTION']
8
+ target_version = ENV['BEAKER_PUPPET_COLLECTION'][/(\d+)$/,1]
9
+ elsif ENV['PUPPET_VERSION']
10
+ target_version = ENV['PUPPET_VERSION'].split('.').first
11
+ end
12
+
3
13
  hosts.each do |host|
4
14
  describe 'make sure puppet version is valid' do
5
15
  context "on #{host}" do
6
- puppet_collection = host.options[:puppet_collection]
7
-
8
- client_puppet_version = on(host, 'puppet --version').stdout.strip
9
-
10
- if puppet_collection =~ /puppet(\d+)/
11
- puppet_collection_version = $1
16
+ client_puppet_version = on(host, 'puppet --version').output.lines.last.strip
12
17
 
13
- it "should be running puppet version #{puppet_collection_version}" do
14
- expect(client_puppet_version.split('.').first).to eq(puppet_collection_version)
15
- end
16
- else
17
- it 'should be running puppet 6' do
18
- expect(client_puppet_version.split('.').first).to eq '6'
19
- end
18
+ it "should be running puppet version #{target_version}" do
19
+ expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(target_version)
20
20
  end
21
21
  end
22
22
  end
@@ -8,7 +8,7 @@ context 'after copy_fixture_modules_to( hosts )' do
8
8
 
9
9
  describe "fact_on(default,'root_home')" do
10
10
  it 'should not return value of `root_home`' do
11
- expect(fact_on(default, 'root_home')).to eq ''
11
+ expect(fact_on(default, 'root_home').to_s).to eq ''
12
12
  end
13
13
  end
14
14
 
@@ -26,7 +26,7 @@ context 'after copy_fixture_modules_to( hosts )' do
26
26
 
27
27
  describe "pfact_on(default,'os.release.foo')" do
28
28
  it 'should not return the value of `os.release.foo`' do
29
- expect(pfact_on(default, 'os.release.foo')).to eq ''
29
+ expect(pfact_on(default, 'os.release.foo').to_s).to eq ''
30
30
  end
31
31
  end
32
32
 
@@ -1 +1 @@
1
- spec/acceptance/suites/default/../../nodesets
1
+ ../../nodesets
@@ -1 +1 @@
1
- spec/acceptance/suites/fips_from_fixtures/../../nodesets
1
+ ../../nodesets
@@ -1 +1 @@
1
- spec/acceptance/suites/inspec/../../nodesets
1
+ ../../nodesets
@@ -1 +1 @@
1
- spec/acceptance/suites/snapshot/../../nodesets
1
+ ../../nodesets
@@ -1 +1 @@
1
- spec/acceptance/suites/ssg/../../nodesets
1
+ ../../nodesets
@@ -179,9 +179,7 @@ describe 'Simp::BeakerHelpers' do
179
179
  it 'extracts info from PUPPET_INSTALL_TYPE' do
180
180
  ENV['PUPPET_INSTALL_TYPE'] = 'pe'
181
181
 
182
- expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet6')
183
182
  expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('pe')
184
- expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^6\./)
185
183
  end
186
184
 
187
185
  it 'fails when BEAKER_PUPPET_COLLECTION is invalid' do
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.29.0
4
+ version: 1.30.0
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: 2023-04-10 00:00:00.000000000 Z
12
+ date: 2023-07-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: beaker
@@ -20,7 +20,7 @@ dependencies:
20
20
  version: 4.17.0
21
21
  - - "<"
22
22
  - !ruby/object:Gem::Version
23
- version: 5.0.0
23
+ version: 6.0.0
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
@@ -30,21 +30,21 @@ dependencies:
30
30
  version: 4.17.0
31
31
  - - "<"
32
32
  - !ruby/object:Gem::Version
33
- version: 5.0.0
33
+ version: 6.0.0
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: beaker-rspec
36
36
  requirement: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '7.1'
40
+ version: '8.0'
41
41
  type: :runtime
42
42
  prerelease: false
43
43
  version_requirements: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '7.1'
47
+ version: '8.0'
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: beaker-puppet
50
50
  requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
162
162
  - ".fips_fixtures"
163
163
  - ".fixtures.yml"
164
164
  - ".github/workflows.local.json"
165
+ - ".github/workflows/add_new_issue_to_triage_project.yml"
165
166
  - ".github/workflows/pr_acceptance.yml"
166
167
  - ".github/workflows/pr_glci.yml"
167
168
  - ".github/workflows/pr_glci_cleanup.yml"
@@ -253,8 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
253
254
  - !ruby/object:Gem::Version
254
255
  version: '0'
255
256
  requirements: []
256
- rubyforge_project:
257
- rubygems_version: 2.7.6.3
257
+ rubygems_version: 3.1.6
258
258
  signing_key:
259
259
  specification_version: 4
260
260
  summary: beaker helper methods for SIMP