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

feat(apache): review PR 283
myii · Oct 6, 2020 · 953a37a · 953a37a
2 parents 5bbaf50 + ef484f9
commit 953a37a
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 21 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -58,8 +58,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(pre-commit): enable/disable '`'rstcheck'`' as relevant [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/262'
+            title: "chore: standardise structure [skip ci]"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/264'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -384,6 +384,9 @@ ssf:
           1:
             <<: *isk_suite_default
             name: 'modules'
+          2:
+            <<: *isk_suite_default
+            name: 'arch'
     apt:
       <<: *formula_default
       context:

diff --git a/ssf/files/tofs_.github/docs/CONTRIBUTING.rst b/ssf/files/tofs_.github/docs/CONTRIBUTING.rst
@@ -179,6 +179,7 @@ Semantic release formulas
 
 These formulas are already compatible with semantic-release *and* have global ``CODEOWNERS`` defined:
 
+#. `apache-formula <https://github.com/saltstack-formulas/apache-formula>`_
 #. `apt-formula <https://github.com/saltstack-formulas/apt-formula>`_
 #. `arvados-formula <https://github.com/saltstack-formulas/arvados-formula>`_
 #. `bind-formula <https://github.com/saltstack-formulas/bind-formula>`_
@@ -235,8 +236,7 @@ These formulas are already compatible with semantic-release *and* have global ``
 
 These formulas are also compatible with semantic-release:
 
-54. `apache-formula <https://github.com/saltstack-formulas/apache-formula>`_
-#. `apt-cacher-formula <https://github.com/saltstack-formulas/apt-cacher-formula>`_
+55. `apt-cacher-formula <https://github.com/saltstack-formulas/apt-cacher-formula>`_
 #. `cert-formula <https://github.com/saltstack-formulas/cert-formula>`_
 #. `chrony-formula <https://github.com/saltstack-formulas/chrony-formula>`_
 #. `collectd-formula <https://github.com/saltstack-formulas/collectd-formula>`_

diff --git a/ssf/files/tofs_apache-formula/.salt-lint b/ssf/files/tofs_apache-formula/.salt-lint
@@ -19,7 +19,8 @@ rules:
     ignore: |
       apache/files/Debian/ssl.conf.jinja
       apache/files/FreeBSD/mod_ssl.conf.jinja
-      apache/files/tls-defaults.conf.jinja
+      apache/files/ssl/tls-defaults.conf.jinja
+      test/salt/pillar/modules.sls
 skip_list:
   # Using `salt-lint` for linting other files as well, such as Jinja macros/templates
   - 205  # Use ".sls" as a Salt State file extension

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -599,6 +599,10 @@ ssf:
     #           - '*': '@javierbertoli'
     apache:
       context:
+        codeowners:
+          entries:
+            global:
+              - '*': '@noelmcloughlin'
         git:
           github:
             repo: 'apache-formula'
@@ -610,37 +614,60 @@ ssf:
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/default.sls'
+          1:
+            inspec_yml:
+              summary: >-
+                Verify that the apache formula manages modules correctly
+            provisioner:
+              pillars_from_files:
+                - .sls: 'test/salt/pillar/modules.sls'
               state_top:
                 - '*':
                     - .
-                    - .config
-          1:
+                    - .config.modules
+                    - .config.certificates
+                    - .config.modules.mod_security
+                    - .config.modules.server_status
+          2:
             inspec_yml:
               summary: >-
                 Verify that the apache formula manages modules correctly
+            includes: *platforms_os_arch_base
+            # includes: *platforms_os_arch_base_new
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/modules.sls'
               state_top:
                 - '*':
                     - .
-                    - .mod_security
-                    - .server_status
-        # TODO: Enable this once the matrix is updated to use the `modules` suite
-        # inspec_suites_matrix:
-        #   - default
-        #   - modules
+                    - .config.modules
+                    - .config.certificates
+                    - .config.modules.mod_security
+                    - .config.modules.server_status
+            verifier:
+              inspec_tests:
+                - nomodsecurity
+        inspec_suites_matrix:
+          - default
+          - modules
+          - arch
         platforms_matrix:
-          # Comments in `platforms` apply here, too
           # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
-          - [debian       ,  10   ,   master,      3,         default]
-          - [ubuntu       ,  18.04,   2019.2,      3,         default]
-          - [amazonlinux  ,   2   ,   2019.2,      3,         default]
-          # - [arch-base    , latest,   2019.2,      2,         default]
-          - [fedora       ,  30   ,   2018.3,      3,         default]
-          # - [opensuse/leap,  15.1 ,   2018.3,      2,         default]
-          - [centos       ,   6   ,   2017.7,      2,         default]
+          - [debian       ,  10   ,   master,      3,         modules]
+          - [centos       ,   8   ,   master,      3,         modules]
+          - [fedora       ,  31   ,   master,      3,         modules]
+          - [opensuse/leap,  15.1 ,   master,      3,         modules]
+          - [amazonlinux  ,   2   ,   master,      3,         default]
+          - [ubuntu       ,  18.04,   2019.2,      3,         modules]
+          - [centos       ,   7   ,   2019.2,      2,         modules]
+          - [arch-base    , latest,   2017.7,      2,            arch]
         pre_commit: *pre_commit_do_not_use_rstcheck
+        use_tofs: true
+        yamllint:
+          ignore:
+            additional:
+              - test/salt/pillar/modules.sls
+              - pillar.example
       semrel_files: *semrel_files_default
     apt:
       context:

diff --git a/ssf/libcimatrix.jinja b/ssf/libcimatrix.jinja
@@ -76,6 +76,10 @@
                       salt_ver | replace('.', '-'),
                       py_ver,
                     ) %}
+{%-                 if semrel_formula == 'apache'
+                    and [suite_name, os, os_ver, salt_ver] == ['default', 'amazonlinux', 2, 'master'] %}
+# https://community.letsencrypt.org/t/localhost-crt-does-not-exist-or-is-empty/103979
+{%-                 endif %}
 {{ comment }}- {{ instance_and_env }}{{ instance }}
 {%-               endif %}
 {%-             endif %}