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

* Automated using myii/ssf-formula#374
saltstack-formulas · Oct 5, 2021 · 68d6aab · 68d6aab
1 parent 9e1753c
commit 68d6aab
Show file tree

Hide file tree

Showing 4 changed files with 271 additions and 386 deletions.
diff --git a/.gitignore b/.gitignore
@@ -127,6 +127,7 @@ tmp/
 # `salt-formula` -- Vagrant Specific files
 .vagrant
 top.sls
+!test/salt/pillar/top.sls
 
 # `suricata-formula` -- Platform binaries
 *.rpm

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -174,77 +174,60 @@ git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 rpm-almalinux-8-master-py3: {extends: '.test_instance'}
 # git-rockylinux-8-master-py3: {extends: '.test_instance'}
 rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
-# git-debian-11-3003-2-py3: {extends: '.test_instance'}
-# git-debian-10-3003-2-py3: {extends: '.test_instance'}
-# git-debian-9-3003-2-py3: {extends: '.test_instance'}
-# git-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
-# git-centos-8-3003-2-py3: {extends: '.test_instance'}
-# git-centos-7-3003-2-py3: {extends: '.test_instance'}
-# git-fedora-34-3003-2-py3: {extends: '.test_instance'}
-# git-fedora-33-3003-2-py3: {extends: '.test_instance'}
-# git-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
-# git-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
-# git-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
-# git-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
-# git-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
-# git-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
-# git-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
-# git-almalinux-8-3003-2-py3: {extends: '.test_instance'}
-# git-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
-# git-debian-11-3002-6-py3: {extends: '.test_instance'}
-# git-debian-10-3002-6-py3: {extends: '.test_instance'}
-# git-debian-9-3002-6-py3: {extends: '.test_instance'}
-# git-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
-# git-centos-8-3002-6-py3: {extends: '.test_instance'}
-# git-centos-7-3002-6-py3: {extends: '.test_instance'}
-# git-fedora-34-3002-6-py3: {extends: '.test_instance'}
-# git-fedora-33-3002-6-py3: {extends: '.test_instance'}
-# git-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
-# git-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
-# git-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
-# git-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
-# git-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
-# git-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
-# git-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
-# git-debian-10-3001-7-py3: {extends: '.test_instance'}
-# git-debian-9-3001-7-py3: {extends: '.test_instance'}
-# git-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
-# git-centos-8-3001-7-py3: {extends: '.test_instance'}
-# git-centos-7-3001-7-py3: {extends: '.test_instance'}
-# git-fedora-34-3001-7-py3: {extends: '.test_instance'}
-# git-fedora-33-3001-7-py3: {extends: '.test_instance'}
-# git-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
-# git-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
-# git-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
-# git-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
-# git-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
-# git-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
-# git-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
-# git-debian-10-3000-9-py3: {extends: '.test_instance'}
-# git-debian-9-3000-9-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-# git-centos-8-3000-9-py3: {extends: '.test_instance'}
-# git-centos-7-3000-9-py3: {extends: '.test_instance'}
-# git-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
-# git-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
-# git-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
-# git-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
-# git-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
-# git-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
-# git-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
-# git-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
+# git-debian-11-3003-3-py3: {extends: '.test_instance'}
+# git-debian-10-3003-3-py3: {extends: '.test_instance'}
+# git-debian-9-3003-3-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# git-centos-8-3003-3-py3: {extends: '.test_instance'}
+# git-centos-7-3003-3-py3: {extends: '.test_instance'}
+# git-fedora-34-3003-3-py3: {extends: '.test_instance'}
+# git-fedora-33-3003-3-py3: {extends: '.test_instance'}
+# git-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
+# git-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
+# git-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
+# git-almalinux-8-3003-3-py3: {extends: '.test_instance'}
+# git-debian-11-3002-7-py3: {extends: '.test_instance'}
+# git-debian-10-3002-7-py3: {extends: '.test_instance'}
+# git-debian-9-3002-7-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# git-centos-8-3002-7-py3: {extends: '.test_instance'}
+# git-centos-7-3002-7-py3: {extends: '.test_instance'}
+# git-fedora-34-3002-7-py3: {extends: '.test_instance'}
+# git-fedora-33-3002-7-py3: {extends: '.test_instance'}
+# git-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
+# git-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
+# git-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
+# git-debian-10-3001-8-py3: {extends: '.test_instance'}
+# git-debian-9-3001-8-py3: {extends: '.test_instance'}
+# git-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
+# git-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
+# git-centos-8-3001-8-py3: {extends: '.test_instance'}
+# git-centos-7-3001-8-py3: {extends: '.test_instance'}
+# git-fedora-34-3001-8-py3: {extends: '.test_instance'}
+# git-fedora-33-3001-8-py3: {extends: '.test_instance'}
+# git-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
+# git-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
+# git-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
+# git-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
+# git-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
+# git-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
+# git-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
+# git-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -134,77 +134,60 @@ jobs:
     - env: INSTANCE=rpm-almalinux-8-master-py3
     # - env: INSTANCE=git-rockylinux-8-master-py3
     - env: INSTANCE=rpm-rockylinux-8-master-py3
-    # - env: INSTANCE=git-debian-11-3003-2-py3
-    # - env: INSTANCE=git-debian-10-3003-2-py3
-    # - env: INSTANCE=git-debian-9-3003-2-py3
-    # - env: INSTANCE=git-ubuntu-2004-3003-2-py3
-    # - env: INSTANCE=git-ubuntu-1804-3003-2-py3
-    # - env: INSTANCE=git-centos-8-3003-2-py3
-    # - env: INSTANCE=git-centos-7-3003-2-py3
-    # - env: INSTANCE=git-fedora-34-3003-2-py3
-    # - env: INSTANCE=git-fedora-33-3003-2-py3
-    # - env: INSTANCE=git-opensuse-leap-153-3003-2-py3
-    # - env: INSTANCE=git-opensuse-leap-152-3003-2-py3
-    # - env: INSTANCE=git-opensuse-tmbl-latest-3003-2-py3
-    # - env: INSTANCE=git-amazonlinux-2-3003-2-py3
-    # - env: INSTANCE=git-oraclelinux-8-3003-2-py3
-    # - env: INSTANCE=git-oraclelinux-7-3003-2-py3
-    # - env: INSTANCE=git-arch-base-latest-3003-2-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3003-2-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3003-2-py3
-    # - env: INSTANCE=git-almalinux-8-3003-2-py3
-    # - env: INSTANCE=git-arch-base-latest-3003-1-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3003-1-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3003-1-py3
-    # - env: INSTANCE=git-debian-11-3002-6-py3
-    # - env: INSTANCE=git-debian-10-3002-6-py3
-    # - env: INSTANCE=git-debian-9-3002-6-py3
-    # - env: INSTANCE=git-ubuntu-2004-3002-6-py3
-    # - env: INSTANCE=git-ubuntu-1804-3002-6-py3
-    # - env: INSTANCE=git-centos-8-3002-6-py3
-    # - env: INSTANCE=git-centos-7-3002-6-py3
-    # - env: INSTANCE=git-fedora-34-3002-6-py3
-    # - env: INSTANCE=git-fedora-33-3002-6-py3
-    # - env: INSTANCE=git-amazonlinux-2-3002-6-py3
-    # - env: INSTANCE=git-oraclelinux-8-3002-6-py3
-    # - env: INSTANCE=git-oraclelinux-7-3002-6-py3
-    # - env: INSTANCE=git-arch-base-latest-3002-6-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3002-6-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3002-6-py3
-    # - env: INSTANCE=git-opensuse-leap-153-3002-2-py3
-    # - env: INSTANCE=git-opensuse-leap-152-3002-2-py3
-    # - env: INSTANCE=git-opensuse-tmbl-latest-3002-2-py3
-    # - env: INSTANCE=git-debian-10-3001-7-py3
-    # - env: INSTANCE=git-debian-9-3001-7-py3
-    # - env: INSTANCE=git-ubuntu-2004-3001-7-py3
-    # - env: INSTANCE=git-ubuntu-1804-3001-7-py3
-    # - env: INSTANCE=git-centos-8-3001-7-py3
-    # - env: INSTANCE=git-centos-7-3001-7-py3
-    # - env: INSTANCE=git-fedora-34-3001-7-py3
-    # - env: INSTANCE=git-fedora-33-3001-7-py3
-    # - env: INSTANCE=git-opensuse-leap-153-3001-7-py3
-    # - env: INSTANCE=git-opensuse-leap-152-3001-7-py3
-    # - env: INSTANCE=git-opensuse-tmbl-latest-3001-7-py3
-    # - env: INSTANCE=git-amazonlinux-2-3001-7-py3
-    # - env: INSTANCE=git-oraclelinux-8-3001-7-py3
-    # - env: INSTANCE=git-oraclelinux-7-3001-7-py3
-    # - env: INSTANCE=git-arch-base-latest-3001-7-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3001-7-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3001-7-py3
-    # - env: INSTANCE=git-debian-10-3000-9-py3
-    # - env: INSTANCE=git-debian-9-3000-9-py3
-    # - env: INSTANCE=git-ubuntu-1804-3000-9-py3
-    # - env: INSTANCE=git-centos-8-3000-9-py3
-    # - env: INSTANCE=git-centos-7-3000-9-py3
-    # - env: INSTANCE=git-opensuse-leap-153-3000-9-py3
-    # - env: INSTANCE=git-opensuse-leap-152-3000-9-py3
-    # - env: INSTANCE=git-amazonlinux-2-3000-9-py3
-    # - env: INSTANCE=git-oraclelinux-8-3000-9-py3
-    # - env: INSTANCE=git-oraclelinux-7-3000-9-py3
-    # - env: INSTANCE=git-gentoo-stage3-latest-3000-9-py3
-    # - env: INSTANCE=git-gentoo-stage3-systemd-3000-9-py3
-    # - env: INSTANCE=git-ubuntu-1804-3000-9-py2
-    # - env: INSTANCE=git-arch-base-latest-3000-9-py2
+    # - env: INSTANCE=git-debian-11-3003-3-py3
+    # - env: INSTANCE=git-debian-10-3003-3-py3
+    # - env: INSTANCE=git-debian-9-3003-3-py3
+    # - env: INSTANCE=git-ubuntu-2004-3003-3-py3
+    # - env: INSTANCE=git-ubuntu-1804-3003-3-py3
+    # - env: INSTANCE=git-centos-8-3003-3-py3
+    # - env: INSTANCE=git-centos-7-3003-3-py3
+    # - env: INSTANCE=git-fedora-34-3003-3-py3
+    # - env: INSTANCE=git-fedora-33-3003-3-py3
+    # - env: INSTANCE=git-opensuse-leap-153-3003-3-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3003-3-py3
+    # - env: INSTANCE=git-opensuse-tmbl-latest-3003-3-py3
+    # - env: INSTANCE=git-amazonlinux-2-3003-3-py3
+    # - env: INSTANCE=git-oraclelinux-8-3003-3-py3
+    # - env: INSTANCE=git-oraclelinux-7-3003-3-py3
+    # - env: INSTANCE=git-arch-base-latest-3003-3-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3003-3-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3003-3-py3
+    # - env: INSTANCE=git-almalinux-8-3003-3-py3
+    # - env: INSTANCE=git-debian-11-3002-7-py3
+    # - env: INSTANCE=git-debian-10-3002-7-py3
+    # - env: INSTANCE=git-debian-9-3002-7-py3
+    # - env: INSTANCE=git-ubuntu-2004-3002-7-py3
+    # - env: INSTANCE=git-ubuntu-1804-3002-7-py3
+    # - env: INSTANCE=git-centos-8-3002-7-py3
+    # - env: INSTANCE=git-centos-7-3002-7-py3
+    # - env: INSTANCE=git-fedora-34-3002-7-py3
+    # - env: INSTANCE=git-fedora-33-3002-7-py3
+    # - env: INSTANCE=git-opensuse-leap-153-3002-7-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3002-7-py3
+    # - env: INSTANCE=git-opensuse-tmbl-latest-3002-7-py3
+    # - env: INSTANCE=git-amazonlinux-2-3002-7-py3
+    # - env: INSTANCE=git-oraclelinux-8-3002-7-py3
+    # - env: INSTANCE=git-oraclelinux-7-3002-7-py3
+    # - env: INSTANCE=git-arch-base-latest-3002-7-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3002-7-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3002-7-py3
+    # - env: INSTANCE=git-debian-10-3001-8-py3
+    # - env: INSTANCE=git-debian-9-3001-8-py3
+    # - env: INSTANCE=git-ubuntu-2004-3001-8-py3
+    # - env: INSTANCE=git-ubuntu-1804-3001-8-py3
+    # - env: INSTANCE=git-centos-8-3001-8-py3
+    # - env: INSTANCE=git-centos-7-3001-8-py3
+    # - env: INSTANCE=git-fedora-34-3001-8-py3
+    # - env: INSTANCE=git-fedora-33-3001-8-py3
+    # - env: INSTANCE=git-opensuse-leap-153-3001-8-py3
+    # - env: INSTANCE=git-opensuse-leap-152-3001-8-py3
+    # - env: INSTANCE=git-opensuse-tmbl-latest-3001-8-py3
+    # - env: INSTANCE=git-amazonlinux-2-3001-8-py3
+    # - env: INSTANCE=git-oraclelinux-8-3001-8-py3
+    # - env: INSTANCE=git-oraclelinux-7-3001-8-py3
+    # - env: INSTANCE=git-arch-base-latest-3001-8-py3
+    # - env: INSTANCE=git-gentoo-stage3-latest-3001-8-py3
+    # - env: INSTANCE=git-gentoo-stage3-systemd-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'