feat(openssh): verify map.jinja using InSpec

* saltstack-formulas/openssh-formula#187 * saltstack-formulas/openssh-formula#189 * saltstack-formulas/openssh-formula#192 * saltstack-formulas/openssh-formula#195
myii · Sep 9, 2020 · b72bd5f · b72bd5f
1 parent 4f5d07b
commit b72bd5f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -56,7 +56,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: '* Checked using https://github.com/myii/ssf-formula/pull/249'
+            body: '* Standardised using https://github.com/myii/ssf-formula/pull/251'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -690,7 +690,15 @@ ssf:
           1:
             <<: *isk_suite_default
             name: 'share'
-    openssh: *formula_default
+    openssh:
+      <<: *formula_default
+      context:
+        <<: *context_default
+        inspec_suites_kitchen:
+          <<: *isk_default
+          1:
+            <<: *isk_suite_default
+            name: 'share'
     openvpn: *formula_default
     packages:
       <<: *formula_default

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -72,6 +72,7 @@ ssf_node_anchors:
                 - oracle
                 - arch
                 - windows
+              title_suite_share: &title_suite_share 'InSpec shared resources'
             provisioner:
               dependencies_epel: &dependencies_epel
                 - name: 'epel'
@@ -2916,17 +2917,26 @@ ssf:
         inspec_suites_kitchen:
           0:
             inspec_yml:
+              depends: *depends_on_suite_share
               summary: >-
                 Verify that the openssh formula is setup and configured correctly
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/default.sls'
               state_top:
                 - '*':
+                    - ._mapdata
                     - .config
                     - .known_hosts
+          1:
+            includes: *includes_NONE
+            inspec_yml:
+              summary: >-
+                shared resources
+              title: *title_suite_share
         platforms: *platforms_new
         platforms_matrix: *platforms_matrix_new_mainly_master_images
+        use_libsaltcli: true
         use_tofs: true
       semrel_files: *semrel_files_default
     openvpn: