Merge pull request #23 from myii/feat/replace-eol-pre-salted-images

feat(ufw): replace EOL pre-salted images
myii · Sep 7, 2019 · 9192b8a · 9192b8a
2 parents e9ae4e6 + 9909840
commit 9192b8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -14,8 +14,8 @@ ssf_node_anchors:
             #       release phase via. `pre-commit_semantic-release.sh`
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
-            title: 'chore: use `semantic-release` cross-formula standard structure'
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/21'
+            title: 'ci(kitchen+travis): replace EOL pre-salted images'
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/23'
           github:
             owner: saltstack-formulas
             repo: ''

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -1162,14 +1162,12 @@ ssf:
                 - .sls: test/salt/pillar/default.sls
         platforms_matrix:
           # [os           , os_ver, salt_ver, py_ver, inspec_suite]
-          - [debian       ,  10   ,  develop,      3,      default]
-          - [ubuntu       ,  18.04,   2019.2,      3,      default]
+          - [ubuntu       ,  18.04,  develop,      3,      default]
+          - [debian       ,   9   ,   2019.2,      3,      default]
           - [centos       ,   7   ,   2019.2,      3,      default]
-          # - [amazonlinux  ,   2   ,   2019.2,      2,      default]
           - [fedora       ,  29   ,   2018.3,      2,      default]
           - [opensuse/leap,  15   ,   2018.3,      2,      default]
-          # - [centos       ,   6   ,   2017.7,      2,      default]
-          # - [amazonlinux  ,   2   ,   2017.7,      2,      default]
+          - [ubuntu       ,  16.04,   2017.7,      2,      default]
         travis:
           # Facing errors with `xenial` at time of adding
           # https://travis-ci.org/myii/ufw-formula/jobs/561205378#L906