feat(template): use platforms_new_inc_tiamat

myii · Sep 21, 2020 · 28c783a · 28c783a
1 parent 0c05bd9
commit 28c783a
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 10 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(kitchen+travis): use '`'tiamat'`' pre-salted images [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/257'
+            title: "ci(kitchen+travis): use '`'tiamat'`' pre-salted images"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/258'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'

diff --git a/ssf/files/default/.travis.yml b/ssf/files/default/.travis.yml
@@ -191,7 +191,7 @@ jobs:
         - '[ $(git rev-list HEAD --count) -eq 2 ]'
         # Quick visual check that correct files have been updated
         - git show --pretty="" --name-status
-        - bin/kitchen verify default-debian-10-2019-2-py3
+        - bin/kitchen verify default-debian-10-tiamat-py3
     # REMOVEME>
     {%- endif %}
 

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -4398,6 +4398,7 @@ ssf:
               depends: *depends_on_suite_share
               summary: >-
                 Verify that the TEMPLATE formula is setup and configured correctly
+              supports: *supports_all_including_oracle
             provisioner:
               pillars:
                 - '*':
@@ -4415,6 +4416,8 @@ ssf:
             inspec_yml:
               summary: >-
                 shared resources
+              supports: *supports_all_including_oracle
+              title: *title_suite_share
           2:
             includes: *platforms_os_upstart
             provisioner:
@@ -4433,17 +4436,79 @@ ssf:
         inspec_suites_matrix:
           - default
           - upstart
-        platforms: *platforms_new
+        platforms:
+          ### `tiamat-py3`
+          - [debian       ,  10   ,   tiamat,      3]
+          - [debian       ,   9   ,   tiamat,      3]
+          - [ubuntu       ,  20.04,   tiamat,      3]
+          - [ubuntu       ,  18.04,   tiamat,      3]
+          - [ubuntu       ,  16.04,   tiamat,      3]
+          - [centos       ,   8   ,   tiamat,      3]
+          - [centos       ,   7   ,   tiamat,      3]
+          - [amazonlinux  ,   2   ,   tiamat,      3]
+          - [oraclelinux  ,   8   ,   tiamat,      3]
+          - [oraclelinux  ,   7   ,   tiamat,      3]
+
+          ### `master-py3`
+          - [debian       ,  10   ,   master,      3]
+          - [ubuntu       ,  20.04,   master,      3]
+          - [ubuntu       ,  18.04,   master,      3]
+          - [centos       ,   8   ,   master,      3]
+          - [fedora       ,  32   ,   master,      3]
+          - [fedora       ,  31   ,   master,      3]
+          - [opensuse/leap,  15.2 ,   master,      3]
+          - [amazonlinux  ,   2   ,   master,      3]
+          # - [oraclelinux  ,   8   ,   master,      3]
+
+          ### `3001-py3`
+          - [debian       ,  10   ,   3001  ,      3]
+          - [debian       ,   9   ,   3001  ,      3]
+          - [ubuntu       ,  20.04,   3001  ,      3]
+          - [ubuntu       ,  18.04,   3001  ,      3]
+          - [centos       ,   8   ,   3001  ,      3]
+          - [centos       ,   7   ,   3001  ,      3]
+          - [fedora       ,  32   ,   3001  ,      3]
+          - [fedora       ,  31   ,   3001  ,      3]
+          - [opensuse/leap,  15.2 ,   3001  ,      3]
+          - [amazonlinux  ,   2   ,   3001  ,      3]
+          - [oraclelinux  ,   8   ,   3001  ,      3]
+          - [oraclelinux  ,   7   ,   3001  ,      3]
+
+          ### `3000.3-py3`
+          - [debian       ,  10   ,   3000.3,      3]
+          - [debian       ,   9   ,   3000.3,      3]
+          - [ubuntu       ,  18.04,   3000.3,      3]
+          - [centos       ,   8   ,   3000.3,      3]
+          - [centos       ,   7   ,   3000.3,      3]
+          - [fedora       ,  31   ,   3000.3,      3]
+          - [opensuse/leap,  15.2 ,   3000.3,      3]
+          - [amazonlinux  ,   2   ,   3000.3,      3]
+          ### ` 3000.3-py2`
+          - [ubuntu       ,  18.04,   3000.3,      2]
+          - [ubuntu       ,  16.04,   3000.3,      2]
+          - [arch-base    , latest,   3000.3,      2]
+
+          ### `2019.2-py2`
+          - [centos       ,   6   ,   2019.2,      2]
+          - [amazonlinux  ,   1   ,   2019.2,      2]
         platforms_matrix:
           # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
-          - [debian       ,  10   ,   master,      3,         default]
-          - [ubuntu       ,  20.04,   master,      3,         default]
-          - [centos       ,   8   ,   master,      3,         default]
+          - [debian       ,  10   ,   tiamat,      3,         default]
+          # - [debian       ,   9   ,   tiamat,      3,         default]
+          - [ubuntu       ,  20.04,   tiamat,      3,         default]
+          # - [ubuntu       ,  18.04,   tiamat,      3,         default]
+          # - [ubuntu       ,  16.04,   tiamat,      3,         default]
+          - [centos       ,   8   ,   tiamat,      3,         default]
+          # - [centos       ,   7   ,   tiamat,      3,         default]
+          - [amazonlinux  ,   2   ,   tiamat,      3,         default]
+          - [oraclelinux  ,   8   ,   tiamat,      3,         default]
+          # - [oraclelinux  ,   7   ,   tiamat,      3,         default]
           - [fedora       ,  32   ,   master,      3,         default]
-          - [opensuse/leap,  15.2 ,   3000.3,      3,         default]
-          - [amazonlinux  ,   2   ,   3000.3,      3,         default]
+          # - [fedora       ,  31   ,   master,      3,         default]
+          - [opensuse/leap,  15.2 ,   master,      3,         default]
+          - [arch-base    , latest,   3000.3,      2,         default]
           - [centos       ,   6   ,   2019.2,      2,         upstart]
-          - [arch-base    , latest,   2019.2,      2,         default]
+          - [amazonlinux  ,   1   ,   2019.2,      2,         upstart]
         use_libsaltcli: true
         use_tofs: true
       semrel_files: