feat(formula): add tomcat-formula

pillar.example

@@ -138,6 +138,7 @@ ssf:
       - telegraf
       - template
       - timezone
+      - tomcat
       - ufw
       - users
       - varnish

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: "fix(libsaltcli): update '`'salt-ssh'`' detection for '`'enable_ssh_minions'`'"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/161'
+            title: "feat(semantic-release): implement for this formula"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/160'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -492,6 +492,18 @@ ssf:
             <<: *isk_suite_default
             name: 'centos6'
     timezone: *formula_default
+    tomcat:
+      <<: *formula_default
+      context:
+        <<: *context_default
+        inspec_suites_kitchen:
+          <<: *isk_default
+          0:
+            <<: *isk_suite_default
+            name: 'tomcat_install'
+          1:
+            <<: *isk_suite_default
+            name: 'tomcat_extend'
     ufw: *formula_default
     users:
       <<: *formula_default

ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst

@@ -223,6 +223,7 @@ These formulas are already compatible with semantic-release:
 #. `telegraf-formula <https://github.com/saltstack-formulas/telegraf-formula>`_
 #. `template-formula <https://github.com/saltstack-formulas/template-formula>`_
 #. `timezone-formula <https://github.com/saltstack-formulas/timezone-formula>`_
+#. `tomcat-formula <https://github.com/saltstack-formulas/tomcat-formula>`_
 #. `ufw-formula <https://github.com/saltstack-formulas/ufw-formula>`_
 #. `users-formula <https://github.com/saltstack-formulas/users-formula>`_
 #. `varnish-formula <https://github.com/saltstack-formulas/varnish-formula>`_

ssf/formulas.yaml

@@ -2535,6 +2535,114 @@ ssf:
         platforms: *platforms_new
         platforms_matrix: *platforms_matrix_new
       semrel_files: *semrel_files_default
+    tomcat:
+      context:
+        git:
+          github:
+            repo: 'tomcat-formula'
+        inspec_suites_kitchen:
+          0:
+            inspec_yml:
+              summary: >-
+                Verify that the tomcat formula is setup and configured correctly
+            provisioner:
+              # pillars_from_files:
+              #   - .sls: 'test/salt/pillar/tomcat_install.sls'
+              state_top:
+                - '*':
+                    - .yaml_dump
+                    - .
+                    # These were present (but failing) in the original test setup
+                    # - .native
+                    # - .config
+          1:
+            inspec_yml:
+              summary: >-
+                Verify that the extended tomcat configuration takes place correctly
+            provisioner:
+              # pillars_from_files:
+              #   - .sls: 'test/salt/pillar/tomcat_extend.sls'
+              state_top:
+                - '*':
+                    # Use this when the suite is fixed and running in CI
+                    # - .yaml_dump
+                    - .manager
+                    - .vhosts
+                    - .expires
+                    - .context
+                    - .cluster
+        inspec_suites_matrix:
+          - tomcat_install
+          - tomcat_extend
+        platforms: *platforms_new
+        platforms_matrix:
+          # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
+          - [ubuntu       ,  18.04,   master,      3,  tomcat_install]
+          - [fedora       ,  31   ,   master,      3,  tomcat_install]
+          - [opensuse/leap,  15.1 ,   master,      3,  tomcat_install]
+          - [amazonlinux  ,   2   ,   3000.1,      3,  tomcat_install]
+          - [debian       ,   9   ,   2019.2,      3,  tomcat_install]
+          - [centos       ,   7   ,   2019.2,      3,  tomcat_install]
+          # Tomcat appears to require an older version of JVM on Arch
+          # yamllint disable-line rule:line-length
+          #   jsvc.exec error: Cannot find any VM in Java Home /usr/lib/jvm/default-runtime
+          #   jsvc.exec error: Cannot locate JVM library file
+          # - [arch-base    , latest,   2018.3,      2,  tomcat_install]
+        # 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,  tomcat_install]
+          - [ubuntu       ,  18.04,   master,      3,   tomcat_extend]
+          - [ubuntu       ,  18.04,   master,      3,  tomcat_install]
+          - [ubuntu       ,  18.04,   master,      3,  tomcat_install]
+          - [centos       ,   8   ,   master,      3,  tomcat_install]
+          - [fedora       ,  31   ,   master,      3,  tomcat_install]
+          - [opensuse/leap,  15.1 ,   master,      3,  tomcat_install]
+          - [amazonlinux  ,   2   ,   master,      3,  tomcat_install]
+          - [arch-base    , latest,   master,      2,  tomcat_install]
+          - [debian       ,  10   ,   3000.1,      3,  tomcat_install]
+          - [ubuntu       ,  18.04,   3000.1,      3,  tomcat_install]
+          - [centos       ,   8   ,   3000.1,      3,  tomcat_install]
+          - [fedora       ,  31   ,   3000.1,      3,  tomcat_install]
+          - [opensuse/leap,  15.1 ,   3000.1,      3,  tomcat_install]
+          - [amazonlinux  ,   2   ,   3000.1,      3,  tomcat_install]
+          - [arch-base    , latest,   3000.1,      2,  tomcat_install]
+          - [debian       ,  10   ,   2019.2,      3,  tomcat_install]
+          - [debian       ,   9   ,   2019.2,      3,  tomcat_install]
+          - [ubuntu       ,  18.04,   2019.2,      3,  tomcat_install]
+          - [ubuntu       ,  16.04,   2019.2,      3,  tomcat_install]
+          - [centos       ,   8   ,   2019.2,      3,  tomcat_install]
+          - [centos       ,   7   ,   2019.2,      3,  tomcat_install]
+          - [fedora       ,  31   ,   2019.2,      3,  tomcat_install]
+          - [opensuse/leap,  15.1 ,   2019.2,      3,  tomcat_install]
+          - [amazonlinux  ,   2   ,   2019.2,      3,  tomcat_install]
+          - [ubuntu       ,  18.04,   2019.2,      2,  tomcat_install]
+          - [amazonlinux  ,   1   ,   2019.2,      2,  tomcat_install]
+          - [arch-base    , latest,   2019.2,      2,  tomcat_install]
+          - [centos       ,   7   ,   2018.3,      3,  tomcat_install]
+          - [fedora       ,  30   ,   2018.3,      3,  tomcat_install]
+          - [debian       ,   9   ,   2018.3,      2,  tomcat_install]
+          - [debian       ,   8   ,   2018.3,      2,  tomcat_install]
+          - [ubuntu       ,  18.04,   2018.3,      2,  tomcat_install]
+          - [ubuntu       ,  16.04,   2018.3,      2,  tomcat_install]
+          - [centos       ,   6   ,   2018.3,      2,  tomcat_install]
+          - [opensuse/leap,  15.1 ,   2018.3,      2,  tomcat_install]
+          - [amazonlinux  ,   1   ,   2018.3,      2,  tomcat_install]
+          - [arch-base    , latest,   2018.3,      2,  tomcat_install]
+        rubocop:
+          AllCops:
+            Exclude:
+              - 'test/integration/**/serverspec/*'
+          Cops:
+            Style/FormatStringToken:
+              Exclude:
+                - 'test/integration/tomcat_install/controls/yaml_dump_spec.rb'
+        yamllint:
+          ignore:
+            additional:
+              - tomcat/osmap.yaml
+      semrel_files: *semrel_files_default
     ufw:
       context:
         git: