feat(timezone): use platforms_new & platforms_matrix_new

myii · Mar 24, 2020 · 866ffb7 · 866ffb7
1 parent 42a2990
commit 866ffb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -23,7 +23,7 @@ ssf_node_anchors:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length rule:quoted-strings
             title: "ci(kitchen+travis): adjust matrix to add '`'3000'`' & remove '`'2017.7'`'"
-            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/135'
+            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/136'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -2323,15 +2323,8 @@ ssf:
             provisioner:
               pillars_from_files:
                 - .sls: 'test/salt/pillar/timezone.sls'
-        platforms_matrix:
-          # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
-          - [debian       ,  10   ,   master,      3,         default]
-          - [ubuntu       ,  18.04,   2019.2,      3,         default]
-          - [opensuse/leap,  15.1 ,   2019.2,      3,         default]
-          # # - [arch-base    , latest,   2019.2,      2,         default]
-          - [fedora       ,  30   ,   2018.3,      3,         default]
-          - [amazonlinux  ,   1   ,   2018.3,      2,         default]
-          - [centos       ,   6   ,   2017.7,      2,         default]
+        platforms: *platforms_new
+        platforms_matrix: *platforms_matrix_new
       semrel_files: *semrel_files_default
     ufw:
       context: