Skip to content

Commit

Permalink
(SIMP-7855) Update GLCI to test puppet 5.5.20 (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
op-ct authored Aug 12, 2020
1 parent ea37a80 commit 3b2c1c1
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
26 changes: 14 additions & 12 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ variables:
BEAKER_PUPPET_COLLECTION: 'puppet5'
MATRIX_RUBY_VERSION: '2.4'

.pup_5_5_17: &pup_5_5_17
.pup_5_5_20: &pup_5_5_20
image: 'ruby:2.4'
variables:
PUPPET_VERSION: '5.5.17'
PUPPET_VERSION: '5.5.20'
BEAKER_PUPPET_COLLECTION: 'puppet5'
MATRIX_RUBY_VERSION: '2.4'

Expand Down Expand Up @@ -283,14 +283,16 @@ pup6-lint:
pup5-unit:
<<: *pup_5
<<: *unit_tests
<<: *with_SIMP_SPEC_MATRIX_LEVEL_2

pup5.5.17-unit:
<<: *pup_5_5_17
pup5.5.20-unit:
<<: *pup_5_5_20
<<: *unit_tests

pup6-unit:
<<: *pup_6
<<: *unit_tests
<<: *with_SIMP_SPEC_MATRIX_LEVEL_2

pup6.16.0-unit:
<<: *pup_6_16_0
Expand All @@ -306,26 +308,26 @@ pup6.16.0-unit:
# Repo-specific content
# ==============================================================================

pup5.5.17:
<<: *pup_5_5_17
pup5.5.20:
<<: *pup_5_5_20
<<: *acceptance_base
script:
- 'bundle exec rake beaker:suites[default]'

pup5.5.17-fips:
<<: *pup_5_5_17
pup5.5.20-fips:
<<: *pup_5_5_20
<<: *acceptance_base
script:
- 'BEAKER_fips=yes bundle exec rake beaker:suites[default]'

pup5.5.17-oel:
<<: *pup_5_5_17
pup5.5.20-oel:
<<: *pup_5_5_20
<<: *acceptance_base
script:
- 'bundle exec rake beaker:suites[default,oel]'

pup5.5.17-oel-fips:
<<: *pup_5_5_17
pup5.5.20-oel-fips:
<<: *pup_5_5_20
<<: *acceptance_base
<<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3
script:
Expand Down
2 changes: 2 additions & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.yardoc
dist/
pkg/
spec/defines/
spec/fixtures/
spec/acceptance/
spec/rp_env/
Expand All @@ -21,3 +22,4 @@ vendor/
junit/
log/
doc/
tests/
3 changes: 3 additions & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
--no-140chars-check
--no-trailing_comma-check
--no-empty_string_assignment-check
# This is here because the code can't handle lookups in parameters and SIMP
# modules have a LOT of those
--no-parameter_order-check

0 comments on commit 3b2c1c1

Please sign in to comment.