feat(lvm): finalise CI for fix PR 20

* saltstack-formulas/lvm-formula#20

ssf/defaults.yaml

@@ -22,8 +22,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length rule:quoted-strings
-            title: "ci(gemfile.lock): add to repo with updated '`'Gemfile'`' [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/163'
+            title: "ci(kitchen+travis): standardise structure to finalise fix"
+            body: '* Checked using https://github.com/myii/ssf-formula/pull/164'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -351,7 +351,18 @@ ssf:
             <<: *isk_suite_default
             name: 'redhat'
     logrotate: *formula_default
-    lvm: *formula_default
+    lvm:
+      <<: *formula_default
+      context:
+        <<: *context_default
+        inspec_suites_kitchen:
+          <<: *isk_default
+          0:
+            <<: *isk_suite_default
+            name: 'loop4-loop5'
+          1:
+            <<: *isk_suite_default
+            name: 'loop5-loop6'
     mattermost: *formula_default
     mongodb: *formula_default
     mysql: *formula_default

ssf/formulas.yaml

@@ -1222,13 +1222,31 @@ ssf:
             inspec_yml:
               summary: >-
                 Verify that the lvm formula is setup and configured correctly
+                (loop4-loop5)
             provisioner:
               pillars_from_files:
-                - .sls: 'test/salt/pillar/pillar.example'
+                - .sls: 'test/salt/loop4-loop5/pillar.example'
+              state_top:
+                - '*':
+                    - .clean
+                    - .
+            verifier: *verifier_inspec_tests_default
+          1:
+            inspec_yml:
+              summary: >-
+                Verify that the lvm formula is setup and configured correctly
+                (loop5-loop6)
+            provisioner:
+              pillars_from_files:
+                - .sls: 'test/salt/loop5-loop6/pillar.example'
               state_top:
                 - '*':
                     - .clean
                     - .
+            verifier: *verifier_inspec_tests_default
+        inspec_suites_matrix:
+          - loop4-loop5
+          - loop5-loop6
         platforms_matrix:
           # Note, the commented lines are the only ones that didn't work
           # Everything else working, even if lines have been removed
@@ -1237,18 +1255,38 @@ ssf:
           # Update: the lines the have been modified due to `2019.2.2` can no longer
           #         be guaranteed (i.e. working or not)
           # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
-          - [debian       ,  10   ,   master,      3,         default]
-          # - [amazonlinux  ,   2   ,   master,      3,         default]
-          # # - [arch-base    , latest,   master,      2,         default]
-          - [ubuntu       ,  18.04,   2019.2,      3,         default]
-          # # - [fedora       ,  31   ,   2019.2,      3,         default]
-          - [amazonlinux  ,   2   ,   2019.2,      3,         default]
-          # # - [arch-base    , latest,   2019.2,      2,         default]
-          # # - [centos       ,   7   ,   2018.3,      2,         default]
-          - [opensuse/leap,  15.1 ,   2018.3,      2,         default]
-          # # - [arch-base    , latest,   2018.3,      2,         default]
-          # - [centos       ,   6   ,   2017.7,      2,         default]
-          # # - [arch-base    , latest,   2017.7,      2,         default]
+          - [ubuntu       ,  18.04,   master,      3,     loop5-loop6]
+          - [centos       ,   8   ,   master,      3,     loop5-loop6]
+          - [amazonlinux  ,   2   ,   2019.2,      3,     loop5-loop6]
+          - [opensuse/leap,  15.1 ,   2018.3,      2,     loop5-loop6]
+        # To deal with excessive instances when mimicking `kitchen list -b`
+        # If values are set, only use these as commented entries in the matrix
+        platforms_matrix_commented_includes:
+          # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
+          - [debian       ,  10   ,   master,      3,     loop5-loop6]
+          - [ubuntu       ,  18.04,   master,      3,     loop4-loop5]
+          - [ubuntu       ,  18.04,   master,      3,     loop5-loop6]
+          - [centos       ,   8   ,   master,      3,     loop5-loop6]
+          - [fedora       ,  31   ,   master,      3,     loop5-loop6]
+          - [opensuse/leap,  15.1 ,   master,      3,     loop5-loop6]
+          - [amazonlinux  ,   2   ,   master,      3,     loop5-loop6]
+          - [arch-base    , latest,   master,      2,     loop5-loop6]
+          - [debian       ,  10   ,   2019.2,      3,     loop5-loop6]
+          - [debian       ,   9   ,   2019.2,      3,     loop5-loop6]
+          - [ubuntu       ,  18.04,   2019.2,      3,     loop5-loop6]
+          - [centos       ,   8   ,   2019.2,      3,     loop5-loop6]
+          - [fedora       ,  31   ,   2019.2,      3,     loop5-loop6]
+          - [opensuse/leap,  15.1 ,   2019.2,      3,     loop5-loop6]
+          - [centos       ,   7   ,   2019.2,      2,     loop5-loop6]
+          - [amazonlinux  ,   2   ,   2019.2,      3,     loop5-loop6]
+          - [arch-base    , latest,   2019.2,      2,     loop5-loop6]
+          - [fedora       ,  30   ,   2018.3,      3,     loop5-loop6]
+          - [debian       ,   9   ,   2018.3,      2,     loop5-loop6]
+          - [ubuntu       ,  16.04,   2018.3,      2,     loop5-loop6]
+          - [centos       ,   7   ,   2018.3,      2,     loop5-loop6]
+          - [opensuse/leap,  15.1 ,   2018.3,      2,     loop5-loop6]
+          - [amazonlinux  ,   1   ,   2018.3,      2,     loop5-loop6]
+          - [arch-base    , latest,   2018.3,      2,     loop5-loop6]
       semrel_files: *semrel_files_default
     mattermost:
       context: