Merge pull request #12 from myii/ci/replace-eol-pre-salted-images

refactor(kitchen+inspec): move inline pillars to files
saltstack-formulas · Jul 13, 2019 · 18f778f · 18f778f
2 parents 3b7c048 + b992f4b
commit 18f778f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/kitchen.yml b/kitchen.yml
@@ -76,11 +76,8 @@ platforms:
     driver:
       image: netmanagers/salt-2018.3-py2:fedora-29
     provisioner:
-      pillars:
-        locale.sls:
-          locale:
-            pkgs:
-              - glibc-langpack-de
+      pillars_from_files:
+        locale.sls: test/salt/pillar/fedora.sls
 
   # TODO: Use this when fixed instead of `opensuse-leap-42`
   # Ref: https://github.com/netmanagers/salt-image-builder/issues/2
@@ -130,11 +127,8 @@ provisioner:
       base:
         '*':
           - locale
-    locale.sls:
-      locale:
-        present:
-          - "en_US.UTF-8 UTF-8"
-          - "de_DE.UTF-8 UTF-8"
+  pillars_from_files:
+    locale.sls: test/salt/pillar/default.sls
 
 verifier:
   # https://www.inspec.io/

diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
@@ -0,0 +1,4 @@
+locale:
+  present:
+    - "en_US.UTF-8 UTF-8"
+    - "de_DE.UTF-8 UTF-8"
diff --git a/test/salt/pillar/fedora.sls b/test/salt/pillar/fedora.sls
@@ -0,0 +1,3 @@
+locale:
+  pkgs:
+    - glibc-langpack-de