From a85cb0405afb7c7cca1f4e42652f615361f8fa3f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 3 Apr 2022 15:02:20 +0100 Subject: [PATCH] ci(kitchen+gitlab): update for new pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/426 --- .gitlab-ci.yml | 26 +++++++++++----------- .travis.yml | 26 +++++++++++----------- kitchen.yml | 58 +++++++++++++++++++++++++------------------------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6b00b9..239730c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,19 +141,19 @@ default-debian-10-master-py3: {extends: '.test_instance'} default-debian-9-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'} default-ubuntu-1804-master-py3: {extends: '.test_instance'} -# default-debian-11-3004-0-py3: {extends: '.test_instance'} -# default-debian-10-3004-0-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-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-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-11-3004-1-py3: {extends: '.test_instance'} +# default-debian-10-3004-1-py3: {extends: '.test_instance'} +# default-debian-9-3004-1-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} +# default-debian-10-3003-4-py3: {extends: '.test_instance'} +# default-debian-9-3003-4-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'} +# default-debian-10-3002-8-py3: {extends: '.test_instance'} +# default-debian-9-3002-8-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/.travis.yml b/.travis.yml index d222243..f00070b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,19 +93,19 @@ jobs: - env: INSTANCE=default-debian-9-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3 - env: INSTANCE=default-ubuntu-1804-master-py3 - # - env: INSTANCE=default-debian-11-3004-0-py3 - # - env: INSTANCE=default-debian-10-3004-0-py3 - # - 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-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-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-11-3004-1-py3 + # - env: INSTANCE=default-debian-10-3004-1-py3 + # - env: INSTANCE=default-debian-9-3004-1-py3 + # - env: INSTANCE=default-ubuntu-2004-3004-1-py3 + # - env: INSTANCE=default-ubuntu-1804-3004-1-py3 + # - env: INSTANCE=default-debian-10-3003-4-py3 + # - env: INSTANCE=default-debian-9-3003-4-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-4-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-4-py3 + # - env: INSTANCE=default-debian-10-3002-8-py3 + # - env: INSTANCE=default-debian-9-3002-8-py3 + # - env: INSTANCE=default-ubuntu-2004-3002-8-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index bee43a6..edbf949 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -63,62 +63,62 @@ platforms: image: saltimages/salt-master-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3004.0` - - name: debian-11-3004-0-py3 + ## SALT `3004.1` + - name: debian-11-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-11 + image: saltimages/salt-3004.1-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3004-0-py3 + - name: debian-10-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-10 + image: saltimages/salt-3004.1-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3004-0-py3 + - name: debian-9-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-9 + image: saltimages/salt-3004.1-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3004-0-py3 + - name: ubuntu-2004-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:ubuntu-20.04 + image: saltimages/salt-3004.1-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3004-0-py3 + - name: ubuntu-1804-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:ubuntu-18.04 + image: saltimages/salt-3004.1-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3003.3` - - name: debian-10-3003-3-py3 + ## SALT `3003.4` + - name: debian-10-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:debian-10 + image: saltimages/salt-3003.4-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-3-py3 + - name: debian-9-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:debian-9 + image: saltimages/salt-3003.4-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-3-py3 + - name: ubuntu-2004-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:ubuntu-20.04 + image: saltimages/salt-3003.4-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-3-py3 + - name: ubuntu-1804-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:ubuntu-18.04 + image: saltimages/salt-3003.4-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3002.7` - - name: debian-10-3002-7-py3 + ## SALT `3002.8` + - name: debian-10-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:debian-10 + image: saltimages/salt-3002.8-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3002-7-py3 + - name: debian-9-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:debian-9 + image: saltimages/salt-3002.8-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-7-py3 + - name: ubuntu-2004-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:ubuntu-20.04 + image: saltimages/salt-3002.8-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-7-py3 + - name: ubuntu-1804-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:ubuntu-18.04 + image: saltimages/salt-3002.8-py3:ubuntu-18.04 run_command: /lib/systemd/systemd verifier: