ci(kitchen+inspec): add Centos test suite

saltstack-formulas · Jan 15, 2020 · d320ccd · d320ccd
1 parent e41117c
commit d320ccd
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,27 +30,27 @@ services:
 #       Ref: https://github.com/saltstack-formulas/template-formula/issues/121
 env:
   matrix:
-    - INSTANCE: debian-debian-10-develop-py3
+#    - INSTANCE: debian-debian-10-develop-py3
     # - INSTANCE: ubuntu-ubuntu-1804-develop-py3
-    # - INSTANCE: default-centos-7-develop-py3
-    #- INSTANCE: fedora30-fedora-30-develop-py3
+    - INSTANCE: centos-centos-7-develop-py3
+    # - INSTANCE: fedora30-fedora-30-develop-py3
     # - INSTANCE: default-opensuse-leap-15-develop-py3
     # - INSTANCE: default-amazonlinux-2-develop-py2
     # - INSTANCE: debian-debian-9-2019-2-py3
-    - INSTANCE: ubuntu-ubuntu-1804-2019-2-py3
-    # - INSTANCE: default-centos-7-2019-2-py3
-    - INSTANCE: fedora30-fedora-30-2019-2-py3
+#    - INSTANCE: ubuntu-ubuntu-1804-2019-2-py3
+    - INSTANCE: centos-centos-7-2019-2-py3
+    # - INSTANCE: fedora30-fedora-30-2019-2-py3
     # - INSTANCE: default-opensuse-leap-15-2019-2-py3
-    - INSTANCE: default-amazonlinux-2-2019-2-py2
+#    - INSTANCE: default-amazonlinux-2-2019-2-py2
     # - INSTANCE: debian-debian-9-2018-3-py2
     # - INSTANCE: ubuntu-ubuntu-1604-2018-3-py2
-    # - INSTANCE: default-centos-7-2018-3-py2
-    - INSTANCE: fedora29-fedora-29-2018-3-py2
-    - INSTANCE: default-opensuse-leap-15-2018-3-py2
+    - INSTANCE: centos-centos-7-2018-3-py2
+#    - INSTANCE: fedora29-fedora-29-2018-3-py2
+#    - INSTANCE: default-opensuse-leap-15-2018-3-py2
     # - INSTANCE: default-amazonlinux-2-2018-3-py2
     # - INSTANCE: debian-debian-8-2017-7-py2
     # - INSTANCE: ubuntu-ubuntu-1604-2017-7-py2
-    - INSTANCE: default-centos-6-2017-7-py2
+    # - INSTANCE: centos-centos-6-2017-7-py2
     # - INSTANCE: fedora29-fedora-29-2017-7-py2
     # - INSTANCE: default-opensuse-leap-15-2017-7-py2
     # - INSTANCE: default-amazonlinux-2-2017-7-py2

diff --git a/kitchen.yml b/kitchen.yml
@@ -216,3 +216,29 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
+
+  - name: centos
+    includes:
+      - centos-7-develop-py3
+      - centos-7-2019-2-py3
+      - centos-7-2018-3-py2
+      - centos-6-2017-7-py2
+    provisioner:
+      dependencies:
+        - name: epel
+          repo: git
+          source: https://github.com/saltstack-formulas/epel-formula.git
+      state_top:
+        base:
+          '*':
+            - packages
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - packages
+      pillars_from_files:
+        packages.sls: test/salt/pillar/pillar.example.redhat
+    verifier:
+      inspec_tests:
+        - path: test/integration/default
diff --git a/test/salt/pillar/pillar.example.redhat b/test/salt/pillar/pillar.example.redhat
@@ -17,7 +17,6 @@ packages:
         - yum-plugin-versionlock
   pips:
     wanted:
-      - dxpy
       - attrs
     unwanted:
       - campbel
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ packages: @@
             - yum-plugin-versionlock
       pips:
         wanted:
-          - dxpy
           - attrs
         unwanted:
           - campbel
@@ Expand Down @@