Skip to content

Commit

Permalink
(SIMP-10032) clamav Add Puppet 7 acceptance test (#66)
Browse files Browse the repository at this point in the history
  • Loading branch information
lnemsick-simp authored Jun 29, 2021
1 parent 20fecd4 commit f0eb716
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
fixtures:
repositories:
compliance_markup: https://github.com/simp/pupmod-simp-compliance_markup
cron_core: https://github.com/puppetlabs/puppetlabs-cron_core
logrotate: https://github.com/simp/pupmod-simp-logrotate
rsync: https://github.com/simp/pupmod-simp-rsync
selinux_core: https://github.com/puppetlabs/puppetlabs-selinux_core
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
cron_core: https://github.com/puppetlabs/puppetlabs-cron_core.git
logrotate: https://github.com/simp/pupmod-simp-logrotate.git
rsync: https://github.com/simp/pupmod-simp-rsync.git
selinux_core: https://github.com/puppetlabs/puppetlabs-selinux_core.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
symlinks:
clamav: "#{source_dir}"
14 changes: 10 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,22 +339,28 @@ pup6.x:
<<: *pup_6_x
<<: *acceptance_base
script:
- 'bundle exec rake beaker:suites[default]'
- 'bundle exec rake beaker:suites[default,default]'

pup6.x-fips:
<<: *pup_6_x
<<: *acceptance_base
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default]'
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default,default]'

pup6.pe:
<<: *pup_6_pe
<<: *acceptance_base
script:
- 'bundle exec rake beaker:suites[default]'
- 'bundle exec rake beaker:suites[default,default]'

pup6.pe-fips:
<<: *pup_6_pe
<<: *acceptance_base
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default]'
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default,default]'

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 @@ -20,6 +20,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 f0eb716

Please sign in to comment.