From 6fc41f8ba24482444badf8d2b8aff79a7e138e8d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 2 Feb 2022 22:58:37 +0000 Subject: [PATCH] ci(kitchen+gitlab): update for new pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/410 --- .gitlab-ci.yml | 6 ------ .travis.yml | 6 ------ kitchen.yml | 26 -------------------------- 3 files changed, 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1714498..3f1e1b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,20 +145,14 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'} # default-debian-9-3004-0-py3: {extends: '.test_instance'} # default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} # default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} -# default-debian-11-3003-3-py3: {extends: '.test_instance'} # default-debian-10-3003-3-py3: {extends: '.test_instance'} # default-debian-9-3003-3-py3: {extends: '.test_instance'} # default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} # default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} -# default-debian-11-3002-7-py3: {extends: '.test_instance'} # default-debian-10-3002-7-py3: {extends: '.test_instance'} # default-debian-9-3002-7-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} # default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} -# default-debian-10-3001-8-py3: {extends: '.test_instance'} -# default-debian-9-3001-8-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 3738488..d222243 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,20 +98,14 @@ jobs: # - env: INSTANCE=default-debian-9-3004-0-py3 # - env: INSTANCE=default-ubuntu-2004-3004-0-py3 # - env: INSTANCE=default-ubuntu-1804-3004-0-py3 - # - env: INSTANCE=default-debian-11-3003-3-py3 # - env: INSTANCE=default-debian-10-3003-3-py3 # - env: INSTANCE=default-debian-9-3003-3-py3 # - env: INSTANCE=default-ubuntu-2004-3003-3-py3 # - env: INSTANCE=default-ubuntu-1804-3003-3-py3 - # - env: INSTANCE=default-debian-11-3002-7-py3 # - env: INSTANCE=default-debian-10-3002-7-py3 # - env: INSTANCE=default-debian-9-3002-7-py3 # - env: INSTANCE=default-ubuntu-2004-3002-7-py3 # - env: INSTANCE=default-ubuntu-1804-3002-7-py3 - # - env: INSTANCE=default-debian-10-3001-8-py3 - # - env: INSTANCE=default-debian-9-3001-8-py3 - # - env: INSTANCE=default-ubuntu-2004-3001-8-py3 - # - env: INSTANCE=default-ubuntu-1804-3001-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 96da31b..bee43a6 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -86,10 +86,6 @@ platforms: run_command: /lib/systemd/systemd ## SALT `3003.3` - - name: debian-11-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:debian-11 - run_command: /lib/systemd/systemd - name: debian-10-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:debian-10 @@ -108,10 +104,6 @@ platforms: run_command: /lib/systemd/systemd ## SALT `3002.7` - - name: debian-11-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:debian-11 - run_command: /lib/systemd/systemd - name: debian-10-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:debian-10 @@ -129,24 +121,6 @@ platforms: image: saltimages/salt-3002.7-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3001.8` - - name: debian-10-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-2004-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - verifier: # https://www.inspec.io/ name: inspec