use PDK 3.2.0 (.gitlab-ci.yml): udpate Gitlab CI

.gitlab-ci.yml

@@ -5,68 +5,83 @@ stages:
   - acceptance
   - release
 
-default:
+.in-acceptance-only-matrix:
+  parallel:
+    matrix:
+      - RUBY_VERSION: ['3.2.0']
+        PUPPET_GEM_VERSION: ['~> 7']
+        PUPPET_COLLECTION: ['7']
+        DISTRIB: ['ubuntu2204-64']
+
+.common-matrix:
+  parallel:
+    matrix:
+      - RUBY_VERSION: ['3.2.0']
+        PUPPET_GEM_VERSION: ['~> 7']
+  image: ruby:${RUBY_VERSION}
   cache:
     paths:
       - vendor/bundle
-
-  before_script: &before_script
-    - bundle -v
-    - rm Gemfile.lock || true
-    - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
-    - "# Set `rubygems_version` in the .sync.yml to set a value"
-    - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
-    - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
+  before_script:
+    - rm -f Gemfile.lock || true
+    - ruby --version
     - gem --version
     - bundle -v
-    - bundle install --without system_tests --path vendor/bundle --jobs $(nproc)
+    - bundle config set --local path 'vendor/bundle'
+    - bundle config set --local without 'system_tests'
+    - bundle config set --local jobs $(nproc)
+    - bundle install
+    - bundle clean
+    - bundle env
 
-validate lint check rubocop-Ruby 2.7.5-Puppet ~> 7:
+syntax:
+  extends: .common-matrix
   stage: syntax
-  image: ruby:2.7.5
   script:
-  - bundle exec rake validate lint check rubocop
-  variables:
-    PUPPET_GEM_VERSION: "~> 7"
-parallel_spec-Ruby 2.7.5-Puppet ~> 7:
+    - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+
+unit:
+  needs:
+    - syntax
+  extends: .common-matrix
   stage: unit
-  image: ruby:2.7.5
   script:
-  - bundle exec rake parallel_spec
-  variables:
-    PUPPET_GEM_VERSION: "~> 7"
-acceptance with puppet7 ubuntu2204:
+    - bundle exec rake parallel_spec
+
+acceptance:
   needs:
-  - parallel_spec-Ruby 2.7.5-Puppet ~> 7
+    - unit
+  extends:
+    - .common-matrix
+    - .in-acceptance-only-matrix
   stage: acceptance
   variables:
-    RBENV_VERSION: 2.7.5
+    RBENV_VERSION: ${RUBY_VERSION}
     PUPPET_INSTALL_TYPE: agent
     BEAKER_IS_PE: 'no'
-    BEAKER_PUPPET_COLLECTION: puppet7
+    BEAKER_PUPPET_COLLECTION: puppet${PUPPET_COLLECTION}
     BEAKER_debug: 'true'
-    BEAKER_setfile: ubuntu2204-64{hostname=comptoir.example.com}
+    BEAKER_setfile: ${DISTRIB}{hostname=comptoir.example.com}
     BEAKER_HYPERVISOR: docker
   script:
-  - bundle exec rake beaker
+    - bundle exec rake beaker
   tags:
-  - puppet-tests
+    - beaker-acceptance
+
 module release:
   stage: release
-  image: ruby:2.7.5
+  extends: .common-matrix
   variables:
-    PUPPET_GEM_VERSION: "~> 7"
     BLACKSMITH_FORGE_USERNAME: "$BLACKSMITH_FORGE_USERNAME"
     BLACKSMITH_FORGE_API_KEY: "$BLACKSMITH_FORGE_API_KEY"
   script:
-  - bundle exec puppet strings generate --format markdown --out REFERENCE.md
-  - bundle exec rake module:push
+    - bundle exec puppet strings generate --format markdown --out REFERENCE.md
+    - bundle exec rake module:push
   only:
-  - tags
+    - tags
   except:
-  - branches
+    - branches
   artifacts:
     paths:
-    - pkg/
+      - pkg/
     expire_in: 6 weeks
-