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

* Automated using myii/ssf-formula#360
saltstack-formulas · Aug 19, 2021 · 4fc33ad · 4fc33ad
1 parent 258cbf5
commit 4fc33ad
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 61 deletions.
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
@@ -129,21 +129,25 @@ jobs:
           # - repo-rockylinux-8-master-py3
           # - clean-rockylinux-8-master-py3
           - rockylinux-8-master-py3
-          # - archive-debian-11-3003-1-py3
-          # - archive-debian-10-3003-1-py3
-          # - archive-debian-9-3003-1-py3
-          # - archive-ubuntu-2004-3003-1-py3
-          # - archive-ubuntu-1804-3003-1-py3
-          # - archive-centos-8-3003-1-py3
-          # - archive-centos-7-3003-1-py3
-          # - archive-fedora-34-3003-1-py3
-          # - archive-fedora-33-3003-1-py3
-          # - archive-opensuse-leap-153-3003-1-py3
-          # - archive-opensuse-leap-152-3003-1-py3
-          # - archive-opensuse-tmbl-latest-3003-1-py3
-          # - archive-amazonlinux-2-3003-1-py3
-          # - archive-oraclelinux-8-3003-1-py3
-          # - archive-oraclelinux-7-3003-1-py3
+          # - archive-debian-11-3003-2-py3
+          # - archive-debian-10-3003-2-py3
+          # - archive-debian-9-3003-2-py3
+          # - archive-ubuntu-2004-3003-2-py3
+          # - archive-ubuntu-1804-3003-2-py3
+          # - archive-centos-8-3003-2-py3
+          # - archive-centos-7-3003-2-py3
+          # - archive-fedora-34-3003-2-py3
+          # - archive-fedora-33-3003-2-py3
+          # - archive-opensuse-leap-153-3003-2-py3
+          # - archive-opensuse-leap-152-3003-2-py3
+          # - archive-opensuse-tmbl-latest-3003-2-py3
+          # - archive-amazonlinux-2-3003-2-py3
+          # - archive-oraclelinux-8-3003-2-py3
+          # - archive-oraclelinux-7-3003-2-py3
+          # - archive-arch-base-latest-3003-2-py3
+          # - archive-gentoo-stage3-latest-3003-2-py3
+          # - archive-gentoo-stage3-systemd-3003-2-py3
+          # - archive-almalinux-8-3003-2-py3
           # - archive-arch-base-latest-3003-1-py3
           # - archive-gentoo-stage3-latest-3003-1-py3
           # - archive-gentoo-stage3-systemd-3003-1-py3

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

diff --git a/kitchen.yml b/kitchen.yml
@@ -209,104 +209,126 @@ 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
       provision_command:
         - apt-get update
         - apt-get -qq -y install conntrack
       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
       provision_command:
         - apt-get update
         - apt-get -qq -y install conntrack
       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
       provision_command:
         - apt-get update
         - apt-get -qq -y install conntrack
       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
       provision_command:
         - apt-get update
         - apt-get -qq -y install conntrack
       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
       provision_command:
         - apt-get update
         - apt-get -qq -y install conntrack
       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
+      image: saltimages/salt-3003.2-py3:centos-8
       provision_command:
         - yum install conntrack-tools -y
-  - name: centos-7-3003-1-py3
+  - name: centos-7-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:centos-7
+      image: saltimages/salt-3003.2-py3:centos-7
       provision_command:
         - yum install conntrack-tools -y
-  - name: fedora-34-3003-1-py3
+  - name: fedora-34-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:fedora-34
+      image: saltimages/salt-3003.2-py3:fedora-34
       provision_command:
         - dnf install conntrack-tools -y
-  - name: fedora-33-3003-1-py3
+  - name: fedora-33-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:fedora-33
+      image: saltimages/salt-3003.2-py3:fedora-33
       provision_command:
         - dnf install conntrack-tools -y
-  - name: opensuse-leap-153-3003-1-py3
+  - 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
       provision_command:
         - zypper --non-interactive install conntrack-tools
     # 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
       provision_command:
         - zypper --non-interactive install conntrack-tools
     # 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
       provision_command:
         - zypper --non-interactive install conntrack-tools
     # 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
+      image: saltimages/salt-3003.2-py3:amazonlinux-2
       provision_command:
         - yum install conntrack-tools -y
-  - name: oraclelinux-8-3003-1-py3
+  - name: oraclelinux-8-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:oraclelinux-8
+      image: saltimages/salt-3003.2-py3:oraclelinux-8
       provision_command:
         - yum install conntrack-tools -y
-  - name: oraclelinux-7-3003-1-py3
+  - name: oraclelinux-7-3003-2-py3
     driver:
-      image: saltimages/salt-3003.1-py3:oraclelinux-7
+      image: saltimages/salt-3003.2-py3:oraclelinux-7
       provision_command:
         - yum install conntrack-tools -y
+  - name: arch-base-latest-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:arch-base-latest
+      provision_command:
+        - (test -x /usr/bin/pacman-mirrors && /usr/bin/pacman-mirrors -g) || true
+        - pacman -S --noconfirm conntrack-tools tar
+  - name: gentoo-stage3-latest-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
+      provision_command:
+        emerge --noreplace --quiet --with-bdeps-auto=n net-firewall/conntrack-tools
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3003-2-py3
+    driver:
+      image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
+      provision_command:
+        emerge --noreplace --quiet --with-bdeps-auto=n net-firewall/conntrack-tools
+  - 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