ci(kitchen+ci): update with latest 3003.2 pre-salted images [skip ci]

* Automated using myii/ssf-formula#360
saltstack-formulas · Aug 19, 2021 · 1b8604d · 1b8604d
1 parent b4b0385
commit 1b8604d
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 61 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -199,21 +199,25 @@ gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 default-almalinux-8-master-py3: {extends: '.test_instance'}
 default-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-11-3003-1-py3: {extends: '.test_instance'}
-# default-debian-10-3003-1-py3: {extends: '.test_instance'}
-# default-debian-9-3003-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
-# default-centos-8-3003-1-py3: {extends: '.test_instance'}
-# default-centos-7-3003-1-py3: {extends: '.test_instance'}
-# default-fedora-34-3003-1-py3: {extends: '.test_instance'}
-# default-fedora-33-3003-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
+# default-debian-11-3003-2-py3: {extends: '.test_instance'}
+# default-debian-10-3003-2-py3: {extends: '.test_instance'}
+# default-debian-9-3003-2-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
+# default-centos-8-3003-2-py3: {extends: '.test_instance'}
+# default-centos-7-3003-2-py3: {extends: '.test_instance'}
+# default-fedora-34-3003-2-py3: {extends: '.test_instance'}
+# default-fedora-33-3003-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
+# gentoo-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
+# gentoo-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
+# default-almalinux-8-3003-2-py3: {extends: '.test_instance'}
 # default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
 # gentoo-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
 # gentoo-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}

diff --git a/.travis.yml b/.travis.yml
@@ -126,21 +126,25 @@ jobs:
     - env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
     - env: INSTANCE=default-almalinux-8-master-py3
     - env: INSTANCE=default-rockylinux-8-master-py3
-    # - env: INSTANCE=default-debian-11-3003-1-py3
-    # - env: INSTANCE=default-debian-10-3003-1-py3
-    # - env: INSTANCE=default-debian-9-3003-1-py3
-    # - env: INSTANCE=default-ubuntu-2004-3003-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3003-1-py3
-    # - env: INSTANCE=default-centos-8-3003-1-py3
-    # - env: INSTANCE=default-centos-7-3003-1-py3
-    # - env: INSTANCE=default-fedora-34-3003-1-py3
-    # - env: INSTANCE=default-fedora-33-3003-1-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3003-1-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3003-1-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-1-py3
+    # - env: INSTANCE=default-debian-11-3003-2-py3
+    # - env: INSTANCE=default-debian-10-3003-2-py3
+    # - env: INSTANCE=default-debian-9-3003-2-py3
+    # - env: INSTANCE=default-ubuntu-2004-3003-2-py3
+    # - env: INSTANCE=default-ubuntu-1804-3003-2-py3
+    # - env: INSTANCE=default-centos-8-3003-2-py3
+    # - env: INSTANCE=default-centos-7-3003-2-py3
+    # - env: INSTANCE=default-fedora-34-3003-2-py3
+    # - env: INSTANCE=default-fedora-33-3003-2-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3003-2-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3003-2-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-2-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-2-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-2-py3
+    # - env: INSTANCE=default-arch-base-latest-3003-2-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-latest-3003-2-py3
+    # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3003-2-py3
+    # - env: INSTANCE=default-almalinux-8-3003-2-py3
     # - env: INSTANCE=default-arch-base-latest-3003-1-py3
     # - env: INSTANCE=gentoo-gentoo-stage3-latest-3003-1-py3
     # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3003-1-py3

diff --git 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.2-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:oraclelinux-7
+  - name: arch-base-latest-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-1-py3
+      image: saltimages/salt-3003.2-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-1-py3
+      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.1-py3:oraclelinux-7
+      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
@@ -432,6 +447,8 @@ suites:
     excludes:
       - gentoo-stage3-latest-master-py3
       - gentoo-stage3-systemd-master-py3
+      - gentoo-stage3-latest-3003-2-py3
+      - gentoo-stage3-systemd-3003-2-py3
       - gentoo-stage3-latest-3003-1-py3
       - gentoo-stage3-systemd-3003-1-py3
       - gentoo-stage3-latest-3002-6-py3
@@ -462,6 +479,8 @@ suites:
     includes:
       - gentoo-stage3-latest-master-py3
       - gentoo-stage3-systemd-master-py3
+      - gentoo-stage3-latest-3003-2-py3
+      - gentoo-stage3-systemd-3003-2-py3
       - gentoo-stage3-latest-3003-1-py3
       - gentoo-stage3-systemd-3003-1-py3
       - gentoo-stage3-latest-3002-6-py3