feat(php): manage map.jinja verification

* Prompted by: - saltstack-formulas/php-formula#214 - saltstack-formulas/php-formula#215 - saltstack-formulas/php-formula#216 - saltstack-formulas/php-formula#217
myii · Dec 22, 2020 · 77a620b · 77a620b
1 parent 7ab8fa7
commit 77a620b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -63,7 +63,7 @@ ssf_node_anchors:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length rule:quoted-strings
             title: "test(map): verify '`'map.jinja'`' dump using '`'_mapdata'`' state"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/282'
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/283'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -996,14 +996,17 @@ ssf:
           <<: *isk_default
           1:
             <<: *isk_suite_default
-            name: 'debian'
+            name: 'share'
           2:
             <<: *isk_suite_default
-            name: 'ubuntu'
+            name: 'debian'
           3:
             <<: *isk_suite_default
-            name: 'redhat'
+            name: 'ubuntu'
           4:
+            <<: *isk_suite_default
+            name: 'redhat'
+          5:
             <<: *isk_suite_default
             name: 'suse'
     postfix: *formula_default

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -3566,25 +3566,28 @@ ssf:
             # None of the platforms use `default` directly
             includes: *includes_NONE
             inspec_yml:
+              depends: *depends_on_suite_share
               summary: >-
                 Verify that the php formula is setup and configured correctly
             provisioner:
               pillars_from_files: []
-          1:
+          1: *inspec_suites_kitchen__share_suite
+          2:
             includes: *platforms_os_debian
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/debian.sls'
               state_top:
                 - '*':
+                    - ._mapdata
                     - .repo
                     - .fpm.install
                     - .fpm.config
                     - .fpm.pools
                     - .modules
                     - .fpm.service
             verifier: *verifier_inspec_tests_default
-          2:
+          3:
             includes: *platforms_os_ubuntu
             provisioner:
               pillars:
@@ -3596,31 +3599,43 @@ ssf:
                 - ubuntu.sls: 'test/salt/pillar/ubuntu.sls'
               state_top:
                 - '*':
+                    - ._mapdata
                     - .repo
                     - .fpm.install
                     - .fpm.config
                     - .fpm.pools
                     - .modules
                     - .fpm.service
             verifier: *verifier_inspec_tests_default
-          3:
+          4:
             includes: *platforms_osfamily_redhat
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/redhat.sls'
+              state_top:
+                - '*':
+                    - ._mapdata
+                    - .
             verifier: *verifier_inspec_tests_default
-          4:
+          5:
             includes: *platforms_osfamily_suse
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/suse.sls'
+              state_top:
+                - '*':
+                    - ._mapdata
+                    - .
             verifier: *verifier_inspec_tests_default
         inspec_suites_matrix:
           - default
           - debian
           - ubuntu
           - redhat
           - suse
+        map_jinja:
+          verification:
+            import: 'php'
         platforms_matrix:
           - [debian       ,   10   ,   master,      3,       debian]
           - [ubuntu       ,   18.04,   2019.2,      3,       ubuntu]
@@ -3630,7 +3645,7 @@ ssf:
           # # - [centos       ,    6   ,   2017.7,      2,       redhat]
         travis: *travis_do_not_use_single_job_for_linters
         use_tofs: true
-      semrel_files: *semrel_files_default
+      semrel_files: *semrel_files_inc_map_jinja_verifier
     postfix:
       context:
         codeowners: