feat(mongodb): finalise PR 83

* saltstack-formulas/mongodb-formula#83
myii · May 26, 2020 · ae66a6c · ae66a6c
1 parent c03a713
commit ae66a6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 66 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -55,8 +55,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(travis): use standardised structure"
-            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/196'
+            title: "chore(semantic-release): use standardised structure"
+            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/197'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -526,15 +526,7 @@ ssf:
             <<: *isk_suite_default
             name: 'loop5-loop6'
     mattermost: *formula_default
-    mongodb:
-      <<: *formula_default
-      context:
-        <<: *context_default
-        inspec_suites_kitchen:
-          <<: *isk_default
-          1:
-            <<: *isk_suite_default
-            name: 'archive'
+    mongodb: *formula_default
     mysql: *formula_default
     nfs: *formula_default
     nginx: *formula_default

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -2112,73 +2112,23 @@ ssf:
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/default.sls'
-              state_top:
-                - '*':
-                    - .clean
-                    - .
-          1:
-            inspec_yml:
-              summary: >-
-                Verify that the mongodb formula is setup and configured correctly
-                (deploying from archive files)
-            provisioner:
-              pillars_from_files:
-                - .sls: 'test/salt/pillar/archive.sls'
-              state_top:
-                - '*':
-                    - .clean
-                    - .
-        inspec_suites_matrix:
-          - default
-          - archive
         platforms: *platforms_new
         platforms_matrix:
           # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
           - [debian       ,  10   ,   master,      3,         default]
-          - [centos       ,   8   ,   master,      3,         archive]
-          - [fedora       ,  31   ,   master,      3,         archive]
-          - [opensuse/leap,  15.1 ,   master,      3,         archive]
-          - [centos       ,   7   ,   3000.3,      3,         default]
-          - [arch-base    , latest,   2019.2,      2,         archive]
-        platforms_matrix_commented_includes:
-          # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
-          - [debian       ,  10   ,   master,      3,         default]
-          - [debian       ,  10   ,   master,      3,         default]
-          - [debian       ,  10   ,   master,      3,         default]
-          - [debian       ,  10   ,   master,      3,         default]
           - [ubuntu       ,  18.04,   master,      3,         default]
           - [centos       ,   8   ,   master,      3,         default]
           - [fedora       ,  31   ,   master,      3,         default]
-          - [opensuse/leap,  15.1 ,   master,      3,         default]
+          # - [opensuse/leap,  15.1 ,   master,      3,         default]
           - [amazonlinux  ,   2   ,   master,      3,         default]
-          - [debian       ,  10   ,   3000.3,      3,         default]
-          - [debian       ,   9   ,   3000.3,      3,         default]
-          - [ubuntu       ,  18.04,   3000.3,      3,         default]
-          - [centos       ,   8   ,   3000.3,      3,         default]
-          - [centos       ,   7   ,   3000.3,      3,         default]
-          - [fedora       ,  31   ,   3000.3,      3,         default]
-          - [opensuse/leap,  15.1 ,   3000.3,      3,         default]
-          - [amazonlinux  ,   2   ,   3000.3,      3,         default]
-          - [ubuntu       ,  18.04,   3000.3,      2,         default]
-          - [ubuntu       ,  16.04,   3000.3,      2,         default]
-          - [arch-base    , latest,   3000.3,      2,         default]
-          - [debian       ,  10   ,   2019.2,      3,         default]
-          - [debian       ,   9   ,   2019.2,      3,         default]
-          - [ubuntu       ,  18.04,   2019.2,      3,         default]
-          - [ubuntu       ,  16.04,   2019.2,      3,         default]
-          - [centos       ,   8   ,   2019.2,      3,         default]
-          - [centos       ,   7   ,   2019.2,      3,         default]
-          - [fedora       ,  31   ,   2019.2,      3,         default]
-          - [opensuse/leap,  15.1 ,   2019.2,      3,         default]
-          - [amazonlinux  ,   2   ,   2019.2,      3,         default]
-          - [centos       ,   6   ,   2019.2,      2,         default]
-          - [amazonlinux  ,   1   ,   2019.2,      2,         default]
           - [arch-base    , latest,   2019.2,      2,         default]
+        use_tofs: true
         yamllint:
           ignore:
             additional:
-              - mongodb/oscodemap.yaml
-              - mongodb/osmap.yaml
+              - pillar.example
+              - mongodb/osfamilymap.yaml
+              - mongodb/osfingermap.yaml
       semrel_files: *semrel_files_default
     mysql:
       context: