From 5bafad228f7a5ac9789dfb8737414750dea2a35c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 23 Apr 2021 01:24:57 +0100 Subject: [PATCH] ci(kitchen+gitlab): adjust matrix to add `3003` * Automated using https://github.com/myii/ssf-formula/pull/318 --- .gitlab-ci.yml | 76 ++++++++------------------------------------------ kitchen.yml | 54 ++++++++++++++++++++--------------- 2 files changed, 43 insertions(+), 87 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f63822..95d7f1b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,60 +45,6 @@ stages: variables: DOCKER_DRIVER: 'overlay2' -############################################################################### -# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed) -############################################################################### -commitlint: - stage: *stage_lint - image: *image_commitlint - script: - # Add `upstream` remote to get access to `upstream/master` - - 'git remote add upstream - https://gitlab.com/saltstack-formulas/devstack-formula.git' - - 'git fetch --all' - # Set default commit hashes for `--from` and `--to` - - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"' - - 'export COMMITLINT_TO="${CI_COMMIT_SHA}"' - # `coqbot` adds a merge commit to test PRs on top of the latest commit in - # the repo; amend this merge commit message to avoid failure - - | - if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \ - && [ "${CI_COMMIT_BRANCH}" != "master" ]; then - git commit --amend -m \ - 'chore: reword coqbot merge commit message for commitlint' - export COMMITLINT_TO=HEAD - fi - # Run `commitlint` - - 'commitlint --from "${COMMITLINT_FROM}" - --to "${COMMITLINT_TO}" - --verbose' - -pre-commit: - stage: *stage_lint - image: *image_precommit - # https://pre-commit.com/#gitlab-ci-example - variables: - PRE_COMMIT_HOME: '${CI_PROJECT_DIR}/.cache/pre-commit' - cache: - key: '${CI_JOB_NAME}' - paths: - - '${PRE_COMMIT_HOME}' - script: - - 'pre-commit run --all-files --color always --verbose' - -# Use a separate job for `rubocop` other than the one potentially run by `pre-commit` -# - The `pre-commit` check will only be available for formulas that pass the default -# `rubocop` check -- and must continue to do so -# - This job is allowed to fail, so can be used for all formulas -# - Furthermore, this job uses all of the latest `rubocop` features & cops, -# which will help when upgrading the `rubocop` linter used in `pre-commit` -rubocop: - allow_failure: true - stage: *stage_lint - image: *image_rubocop - script: - - 'rubocop -d -P -S --enable-pending-cops' - ############################################################################### # Define `test` template ############################################################################### @@ -129,16 +75,18 @@ ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} # ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'} ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'} # ubuntu-ubuntu-1604-master-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-2004-3002-5-py3: {extends: '.test_instance'} -ubuntu-ubuntu-1804-3002-5-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3002-5-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-2004-3001-6-py3: {extends: '.test_instance'} -ubuntu-ubuntu-1804-3001-6-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3001-6-py3: {extends: '.test_instance'} -ubuntu-ubuntu-1804-3000-8-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3000-8-py3: {extends: '.test_instance'} -ubuntu-ubuntu-1804-3000-8-py2: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3000-8-py2: {extends: '.test_instance'} +# ubuntu-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} +ubuntu-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} +ubuntu-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} +ubuntu-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} +ubuntu-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} +ubuntu-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} +# ubuntu-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/kitchen.yml b/kitchen.yml index 80b65e0..68dcef9 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -32,41 +32,49 @@ platforms: driver: image: saltimages/salt-master-py3:ubuntu-16.04 - ## SALT `3002.5` - - name: ubuntu-2004-3002-5-py3 + ## SALT `3003.0` + - name: ubuntu-2004-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-20.04 - - name: ubuntu-1804-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-18.04 + + ## SALT `3002.6` + - name: ubuntu-2004-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-16.04 + image: saltimages/salt-3002.6-py3:ubuntu-16.04 - ## SALT `3001.6` - - name: ubuntu-2004-3001-6-py3 + ## SALT `3001.7` + - name: ubuntu-2004-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-16.04 + image: saltimages/salt-3001.7-py3:ubuntu-16.04 - ## SALT `3000.8` - - name: ubuntu-1804-3000-8-py3 + ## SALT `3000.9` + - name: ubuntu-1804-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py3 + image: saltimages/salt-3000.9-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-16.04 - - name: ubuntu-1804-3000-8-py2 + image: saltimages/salt-3000.9-py3:ubuntu-16.04 + - name: ubuntu-1804-3000-9-py2 driver: - image: saltimages/salt-3000.8-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py2 + image: saltimages/salt-3000.9-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py2 driver: - image: saltimages/salt-3000.8-py2:ubuntu-16.04 + image: saltimages/salt-3000.9-py2:ubuntu-16.04 provisioner: name: salt_solo