ci(kitchen+ci): update with 3004 pre-salted images/boxes [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/385

.github/workflows/kitchen.vagrant.yml

@@ -16,8 +16,8 @@ jobs:
         instance:
           - freebsd-freebsd-130-master-py3
           - freebsd-freebsd-122-master-py3
-          # - freebsd-freebsd-130-3003-1-py3
+          # - freebsd-freebsd-130-3004-0-py3
-          # - freebsd-freebsd-122-3003-1-py3
+          # - freebsd-freebsd-122-3004-0-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'

.gitlab-ci.yml

@@ -102,7 +102,7 @@ rubocop:
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance:
+.test_instance: &test_instance
   stage: *stage_test
   image: *image_dindruby
   services: *services_docker_dind
@@ -117,6 +117,13 @@ rubocop:
     # Alternative value to consider: `${CI_JOB_NAME}`
     - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
 
+###############################################################################
+# Define `test` template (`allow_failure: true`)
+###############################################################################
+.test_instance_failure_permitted:
+  <<: *test_instance
+  allow_failure: true
+
 ###############################################################################
 # `test` stage: each instance below uses the `test` template above
 ###############################################################################
@@ -128,6 +135,7 @@ rubocop:
 # debian-debian-9-tiamat-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
+# redhat-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # redhat-centos-8-tiamat-py3: {extends: '.test_instance'}
 # redhat-centos-7-tiamat-py3: {extends: '.test_instance'}
 # redhat-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@@ -140,30 +148,50 @@ debian-debian-10-master-py3: {extends: '.test_instance'}
 debian-debian-9-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
+redhat-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 redhat-centos-8-master-py3: {extends: '.test_instance'}
 redhat-centos-7-master-py3: {extends: '.test_instance'}
 redhat-fedora-34-master-py3: {extends: '.test_instance'}
 redhat-fedora-33-master-py3: {extends: '.test_instance'}
 suse-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
-suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
 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-3004-0-py3: {extends: '.test_instance'}
+# debian-debian-10-3004-0-py3: {extends: '.test_instance'}
+# debian-debian-9-3004-0-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
+# redhat-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+# redhat-centos-8-3004-0-py3: {extends: '.test_instance'}
+# redhat-centos-7-3004-0-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3004-0-py3: {extends: '.test_instance'}
+# redhat-fedora-33-3004-0-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+# redhat-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
+# redhat-almalinux-8-3004-0-py3: {extends: '.test_instance'}
+# redhat-rockylinux-8-3004-0-py3: {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-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 # 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'}
+# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
 # 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'}
@@ -179,7 +207,7 @@ redhat-rockylinux-8-master-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'}
+# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
 # 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'}
@@ -193,7 +221,7 @@ redhat-rockylinux-8-master-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'}
+# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
 # 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'}

.travis.yml

@@ -88,6 +88,7 @@ jobs:
     # - env: INSTANCE=debian-debian-9-tiamat-py3
     # - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=redhat-centos-stream8-tiamat-py3
     # - env: INSTANCE=redhat-centos-8-tiamat-py3
     # - env: INSTANCE=redhat-centos-7-tiamat-py3
     # - env: INSTANCE=redhat-amazonlinux-2-tiamat-py3
@@ -100,6 +101,7 @@ jobs:
     - env: INSTANCE=debian-debian-9-master-py3
     - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
+    - env: INSTANCE=redhat-centos-stream8-master-py3
     - env: INSTANCE=redhat-centos-8-master-py3
     - env: INSTANCE=redhat-centos-7-master-py3
     - env: INSTANCE=redhat-fedora-34-master-py3
@@ -112,11 +114,30 @@ 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-3004-0-py3
+    # - env: INSTANCE=debian-debian-10-3004-0-py3
+    # - env: INSTANCE=debian-debian-9-3004-0-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3004-0-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3004-0-py3
+    # - env: INSTANCE=redhat-centos-stream8-3004-0-py3
+    # - env: INSTANCE=redhat-centos-8-3004-0-py3
+    # - env: INSTANCE=redhat-centos-7-3004-0-py3
+    # - env: INSTANCE=redhat-fedora-34-3004-0-py3
+    # - env: INSTANCE=redhat-fedora-33-3004-0-py3
+    # - env: INSTANCE=suse-opensuse-leap-153-3004-0-py3
+    # - env: INSTANCE=suse-opensuse-leap-152-3004-0-py3
+    # - env: INSTANCE=suse-opensuse-tmbl-latest-3004-0-py3
+    # - env: INSTANCE=redhat-amazonlinux-2-3004-0-py3
+    # - env: INSTANCE=redhat-oraclelinux-8-3004-0-py3
+    # - env: INSTANCE=redhat-oraclelinux-7-3004-0-py3
+    # - env: INSTANCE=redhat-almalinux-8-3004-0-py3
+    # - env: INSTANCE=redhat-rockylinux-8-3004-0-py3
     # - 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-stream8-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

CODEOWNERS

@@ -22,6 +22,7 @@
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
+/test/salt/pillar/top.sls                   @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
 /.gitlab-ci.yml                             @saltstack-formulas/ssf

kitchen.vagrant.yml

@@ -25,10 +25,10 @@ platforms:
   - name: freebsd-122-master-py3
     driver:
       box: myii/freebsd-12.2-master-py3
-  - name: freebsd-130-3003-1-py3
+  - name: freebsd-130-3004-0-py3
     driver:
-      box: myii/freebsd-13.0-3003.1-py3
+      box: myii/freebsd-13.0-3004.0-py3
       synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
-  - name: freebsd-122-3003-1-py3
+  - name: freebsd-122-3004-0-py3
     driver:
-      box: myii/freebsd-12.2-3003.1-py3
+      box: myii/freebsd-12.2-3004.0-py3

kitchen.yml

@@ -40,6 +40,9 @@ platforms:
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+  - name: centos-stream8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-stream8
   - name: centos-8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-8
@@ -83,6 +86,9 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+  - name: centos-stream8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:centos-stream8
   - name: centos-8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-8
@@ -142,6 +148,89 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
 
+  ## SALT `3004.0`
+  - name: debian-11-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-11
+      run_command: /lib/systemd/systemd
+  - name: debian-10-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-10
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2004-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-stream8
+  - name: centos-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-8
+  - name: centos-7-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-7
+  - name: fedora-34-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:fedora-34
+  - name: fedora-33-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:fedora-33
+  - name: opensuse-leap-153-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-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-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-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-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-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-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:amazonlinux-2
+  - name: oraclelinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:oraclelinux-8
+  - name: oraclelinux-7-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:oraclelinux-7
+  - name: arch-base-latest-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
+  - name: almalinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:almalinux-8
+  - name: rockylinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:rockylinux-8
+
   ## SALT `3003.3`
   - name: debian-11-3003-3-py3
     driver:
@@ -163,6 +252,9 @@ platforms:
     driver:
       image: saltimages/salt-3003.3-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+  - name: centos-stream8-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:centos-stream8
   - name: centos-8-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:centos-8
@@ -380,6 +472,9 @@ suites:
       - debian-11-master-py3
       - debian-10-master-py3
       - debian-9-master-py3
+      - debian-11-3004-0-py3
+      - debian-10-3004-0-py3
+      - debian-9-3004-0-py3
       - debian-11-3003-3-py3
       - debian-10-3003-3-py3
       - debian-9-3003-3-py3
@@ -415,6 +510,8 @@ suites:
       - ubuntu-1804-tiamat-py3
       - ubuntu-2004-master-py3
       - ubuntu-1804-master-py3
+      - ubuntu-2004-3004-0-py3
+      - ubuntu-1804-3004-0-py3
       - ubuntu-2004-3003-3-py3
       - ubuntu-1804-3003-3-py3
       - ubuntu-2004-3002-7-py3
@@ -446,6 +543,7 @@ suites:
         - path: test/integration/default
   - name: redhat
     includes:
+      - centos-stream8-tiamat-py3
       - centos-8-tiamat-py3
       - centos-7-tiamat-py3
       - amazonlinux-2-tiamat-py3
@@ -453,6 +551,7 @@ suites:
       - oraclelinux-7-tiamat-py3
       - almalinux-8-tiamat-py3
       - rockylinux-8-tiamat-py3
+      - centos-stream8-master-py3
       - centos-8-master-py3
       - centos-7-master-py3
       - fedora-34-master-py3
@@ -462,6 +561,17 @@ suites:
       - oraclelinux-7-master-py3
       - almalinux-8-master-py3
       - rockylinux-8-master-py3
+      - centos-stream8-3004-0-py3
+      - centos-8-3004-0-py3
+      - centos-7-3004-0-py3
+      - fedora-34-3004-0-py3
+      - fedora-33-3004-0-py3
+      - amazonlinux-2-3004-0-py3
+      - oraclelinux-8-3004-0-py3
+      - oraclelinux-7-3004-0-py3
+      - almalinux-8-3004-0-py3
+      - rockylinux-8-3004-0-py3
+      - centos-stream8-3003-3-py3
       - centos-8-3003-3-py3
       - centos-7-3003-3-py3
       - fedora-34-3003-3-py3
@@ -505,6 +615,9 @@ suites:
       - opensuse-leap-153-master-py3
       - opensuse-leap-152-master-py3
       - opensuse-tmbl-latest-master-py3
+      - opensuse-leap-153-3004-0-py3
+      - opensuse-leap-152-3004-0-py3
+      - opensuse-tmbl-latest-3004-0-py3
       - opensuse-leap-153-3003-3-py3
       - opensuse-leap-152-3003-3-py3
       - opensuse-tmbl-latest-3003-3-py3
@@ -534,8 +647,8 @@ suites:
     includes:
       - freebsd-130-master-py3
       - freebsd-122-master-py3
-      - freebsd-130-3003-1-py3
+      - freebsd-130-3004-0-py3
-      - freebsd-122-3003-1-py3
+      - freebsd-122-3004-0-py3
     provisioner:
       state_top:
         base: