ci: use pillars_from_directories & test/salt/pillar/top.sls

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

kitchen.yml

@@ -17,6 +17,8 @@ provisioner:
   salt_copy_filter:
     - .kitchen
     - .git
+  pillars_from_directories:
+    - test/salt/pillar
 
 platforms:
   ## SALT `tiamat`
@@ -24,77 +26,140 @@ platforms:
     driver:
       image: saltimages/salt-tiamat-py3:debian-11
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: debian-10-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:debian-10
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: debian-9-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:debian-9
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: ubuntu-2004-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: ubuntu-1804-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: centos-8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: centos-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-7
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: amazonlinux-2-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: oraclelinux-8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: oraclelinux-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: almalinux-8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:almalinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: rockylinux-8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:rockylinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
 
   ## SALT `master`
   - name: debian-11-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-11
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: debian-10-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-10
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: debian-9-master-py3
     driver:
       image: saltimages/salt-master-py3:debian-9
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: ubuntu-2004-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: ubuntu-1804-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: centos-8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: fedora-34-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-34
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: fedora-33-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-33
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: opensuse-leap-153-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -102,6 +167,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: opensuse-leap-152-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.2
@@ -109,6 +177,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: opensuse-tmbl-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
@@ -116,65 +187,119 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: amazonlinux-2-master-py3
     driver:
       image: saltimages/salt-master-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: oraclelinux-8-master-py3
     driver:
       image: saltimages/salt-master-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: oraclelinux-7-master-py3
     driver:
       image: saltimages/salt-master-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: arch-base-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:arch-base-latest
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: gentoo-stage3-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-latest
       run_command: /sbin/init
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: gentoo-stage3-systemd-master-py3
     driver:
       image: saltimages/salt-master-py3:gentoo-stage3-systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: almalinux-8-master-py3
     driver:
       image: saltimages/salt-master-py3:almalinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
   - name: rockylinux-8-master-py3
     driver:
       image: saltimages/salt-master-py3:rockylinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
 
   ## SALT `3003.3`
   - name: debian-11-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:debian-11
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: debian-10-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:debian-10
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: debian-9-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:debian-9
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: ubuntu-2004-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: ubuntu-1804-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: centos-8-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: centos-7-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:centos-7
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: fedora-34-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:fedora-34
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: fedora-33-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:fedora-33
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: opensuse-leap-153-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
@@ -182,6 +307,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: opensuse-leap-152-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
@@ -189,6 +317,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: opensuse-tmbl-latest-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
@@ -196,62 +327,113 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: amazonlinux-2-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: oraclelinux-8-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: oraclelinux-7-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: arch-base-latest-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:arch-base-latest
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: gentoo-stage3-latest-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
       run_command: /sbin/init
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: gentoo-stage3-systemd-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3003
   - name: almalinux-8-3003-3-py3
     driver:
       image: saltimages/salt-3003.3-py3:almalinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3003
 
   ## SALT `3002.7`
   - name: debian-11-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:debian-11
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: debian-10-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:debian-10
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: debian-9-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:debian-9
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: ubuntu-2004-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: ubuntu-1804-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: centos-8-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: centos-7-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:centos-7
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: fedora-34-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:fedora-34
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: fedora-33-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:fedora-33
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: opensuse-leap-153-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
@@ -259,6 +441,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: opensuse-leap-152-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
@@ -266,6 +451,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: opensuse-tmbl-latest-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest
@@ -273,55 +461,100 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: amazonlinux-2-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: oraclelinux-8-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: oraclelinux-7-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: arch-base-latest-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:arch-base-latest
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: gentoo-stage3-latest-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
       run_command: /sbin/init
+    verifier:
+      inputs:
+        saltmajorversion: 3002
   - name: gentoo-stage3-systemd-3002-7-py3
     driver:
       image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
 
   ## SALT `3001.8`
   - name: debian-10-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:debian-10
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: debian-9-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:debian-9
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: ubuntu-2004-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: ubuntu-1804-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: centos-8-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: centos-7-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:centos-7
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: fedora-34-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:fedora-34
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: fedora-33-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:fedora-33
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: opensuse-leap-153-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:opensuse-leap-15.3
@@ -329,6 +562,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: opensuse-leap-152-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
@@ -336,6 +572,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: opensuse-tmbl-latest-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest
@@ -343,25 +582,46 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: amazonlinux-2-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: oraclelinux-8-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: oraclelinux-7-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: arch-base-latest-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:arch-base-latest
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: gentoo-stage3-latest-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:gentoo-stage3-latest
       run_command: /sbin/init
+    verifier:
+      inputs:
+        saltmajorversion: 3001
   - name: gentoo-stage3-systemd-3001-8-py3
     driver:
       image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
 
 verifier:
   # https://www.inspec.io/
@@ -372,33 +632,7 @@ verifier:
     - cli
 
 suites:
-  - name: v3003-py3
-    includes:
-      - debian-11-3003-3-py3
-      - debian-10-3003-3-py3
-      - debian-9-3003-3-py3
-      - ubuntu-2004-3003-3-py3
-      - ubuntu-1804-3003-3-py3
-      - centos-8-3003-3-py3
-      - centos-7-3003-3-py3
-      - fedora-34-3003-3-py3
-      - fedora-33-3003-3-py3
-      - opensuse-leap-153-3003-3-py3
-      - opensuse-leap-152-3003-3-py3
-      - opensuse-tmbl-latest-3003-3-py3
-      - amazonlinux-2-3003-3-py3
-      - oraclelinux-8-3003-3-py3
-      - oraclelinux-7-3003-3-py3
-      - arch-base-latest-3003-3-py3
-      - gentoo-stage3-latest-3003-3-py3
-      - gentoo-stage3-systemd-3003-3-py3
-      - almalinux-8-3003-3-py3
-      - freebsd-130-3003-1-py3
-      - freebsd-122-3003-1-py3
-      - windows-10-latest-py3
-      - windows-81-latest-py3
-      - windows-2019-latest-py3
-      - windows-2016-latest-py3
+  - name: default
     provisioner:
       state_top:
         base:
@@ -407,82 +641,6 @@ suites:
             - salt.pkgrepo
             - salt.master
             - salt.minion
-      pillars:
-        top.sls:
-          base:
-            '*':
-              - salt
-              - v3003-py3
-      pillars_from_files:
-        salt.sls: test/salt/pillar/salt.sls
-        v3003-py3.sls: test/salt/pillar/v3003-py3.sls
     verifier:
       inspec_tests:
-        - path: test/integration/v3003-py3
-  - name: v3002-py3
-    includes:
-      - debian-11-3002-7-py3
-      - debian-10-3002-7-py3
-      - debian-9-3002-7-py3
-      - ubuntu-2004-3002-7-py3
-      - ubuntu-1804-3002-7-py3
-      - centos-8-3002-7-py3
-      - centos-7-3002-7-py3
-      - amazonlinux-2-3002-7-py3
-      - oraclelinux-8-3002-7-py3
-      - oraclelinux-7-3002-7-py3
-      - gentoo-stage3-latest-3002-7-py3
-      - gentoo-stage3-systemd-3002-7-py3
-      - openbsd-69-3002-6-py3
-    provisioner:
-      state_top:
-        base:
-          '*':
-            - salt._mapdata
-            - salt.pkgrepo
-            - salt.master
-            - salt.minion
-      pillars:
-        top.sls:
-          base:
-            '*':
-              - salt
-              - v3002-py3
-      pillars_from_files:
-        salt.sls: test/salt/pillar/salt.sls
-        v3002-py3.sls: test/salt/pillar/v3002-py3.sls
-    verifier:
-      inspec_tests:
-        - path: test/integration/v3002-py3
-  - name: v3001-py3
-    includes:
-      - debian-10-3001-8-py3
-      - debian-9-3001-8-py3
-      - ubuntu-2004-3001-8-py3
-      - ubuntu-1804-3001-8-py3
-      - centos-8-3001-8-py3
-      - centos-7-3001-8-py3
-      - amazonlinux-2-3001-8-py3
-      - oraclelinux-8-3001-8-py3
-      - oraclelinux-7-3001-8-py3
-      - openbsd-68-3001-1-py3
-    provisioner:
-      state_top:
-        base:
-          '*':
-            - salt._mapdata
-            - salt.pkgrepo
-            - salt.master
-            - salt.minion
-      pillars:
-        top.sls:
-          base:
-            '*':
-              - salt
-              - v3001-py3
-      pillars_from_files:
-        salt.sls: test/salt/pillar/salt.sls
-        v3001-py3.sls: test/salt/pillar/v3001-py3.sls
-    verifier:
-      inspec_tests:
-        - path: test/integration/v3001-py3
+        - path: test/integration/default