feat(salt): remove v201803-py2

myii · May 1, 2020 · d4ab744 · d4ab744
1 parent f1b26c3
commit d4ab744
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 40 deletions.
diff --git a/ssf/defaults.yaml b/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: "ci(kitchen+travis+inspec): merge test suites into single '`'default'`' suite"
-            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/165'
+            title: "ci(kitchen+travis): adjust matrix to add '`'3000.2'`' & remove '`'2018.3'`'"
+            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/166'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -480,9 +480,6 @@ ssf:
           3:
             <<: *isk_suite_default
             name: 'v201902-py2'
-          4:
-            <<: *isk_suite_default
-            name: 'v201803-py2'
     ssf: *formula_default
     stack: *formula_default
     strongswan: *formula_default

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -2129,33 +2129,11 @@ ssf:
                 - .sls: 'test/salt/pillar/salt.sls'
                 - v201902-py2.sls: 'test/salt/pillar/v201902-py2.sls'
               state_top: *state_top_salt
-          4:
-            includes:
-              # [os           , os_ver, salt_ver, py_ver]
-              - [debian       ,   9   ,   2018.3,      2]
-              - [ubuntu       ,  16.04,   2018.3,      2]
-              - [centos       ,   7   ,   2018.3,      2]
-              # - [opensuse/leap,  15.1 ,   2018.3,      2]
-              - [amazonlinux  ,   1   ,   2018.3,      2]
-              - [arch-base    , latest,   2018.3,      2]
-            inspec_yml:
-              summary: >-
-                Verify that Salt `v201803-py2` is setup and configured
-            provisioner:
-              pillars:
-                - '*':
-                    - .
-                    - v201803-py2
-              pillars_from_files:
-                - .sls: 'test/salt/pillar/salt.sls'
-                - v201803-py2.sls: 'test/salt/pillar/v201803-py2.sls'
-              state_top: *state_top_salt
         inspec_suites_matrix:
           - v3000-py3
           - v3000-py2
           - v201902-py3
           - v201902-py2
-          - v201803-py2
         platforms:
           # [os           , os_ver, salt_ver, py_ver]
           - [debian       ,  10   ,   3000.1,      3]
@@ -2175,13 +2153,6 @@ ssf:
           - [ubuntu       ,  18.04,   2019.2,      2]
           - [centos       ,   7   ,   2019.2,      2]
           - [arch-base    , latest,   2019.2,      2]
-          # - [fedora       ,  30   ,   2018.3,      3]
-          - [debian       ,   9   ,   2018.3,      2]
-          - [ubuntu       ,  16.04,   2018.3,      2]
-          - [centos       ,   7   ,   2018.3,      2]
-          # - [opensuse/leap,  15.1 ,   2018.3,      2]
-          - [amazonlinux  ,   1   ,   2018.3,      2]
-          - [arch-base    , latest,   2018.3,      2]
         platforms_matrix:
           # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
           - [debian       ,  10   ,   3000.1,      3,     v3000-py3]
@@ -2201,12 +2172,6 @@ ssf:
           - [ubuntu       ,  18.04,   2019.2,      2,     v201902-py2]
           # - [centos       ,   7   ,   2019.2,      2,     v201902-py2]
           # # - [arch-base    , latest,   2019.2,      2,       v201902-py2]
-          # - [debian       ,   9   ,   2018.3,      2,     v201803-py2]
-          - [ubuntu       ,  16.04,   2018.3,      2,     v201803-py2]
-          - [centos       ,   7   ,   2018.3,      2,     v201803-py2]
-          # # - [opensuse/leap,  15.1 ,   2018.3,      2,     v201803-py2]
-          # # - [amazonlinux  ,   1   ,   2018.3,      2,     v201803-py2]
-          # # - [arch-base    , latest,   2018.3,      2,       v201803-py2]
         use_tofs: true
         yamllint:
           ignore: