From f8e4ba0e88e58c72ed14b8e7cf4143a446fda74b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 19 Aug 2021 10:13:52 +0100 Subject: [PATCH] ci(kitchen+ci): update with latest `3003.2` pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/360 --- .gitlab-ci.yml | 31 +++++++------- .travis.yml | 31 +++++++------- kitchen.yml | 108 ++++++++++++++++++++++++++++--------------------- 3 files changed, 94 insertions(+), 76 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e16eb5..3d0e313 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,21 +152,22 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'} redhat-oraclelinux-7-master-py3: {extends: '.test_instance'} redhat-almalinux-8-master-py3: {extends: '.test_instance'} redhat-rockylinux-8-master-py3: {extends: '.test_instance'} -# debian-debian-11-3003-1-py3: {extends: '.test_instance'} -# debian-debian-10-3003-1-py3: {extends: '.test_instance'} -# debian-debian-9-3003-1-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} -# redhat-centos-8-3003-1-py3: {extends: '.test_instance'} -# redhat-centos-7-3003-1-py3: {extends: '.test_instance'} -# redhat-fedora-34-3003-1-py3: {extends: '.test_instance'} -# redhat-fedora-33-3003-1-py3: {extends: '.test_instance'} -# suse-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'} -# suse-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'} -# suse-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'} -# redhat-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} -# redhat-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} -# redhat-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} +# debian-debian-11-3003-2-py3: {extends: '.test_instance'} +# debian-debian-10-3003-2-py3: {extends: '.test_instance'} +# debian-debian-9-3003-2-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-2004-3003-2-py3: {extends: '.test_instance'} +# ubuntu-ubuntu-1804-3003-2-py3: {extends: '.test_instance'} +# redhat-centos-8-3003-2-py3: {extends: '.test_instance'} +# redhat-centos-7-3003-2-py3: {extends: '.test_instance'} +# redhat-fedora-34-3003-2-py3: {extends: '.test_instance'} +# redhat-fedora-33-3003-2-py3: {extends: '.test_instance'} +# suse-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'} +# suse-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'} +# suse-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'} +# redhat-amazonlinux-2-3003-2-py3: {extends: '.test_instance'} +# redhat-oraclelinux-8-3003-2-py3: {extends: '.test_instance'} +# redhat-oraclelinux-7-3003-2-py3: {extends: '.test_instance'} +# redhat-almalinux-8-3003-2-py3: {extends: '.test_instance'} # debian-debian-11-3002-6-py3: {extends: '.test_instance'} # debian-debian-10-3002-6-py3: {extends: '.test_instance'} # debian-debian-9-3002-6-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index da23122..4205a67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,21 +112,22 @@ jobs: - env: INSTANCE=redhat-oraclelinux-7-master-py3 - env: INSTANCE=redhat-almalinux-8-master-py3 - env: INSTANCE=redhat-rockylinux-8-master-py3 - # - env: INSTANCE=debian-debian-11-3003-1-py3 - # - env: INSTANCE=debian-debian-10-3003-1-py3 - # - env: INSTANCE=debian-debian-9-3003-1-py3 - # - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3 - # - env: INSTANCE=ubuntu-ubuntu-1804-3003-1-py3 - # - env: INSTANCE=redhat-centos-8-3003-1-py3 - # - env: INSTANCE=redhat-centos-7-3003-1-py3 - # - env: INSTANCE=redhat-fedora-34-3003-1-py3 - # - env: INSTANCE=redhat-fedora-33-3003-1-py3 - # - env: INSTANCE=suse-opensuse-leap-153-3003-1-py3 - # - env: INSTANCE=suse-opensuse-leap-152-3003-1-py3 - # - env: INSTANCE=suse-opensuse-tmbl-latest-3003-1-py3 - # - env: INSTANCE=redhat-amazonlinux-2-3003-1-py3 - # - env: INSTANCE=redhat-oraclelinux-8-3003-1-py3 - # - env: INSTANCE=redhat-oraclelinux-7-3003-1-py3 + # - env: INSTANCE=debian-debian-11-3003-2-py3 + # - env: INSTANCE=debian-debian-10-3003-2-py3 + # - env: INSTANCE=debian-debian-9-3003-2-py3 + # - env: INSTANCE=ubuntu-ubuntu-2004-3003-2-py3 + # - env: INSTANCE=ubuntu-ubuntu-1804-3003-2-py3 + # - env: INSTANCE=redhat-centos-8-3003-2-py3 + # - env: INSTANCE=redhat-centos-7-3003-2-py3 + # - env: INSTANCE=redhat-fedora-34-3003-2-py3 + # - env: INSTANCE=redhat-fedora-33-3003-2-py3 + # - env: INSTANCE=suse-opensuse-leap-153-3003-2-py3 + # - env: INSTANCE=suse-opensuse-leap-152-3003-2-py3 + # - env: INSTANCE=suse-opensuse-tmbl-latest-3003-2-py3 + # - env: INSTANCE=redhat-amazonlinux-2-3003-2-py3 + # - env: INSTANCE=redhat-oraclelinux-8-3003-2-py3 + # - env: INSTANCE=redhat-oraclelinux-7-3003-2-py3 + # - env: INSTANCE=redhat-almalinux-8-3003-2-py3 # - env: INSTANCE=debian-debian-11-3002-6-py3 # - env: INSTANCE=debian-debian-10-3002-6-py3 # - env: INSTANCE=debian-debian-9-3002-6-py3 diff --git a/kitchen.yml b/kitchen.yml index 1be4153..dbf914f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -142,69 +142,84 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.1` - - name: debian-11-3003-1-py3 + ## SALT `3003.2` + - name: debian-11-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-11 + image: saltimages/salt-3003.2-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3003-1-py3 + - name: debian-10-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-10 + image: saltimages/salt-3003.2-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-1-py3 + - name: debian-9-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-9 + image: saltimages/salt-3003.2-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-1-py3 + - name: ubuntu-2004-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:ubuntu-20.04 + image: saltimages/salt-3003.2-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-1-py3 + - name: ubuntu-1804-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:ubuntu-18.04 + image: saltimages/salt-3003.2-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3003-1-py3 + - name: centos-8-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:centos-8 - - name: centos-7-3003-1-py3 + image: saltimages/salt-3003.2-py3:centos-8 + - name: centos-7-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:centos-7 - - name: fedora-34-3003-1-py3 + image: saltimages/salt-3003.2-py3:centos-7 + - name: fedora-34-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:fedora-34 - - name: fedora-33-3003-1-py3 + image: saltimages/salt-3003.2-py3:fedora-34 + - name: fedora-33-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:fedora-33 - - name: opensuse-leap-153-3003-1-py3 + image: saltimages/salt-3003.2-py3:fedora-33 + - name: opensuse-leap-153-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 + image: saltimages/salt-3003.2-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3003-1-py3 + - name: opensuse-leap-152-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 + image: saltimages/salt-3003.2-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3003-1-py3 + - name: opensuse-tmbl-latest-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3003-1-py3 + - name: amazonlinux-2-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:amazonlinux-2 - - name: oraclelinux-8-3003-1-py3 + image: saltimages/salt-3003.2-py3:amazonlinux-2 + - name: oraclelinux-8-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:oraclelinux-8 - - name: oraclelinux-7-3003-1-py3 + image: saltimages/salt-3003.2-py3:oraclelinux-8 + - name: oraclelinux-7-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:oraclelinux-7 + image: saltimages/salt-3003.2-py3:oraclelinux-7 + - name: arch-base-latest-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:arch-base-latest + - name: gentoo-stage3-latest-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd + - name: almalinux-8-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:almalinux-8 + + ## SALT `3003.1` - name: arch-base-latest-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:arch-base-latest @@ -436,9 +451,9 @@ suites: - debian-11-master-py3 - debian-10-master-py3 - debian-9-master-py3 - - debian-11-3003-1-py3 - - debian-10-3003-1-py3 - - debian-9-3003-1-py3 + - debian-11-3003-2-py3 + - debian-10-3003-2-py3 + - debian-9-3003-2-py3 - debian-11-3002-6-py3 - debian-10-3002-6-py3 - debian-9-3002-6-py3 @@ -473,8 +488,8 @@ suites: - ubuntu-1804-tiamat-py3 - ubuntu-2004-master-py3 - ubuntu-1804-master-py3 - - ubuntu-2004-3003-1-py3 - - ubuntu-1804-3003-1-py3 + - ubuntu-2004-3003-2-py3 + - ubuntu-1804-3003-2-py3 - ubuntu-2004-3002-6-py3 - ubuntu-1804-3002-6-py3 - ubuntu-2004-3001-7-py3 @@ -522,13 +537,14 @@ suites: - oraclelinux-7-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 - - centos-8-3003-1-py3 - - centos-7-3003-1-py3 - - fedora-34-3003-1-py3 - - fedora-33-3003-1-py3 - - amazonlinux-2-3003-1-py3 - - oraclelinux-8-3003-1-py3 - - oraclelinux-7-3003-1-py3 + - centos-8-3003-2-py3 + - centos-7-3003-2-py3 + - fedora-34-3003-2-py3 + - fedora-33-3003-2-py3 + - amazonlinux-2-3003-2-py3 + - oraclelinux-8-3003-2-py3 + - oraclelinux-7-3003-2-py3 + - almalinux-8-3003-2-py3 - centos-8-3002-6-py3 - centos-7-3002-6-py3 - fedora-34-3002-6-py3 @@ -569,9 +585,9 @@ suites: - opensuse-leap-153-master-py3 - opensuse-leap-152-master-py3 - opensuse-tmbl-latest-master-py3 - - opensuse-leap-153-3003-1-py3 - - opensuse-leap-152-3003-1-py3 - - opensuse-tmbl-latest-3003-1-py3 + - opensuse-leap-153-3003-2-py3 + - opensuse-leap-152-3003-2-py3 + - opensuse-tmbl-latest-3003-2-py3 - opensuse-leap-153-3002-2-py3 - opensuse-leap-152-3002-2-py3 - opensuse-tmbl-latest-3002-2-py3