Merge pull request #206 from myii/feat/upgrade-ci-for-logrotate-formula

feat(logrotate): use latest pre-salted images (`platforms_new`)
myii · May 28, 2020 · 5ab5c28 · 5ab5c28
2 parents 518b552 + 25a0dce
commit 5ab5c28
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 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 new platforms"
-            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/205'
+            title: "ci(kitchen+travis): use latest pre-salted images [skip ci]"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/206'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -276,6 +276,15 @@ ssf_node_anchors:
           - [fedora       ,  30   ,   2018.3,      3,         default]
           # - [arch-base    , latest,   2018.3,      2,         default]
           - [centos       ,   6   ,   2017.7,      2,         default]
+        platforms_matrix_without_arch_new: &platforms_matrix_without_arch_new
+          # [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]
+          - [fedora       ,  32   ,   master,      3,         default]
+          - [opensuse/leap,  15.2 ,   3000.3,      3,         default]
+          - [amazonlinux  ,   2   ,   3000.3,      3,         default]
+          # - [arch-base    , latest,   2019.2,      2,         default]
         platforms_matrix_jetbrains: &platforms_matrix_jetbrains
           # [os           , os_ver, salt_ver, py_ver,    inspec_suite]
           - [debian       ,  10   ,   master,      3,         default]
@@ -1984,12 +1993,13 @@ ssf:
             provisioner:
               dependencies: *dependencies_states
               state_top:
-                - 'G@os_family:Suse or G@os:Debian':
+                - 'G@os_family:Suse or G@os_family:Debian':
                     - states.cron
                 - '*':
                     - .
                     - .jobs
-        platforms_matrix: *platforms_matrix_without_arch
+        platforms: *platforms_new
+        platforms_matrix: *platforms_matrix_without_arch_new
       semrel_files: *semrel_files_default
     lvm:
       context: