test(pillar): provide separate top.sls with pillars_from_directories

myii · Aug 25, 2021 · 29c955e · 29c955e
1 parent 97a6cdc
commit 29c955e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 45 deletions.
diff --git a/kitchen.yml b/kitchen.yml
@@ -482,15 +482,8 @@ 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
+      pillars_from_directories:
+        - test/salt/pillar
     verifier:
       inspec_tests:
         - path: test/integration/v3003-py3
@@ -523,15 +516,8 @@ suites:
             - 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
+      pillars_from_directories:
+        - test/salt/pillar
     verifier:
       inspec_tests:
         - path: test/integration/v3002-py3
@@ -563,15 +549,8 @@ suites:
             - 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
+      pillars_from_directories:
+        - test/salt/pillar
     verifier:
       inspec_tests:
         - path: test/integration/v3001-py3
@@ -597,15 +576,8 @@ suites:
             - salt.pkgrepo
             - salt.master
             - salt.minion
-      pillars:
-        top.sls:
-          base:
-            '*':
-              - salt
-              - v3000-py3
-      pillars_from_files:
-        salt.sls: test/salt/pillar/salt.sls
-        v3000-py3.sls: test/salt/pillar/v3000-py3.sls
+      pillars_from_directories:
+        - test/salt/pillar
     verifier:
       inspec_tests:
         - path: test/integration/v3000-py3
@@ -621,15 +593,8 @@ suites:
             - salt.pkgrepo
             - salt.master
             - salt.minion
-      pillars:
-        top.sls:
-          base:
-            '*':
-              - salt
-              - v3000-py2
-      pillars_from_files:
-        salt.sls: test/salt/pillar/salt.sls
-        v3000-py2.sls: test/salt/pillar/v3000-py2.sls
+      pillars_from_directories:
+        - test/salt/pillar
     verifier:
       inspec_tests:
         - path: test/integration/v3000-py2
diff --git a/test/salt/pillar/top.sls b/test/salt/pillar/top.sls
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+base:
+  '*':
+    - salt
+  'G@saltversioninfo:0:3003':
+    - v3003-py3
+  'G@saltversioninfo:0:3002':
+    - v3002-py3
+  'G@saltversioninfo:0:3001':
+    - v3001-py3
+  'G@saltversioninfo:0:3000 and G@pythonversion:0:3':
+    - match: compound
+    - v3000-py3
+  'G@saltversioninfo:0:3000 and G@pythonversion:0:2':
+    - match: compound
+    - v3000-py2
+...