Merge pull request #336 from myii/feat/review-PR-for-XYZ-formula

feat(letsencrypt): review PR 83
myii · Jul 4, 2021 · 1d5c5d5 · 1d5c5d5
2 parents f47f0ec + 71fe009
commit 1d5c5d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -64,8 +64,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(3003.1): update inc. AlmaLinux, Rocky & '`'rst-lint'`' [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/335'
+            title: "ci: standardise structure [skip ci]"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/336'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -1028,6 +1028,9 @@ ssf:
           2:
             <<: *isk_suite_default
             name: 'rpm'
+          3:
+            <<: *isk_suite_default
+            name: 'domains'
     libvirt:
       <<: *formula_default
       context:

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -2376,17 +2376,35 @@ ssf:
                     - ._mapdata
                     - .install
                     - .config
+          3:
+            includes: *platforms_osfamily_debian
+            inspec_yml:
+              summary: >-
+                Verify that certificates can be requested/issued correctly on Debian
+              supports: *supports_debian_ubuntu
+            provisioner:
+              dependencies: *dependencies_states
+              pillars_from_files:
+                - .sls: 'test/salt/pillar/domains.sls'
+              state_top:
+                - '*':
+                    - ._mapdata
+                    - states.install_letsencrypt_test_server
+                    - .
         inspec_suites_matrix:
           - git
           - deb
           - rpm
+          - domains
         map_jinja:
           verification:
             import: ['letsencrypt']
         platforms_matrix:
           # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
+          - [debian       ,   10   ,   tiamat,      0,         domains]
           - [debian       ,    0   ,   master,      0,             deb]
-          - [ubuntu       ,    0   ,   master,      0,             deb]
+          - [ubuntu       ,   20.04,   tiamat,      0,         domains]
+          - [ubuntu       ,    0   ,   master,      0,             git]
           - [centos       ,    0   ,   master,      0,             rpm]
           - [fedora       ,    0   ,   master,      0,             rpm]
           - [opensuse/leap,    0   ,   master,      0,             git]