Skip to content

Commit

Permalink
(SIMP-7708) Fix Gitab CI cache setting (#62)
Browse files Browse the repository at this point in the history
This patch removes the gitlab cache `untracked: true` setting from
`.gitlab-ci.yml`.

[SIMP-7708] #comment Update to latest pipeline in pupmod-simp-aide
SIMP-7715 #close
  • Loading branch information
op-ct authored May 15, 2020
1 parent 8de9da8 commit 19e480a
Showing 1 changed file with 21 additions and 22 deletions.
43 changes: 21 additions & 22 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# ------------------------------------------------------------------------------
# NOTICE: **This file is maintained with puppetsync**
# ------------------------------------------------------------------------------
# The testing matrix considers ruby/puppet versions supported by SIMP and PE:
#
# https://puppet.com/docs/pe/2019.0/component_versions_in_recent_pe_releases.html
# https://puppet.com/docs/pe/2019.5/component_versions_in_recent_pe_releases.html
# https://puppet.com/misc/puppet-enterprise-lifecycle
# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
# ------------------------------------------------------------------------------
# Release Puppet Ruby EOL
# SIMP 6.3 5.5.16 2.4.5 TBD***
# PE 2018.1 5.5.16 2.4.5 2020-05 (LTS)***
# PE 2019.0 6.0 2.5.1 2019-08-31^^^
#
# *** = Modules created for SIMP 6.3+ are not required to support Puppet < 5.5
# SIMP 6.4 5.5 2.4.5 TBD
# PE 2018.1 5.5 2.4.5 2020-11 (LTS)
# PE 2019.5 6.14 2.5.7 Quarterly
---
stages:
- 'sanity'
Expand Down Expand Up @@ -38,7 +39,6 @@ variables:
# --------------------------------------
.setup_bundler_env: &setup_bundler_env
cache:
untracked: true
key: "${CI_PROJECT_NAMESPACE}_ruby-${MATRIX_RUBY_VERSION}_bundler"
paths:
- '.vendor'
Expand Down Expand Up @@ -69,10 +69,10 @@ variables:
BEAKER_PUPPET_COLLECTION: 'puppet5'
MATRIX_RUBY_VERSION: '2.4'

.pup_5_5_16: &pup_5_5_16
.pup_5_5_17: &pup_5_5_17
image: 'ruby:2.4'
variables:
PUPPET_VERSION: '5.5.16'
PUPPET_VERSION: '5.5.17'
BEAKER_PUPPET_COLLECTION: 'puppet5'
MATRIX_RUBY_VERSION: '2.4'

Expand Down Expand Up @@ -110,8 +110,6 @@ variables:
.compliance_base: &compliance_base
stage: 'compliance'
tags: ['beaker']
# Need to see if there are issues in the Inspec tests
allow_failure: true
<<: *setup_bundler_env


Expand Down Expand Up @@ -151,36 +149,37 @@ pup5-unit:
<<: *pup_5
<<: *unit_tests

pup5.5.16-unit:
<<: *pup_5_5_16
pup5.5.17-unit:
<<: *pup_5_5_17
<<: *unit_tests

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

# Acceptance tests
# Repo-specific content
# ==============================================================================
pup5.5.16:
<<: *pup_5_5_16

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

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

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

pup5.5.16-oel-fips:
<<: *pup_5_5_16
pup5.5.17-oel-fips:
<<: *pup_5_5_17
<<: *acceptance_base
<<: *only_with_SIMP_FULL_MATRIX
script:
Expand Down

0 comments on commit 19e480a

Please sign in to comment.