Skip to content

Commit

Permalink
(SIMP-10037) gnome Add Puppet 7 acceptance test (#65)
Browse files Browse the repository at this point in the history
* Add a Puppet 7 acceptance test
* Made sure all fixture URLs end in '.git', as not all private
  GitHub mirrors allow shortened URLs
* Fail acceptance tests if no examples are executed.

[SIMP-9666] #comment pupmod-simp-gnome acceptance tests configured
SIMP-10037 #close
  • Loading branch information
lnemsick-simp authored Jun 29, 2021
1 parent a25c9f5 commit 57abc46
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
18 changes: 9 additions & 9 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
fixtures:
repositories:
compliance_markup: https://github.com/simp/pupmod-simp-compliance_markup
concat: https://github.com/simp/puppetlabs-concat
dconf: https://github.com/simp/pupmod-simp-dconf
inifile: https://github.com/simp/puppetlabs-inifile
polkit: https://github.com/simp/pupmod-simp-polkit
simp_options: https://github.com/simp/pupmod-simp-simp_options
simplib: https://github.com/simp/pupmod-simp-simplib
stdlib: https://github.com/simp/puppetlabs-stdlib
compliance_markup: https://github.com/simp/pupmod-simp-compliance_markup.git
concat: https://github.com/simp/puppetlabs-concat.git
dconf: https://github.com/simp/pupmod-simp-dconf.git
inifile: https://github.com/simp/puppetlabs-inifile.git
polkit: https://github.com/simp/pupmod-simp-polkit.git
simp_options: https://github.com/simp/pupmod-simp-simp_options.git
simplib: https://github.com/simp/pupmod-simp-simplib.git
stdlib: https://github.com/simp/puppetlabs-stdlib.git
disa_stig-el7-baseline:
repo: https://github.com/simp/inspec-profile-disa_stig-el7
repo: https://github.com/simp/inspec-profile-disa_stig-el7.git
branch: master
target: spec/fixtures/inspec_deps/inspec_profiles/profiles
8 changes: 7 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ pup6.x-compliance:
<<: *pup_6_x
<<: *compliance_base
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[compliance]'
- 'BEAKER_fips=yes bundle exec rake beaker:suites[compliance,default]'

pup6.pe:
<<: *pup_6_pe
Expand All @@ -374,3 +374,9 @@ pup6.pe-oel-fips:
<<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default,oel]'

pup7.x:
<<: *pup_7_x
<<: *acceptance_base
script:
- 'bundle exec rake beaker:suites[default,default]'
4 changes: 4 additions & 0 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
# ensure that environment OS is ready on each host
fix_errata_on hosts

# Detect cases in which no examples are executed (e.g., nodeset does not
# have hosts with required roles)
c.fail_if_no_examples = true

# Readable test descriptions
c.formatter = :documentation

Expand Down

0 comments on commit 57abc46

Please sign in to comment.