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

* Automated using myii/ssf-formula#374
saltstack-formulas · Oct 5, 2021 · ded03de · ded03de
1 parent 4df56ed
commit ded03de
Show file tree

Hide file tree

Showing 6 changed files with 254 additions and 367 deletions.
diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
@@ -16,10 +16,8 @@ jobs:
  instance:
  - freebsd-freebsd-130-master-py3
  - freebsd-freebsd-122-master-py3
- - freebsd-freebsd-114-master-py3
  # - freebsd-freebsd-130-3003-1-py3
  # - freebsd-freebsd-122-3003-1-py3
- # - freebsd-freebsd-114-3003-1-py3
  steps:
  - name: 'Check out code'
  uses: 'actions/checkout@v2'

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
@@ -152,62 +152,51 @@ 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-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'}
-# ubuntu-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
-# redhat-centos-8-3002-6-py3: {extends: '.test_instance'}
-# redhat-centos-7-3002-6-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3002-6-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3002-6-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
-# debian-debian-10-3001-7-py3: {extends: '.test_instance'}
-# debian-debian-9-3001-7-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
-# redhat-centos-8-3001-7-py3: {extends: '.test_instance'}
-# redhat-centos-7-3001-7-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3001-7-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3001-7-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
-# debian-debian-10-3000-9-py3: {extends: '.test_instance'}
-# debian-debian-9-3000-9-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-# redhat-centos-8-3000-9-py3: {extends: '.test_instance'}
-# redhat-centos-7-3000-9-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
+# debian-debian-11-3003-3-py3: {extends: '.test_instance'}
+# debian-debian-10-3003-3-py3: {extends: '.test_instance'}
+# debian-debian-9-3003-3-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# redhat-centos-8-3003-3-py3: {extends: '.test_instance'}
+# redhat-centos-7-3003-3-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3003-3-py3: {extends: '.test_instance'}
+# redhat-fedora-33-3003-3-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
+# redhat-almalinux-8-3003-3-py3: {extends: '.test_instance'}
+# debian-debian-11-3002-7-py3: {extends: '.test_instance'}
+# debian-debian-10-3002-7-py3: {extends: '.test_instance'}
+# debian-debian-9-3002-7-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# redhat-centos-8-3002-7-py3: {extends: '.test_instance'}
+# redhat-centos-7-3002-7-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3002-7-py3: {extends: '.test_instance'}
+# redhat-fedora-33-3002-7-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
+# debian-debian-10-3001-8-py3: {extends: '.test_instance'}
+# debian-debian-9-3001-8-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
+# redhat-centos-8-3001-8-py3: {extends: '.test_instance'}
+# redhat-centos-7-3001-8-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3001-8-py3: {extends: '.test_instance'}
+# redhat-fedora-33-3001-8-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -112,62 +112,51 @@ 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-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
- # - env: INSTANCE=ubuntu-ubuntu-2004-3002-6-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3002-6-py3
- # - env: INSTANCE=redhat-centos-8-3002-6-py3
- # - env: INSTANCE=redhat-centos-7-3002-6-py3
- # - env: INSTANCE=redhat-fedora-34-3002-6-py3
- # - env: INSTANCE=redhat-fedora-33-3002-6-py3
- # - env: INSTANCE=redhat-amazonlinux-2-3002-6-py3
- # - env: INSTANCE=redhat-oraclelinux-8-3002-6-py3
- # - env: INSTANCE=redhat-oraclelinux-7-3002-6-py3
- # - env: INSTANCE=suse-opensuse-leap-153-3002-2-py3
- # - env: INSTANCE=suse-opensuse-leap-152-3002-2-py3
- # - env: INSTANCE=suse-opensuse-tmbl-latest-3002-2-py3
- # - env: INSTANCE=debian-debian-10-3001-7-py3
- # - env: INSTANCE=debian-debian-9-3001-7-py3
- # - env: INSTANCE=ubuntu-ubuntu-2004-3001-7-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3001-7-py3
- # - env: INSTANCE=redhat-centos-8-3001-7-py3
- # - env: INSTANCE=redhat-centos-7-3001-7-py3
- # - env: INSTANCE=redhat-fedora-34-3001-7-py3
- # - env: INSTANCE=redhat-fedora-33-3001-7-py3
- # - env: INSTANCE=suse-opensuse-leap-153-3001-7-py3
- # - env: INSTANCE=suse-opensuse-leap-152-3001-7-py3
- # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-7-py3
- # - env: INSTANCE=redhat-amazonlinux-2-3001-7-py3
- # - env: INSTANCE=redhat-oraclelinux-8-3001-7-py3
- # - env: INSTANCE=redhat-oraclelinux-7-3001-7-py3
- # - env: INSTANCE=debian-debian-10-3000-9-py3
- # - env: INSTANCE=debian-debian-9-3000-9-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py3
- # - env: INSTANCE=redhat-centos-8-3000-9-py3
- # - env: INSTANCE=redhat-centos-7-3000-9-py3
- # - env: INSTANCE=suse-opensuse-leap-153-3000-9-py3
- # - env: INSTANCE=suse-opensuse-leap-152-3000-9-py3
- # - env: INSTANCE=redhat-amazonlinux-2-3000-9-py3
- # - env: INSTANCE=redhat-oraclelinux-8-3000-9-py3
- # - env: INSTANCE=redhat-oraclelinux-7-3000-9-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py2
+ # - env: INSTANCE=debian-debian-11-3003-3-py3
+ # - env: INSTANCE=debian-debian-10-3003-3-py3
+ # - env: INSTANCE=debian-debian-9-3003-3-py3
+ # - env: INSTANCE=ubuntu-ubuntu-2004-3003-3-py3
+ # - env: INSTANCE=ubuntu-ubuntu-1804-3003-3-py3
+ # - env: INSTANCE=redhat-centos-8-3003-3-py3
+ # - env: INSTANCE=redhat-centos-7-3003-3-py3
+ # - env: INSTANCE=redhat-fedora-34-3003-3-py3
+ # - env: INSTANCE=redhat-fedora-33-3003-3-py3
+ # - env: INSTANCE=suse-opensuse-leap-153-3003-3-py3
+ # - env: INSTANCE=suse-opensuse-leap-152-3003-3-py3
+ # - env: INSTANCE=suse-opensuse-tmbl-latest-3003-3-py3
+ # - env: INSTANCE=redhat-amazonlinux-2-3003-3-py3
+ # - env: INSTANCE=redhat-oraclelinux-8-3003-3-py3
+ # - env: INSTANCE=redhat-oraclelinux-7-3003-3-py3
+ # - env: INSTANCE=redhat-almalinux-8-3003-3-py3
+ # - env: INSTANCE=debian-debian-11-3002-7-py3
+ # - env: INSTANCE=debian-debian-10-3002-7-py3
+ # - env: INSTANCE=debian-debian-9-3002-7-py3
+ # - env: INSTANCE=ubuntu-ubuntu-2004-3002-7-py3
+ # - env: INSTANCE=ubuntu-ubuntu-1804-3002-7-py3
+ # - env: INSTANCE=redhat-centos-8-3002-7-py3
+ # - env: INSTANCE=redhat-centos-7-3002-7-py3
+ # - env: INSTANCE=redhat-fedora-34-3002-7-py3
+ # - env: INSTANCE=redhat-fedora-33-3002-7-py3
+ # - env: INSTANCE=suse-opensuse-leap-153-3002-7-py3
+ # - env: INSTANCE=suse-opensuse-leap-152-3002-7-py3
+ # - env: INSTANCE=suse-opensuse-tmbl-latest-3002-7-py3
+ # - env: INSTANCE=redhat-amazonlinux-2-3002-7-py3
+ # - env: INSTANCE=redhat-oraclelinux-8-3002-7-py3
+ # - env: INSTANCE=redhat-oraclelinux-7-3002-7-py3
+ # - env: INSTANCE=debian-debian-10-3001-8-py3
+ # - env: INSTANCE=debian-debian-9-3001-8-py3
+ # - env: INSTANCE=ubuntu-ubuntu-2004-3001-8-py3
+ # - env: INSTANCE=ubuntu-ubuntu-1804-3001-8-py3
+ # - env: INSTANCE=redhat-centos-8-3001-8-py3
+ # - env: INSTANCE=redhat-centos-7-3001-8-py3
+ # - env: INSTANCE=redhat-fedora-34-3001-8-py3
+ # - env: INSTANCE=redhat-fedora-33-3001-8-py3
+ # - env: INSTANCE=suse-opensuse-leap-153-3001-8-py3
+ # - env: INSTANCE=suse-opensuse-leap-152-3001-8-py3
+ # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-8-py3
+ # - env: INSTANCE=redhat-amazonlinux-2-3001-8-py3
+ # - env: INSTANCE=redhat-oraclelinux-8-3001-8-py3
+ # - env: INSTANCE=redhat-oraclelinux-7-3001-8-py3
 
  ## Define the release stage that runs `semantic-release`
  - stage: 'release'

diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
@@ -25,16 +25,10 @@ platforms:
  - name: freebsd-122-master-py3
  driver:
  box: myii/freebsd-12.2-master-py3
- - name: freebsd-114-master-py3
- driver:
- box: myii/freebsd-11.4-master-py3
  - name: freebsd-130-3003-1-py3
  driver:
  box: myii/freebsd-13.0-3003.1-py3
  synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
  - name: freebsd-122-3003-1-py3
  driver:
  box: myii/freebsd-12.2-3003.1-py3
- - name: freebsd-114-3003-1-py3
- driver:
- box: myii/freebsd-11.4-3003.1-py3