From 0d08f54962e49d1af855d48b14dfab4c94ee08fa Mon Sep 17 00:00:00 2001 From: op-ct Date: Fri, 15 May 2020 17:32:09 -0400 Subject: [PATCH] (SIMP-7708) Fix Gitab CI cache setting (#219) This patch removes the gitlab cache `untracked: true` setting from `.gitlab-ci.yml`. [SIMP-7708] #comment Update to latest pipeline in pupmod-simp-simplib SIMP-7786 #close --- .gitlab-ci.yml | 59 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac6664f4..db9f6da8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +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 doesn't support 6 yet; tests are info-only and allowed to fail +# 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' @@ -39,7 +39,6 @@ variables: # -------------------------------------- .setup_bundler_env: &setup_bundler_env cache: - untracked: true key: "${CI_PROJECT_NAMESPACE}_ruby-${MATRIX_RUBY_VERSION}_bundler" paths: - '.vendor' @@ -70,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' @@ -84,7 +83,6 @@ variables: BEAKER_PUPPET_COLLECTION: 'puppet6' MATRIX_RUBY_VERSION: '2.5' - # Testing Environments #----------------------------------------------------------------------- @@ -151,62 +149,63 @@ 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: + +pup5.5.17: <<: *acceptance_base - <<: *pup_5_5_16 + <<: *pup_5_5_17 script: - 'bundle exec rake beaker:suites[default,default]' -pup5.5.16-fips: +pup5.5.17-fips: <<: *acceptance_base - <<: *pup_5_5_16 + <<: *pup_5_5_17 script: - 'BEAKER_fips=yes bundle exec rake beaker:suites[default,default]' -pup5.5.16-prelink_fact: +pup5.5.17-prelink_fact: <<: *acceptance_base - <<: *pup_5_5_16 + <<: *pup_5_5_17 script: - 'bundle exec rake beaker:suites[prelink_fact,default]' -pup5.5.16-ipa_fact: +pup5.5.17-ipa_fact: <<: *acceptance_base - <<: *pup_5_5_16 + <<: *pup_5_5_17 script: - 'bundle exec rake beaker:suites[ipa_fact,default]' -pup5.5.16-caller_function: +pup5.5.17-caller_function: <<: *acceptance_base - <<: *pup_5_5_16 + <<: *pup_5_5_17 script: - 'bundle exec rake beaker:suites[caller_function,default]' -pup5.5.16-oel: +pup5.5.17-oel: <<: *acceptance_base - <<: *pup_5_5_16 + <<: *pup_5_5_17 script: - 'bundle exec rake beaker:suites[default,oel]' -pup5.5.16-oel-fips: +pup5.5.17-oel-fips: <<: *acceptance_base - <<: *pup_5_5_16 + <<: *pup_5_5_17 <<: *only_with_SIMP_FULL_MATRIX script: - 'BEAKER_fips=yes bundle exec rake beaker:suites[default,oel]' -pup5.5.16-oel-prelink_fact: +pup5.5.17-oel-prelink_fact: <<: *acceptance_base - <<: *pup_5_5_16 + <<: *pup_5_5_17 script: - 'bundle exec rake beaker:suites[prelink_fact,oel]'