Skip to content

Commit

Permalink
Merge pull request #166 from myii/feat/add-3000.2-remove-2018.3-for-s…
Browse files Browse the repository at this point in the history 
…alt-formula

feat(salt): adjust matrix to add `3000.2` & remove `2018.3`
  • Loading branch information
@myii
myii authored May 2, 2020
2 parents f1b26c3 + 1d8e64f commit ed97e98
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 78 deletions.
7 changes: 2 additions & 5 deletions ssf/defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
126 changes: 53 additions & 73 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2055,12 +2055,14 @@ ssf:
0:
includes:
# [os , os_ver, salt_ver, py_ver]
- [debian , 10 , 3000.1, 3]
- [ubuntu , 18.04, 3000.1, 3]
- [centos , 8 , 3000.1, 3]
- [fedora , 31 , 3000.1, 3]
- [opensuse/leap, 15.1 , 3000.1, 3]
- [amazonlinux , 2 , 3000.1, 3]
- [debian , 10 , 3000.2, 3]
- [debian , 9 , 3000.2, 3]
- [ubuntu , 18.04, 3000.2, 3]
- [centos , 8 , 3000.2, 3]
- [centos , 7 , 3000.2, 3]
- [fedora , 31 , 3000.2, 3]
- [opensuse/leap, 15.1 , 3000.2, 3]
- [amazonlinux , 2 , 3000.2, 3]
inspec_yml:
summary: >-
Verify that Salt `v3000-py3` is setup and configured
Expand All @@ -2076,7 +2078,8 @@ ssf:
1:
includes:
# [os , os_ver, salt_ver, py_ver]
- [arch-base , latest, 3000.1, 2]
- [ubuntu , 18.04, 3000.2, 2]
- [ubuntu , 16.04, 3000.2, 2]
inspec_yml:
summary: >-
Verify that Salt `v3000-py2` is setup and configured
Expand All @@ -2095,8 +2098,10 @@ ssf:
- [debian , 10 , 2019.2, 3]
- [debian , 9 , 2019.2, 3]
- [ubuntu , 18.04, 2019.2, 3]
- [ubuntu , 16.04, 2019.2, 3]
- [centos , 8 , 2019.2, 3]
# - [fedora , 31 , 2019.2, 3]
- [centos , 7 , 2019.2, 3]
- [fedora , 31 , 2019.2, 3]
- [opensuse/leap, 15.1 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 3]
inspec_yml:
Expand All @@ -2114,9 +2119,8 @@ ssf:
3:
includes:
# [os , os_ver, salt_ver, py_ver]
- [ubuntu , 18.04, 2019.2, 2]
- [centos , 7 , 2019.2, 2]
- [arch-base , latest, 2019.2, 2]
- [centos , 6 , 2019.2, 2]
- [amazonlinux , 1 , 2019.2, 2]
inspec_yml:
summary: >-
Verify that Salt `v201902-py2` is setup and configured
Expand All @@ -2129,84 +2133,60 @@ 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]
- [ubuntu , 18.04, 3000.1, 3]
- [centos , 8 , 3000.1, 3]
- [fedora , 31 , 3000.1, 3]
- [opensuse/leap, 15.1 , 3000.1, 3]
- [amazonlinux , 2 , 3000.1, 3]
- [arch-base , latest, 3000.1, 2]
- [debian , 10 , 3000.2, 3]
- [debian , 9 , 3000.2, 3]
- [ubuntu , 18.04, 3000.2, 3]
- [centos , 8 , 3000.2, 3]
- [centos , 7 , 3000.2, 3]
- [fedora , 31 , 3000.2, 3]
- [opensuse/leap, 15.1 , 3000.2, 3]
- [amazonlinux , 2 , 3000.2, 3]
- [ubuntu , 18.04, 3000.2, 2]
- [ubuntu , 16.04, 3000.2, 2]
- [debian , 10 , 2019.2, 3]
- [debian , 9 , 2019.2, 3]
- [ubuntu , 18.04, 2019.2, 3]
- [ubuntu , 16.04, 2019.2, 3]
- [centos , 8 , 2019.2, 3]
- [centos , 7 , 2019.2, 3]
- [fedora , 31 , 2019.2, 3]
- [opensuse/leap, 15.1 , 2019.2, 3]
- [amazonlinux , 2 , 2019.2, 3]
- [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]
- [centos , 6 , 2019.2, 2]
- [amazonlinux , 1 , 2019.2, 2]
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
- [debian , 10 , 3000.1, 3, v3000-py3]
- [ubuntu , 18.04, 3000.1, 3, v3000-py3]
- [centos , 8 , 3000.1, 3, v3000-py3]
- [fedora , 31 , 3000.1, 3, v3000-py3]
# - [opensuse/leap, 15.1 , 3000.1, 3, v3000-py3]
- [amazonlinux , 2 , 3000.1, 3, v3000-py3]
# # - [arch-base , latest, 3000.1, 2, v3000-py2]
# - [debian , 10 , 2019.2, 3, v201902-py3]
- [debian , 9 , 2019.2, 3, v201902-py3]
# - [ubuntu , 18.04, 2019.2, 3, v201902-py3]
# - [centos , 8 , 2019.2, 3, v201902-py3]
# # - [fedora , 31 , 2019.2, 3, v201902-py3]
- [opensuse/leap, 15.1 , 2019.2, 3, v201902-py3]
# - [amazonlinux , 2 , 2019.2, 3, v201902-py3]
- [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]
- [debian , 10 , 3000.2, 3, v3000-py3]
# - [debian , 9 , 3000.2, 3, v3000-py3]
# - [ubuntu , 18.04, 3000.2, 3, v3000-py3]
- [centos , 8 , 3000.2, 3, v3000-py3]
# - [centos , 7 , 3000.2, 3, v3000-py3]
- [fedora , 31 , 3000.2, 3, v3000-py3]
# # Not working for `3000.X` yet
# # - [opensuse/leap, 15.1 , 3000.2, 3, v3000-py3]
- [amazonlinux , 2 , 3000.2, 3, v3000-py3]
- [ubuntu , 18.04, 3000.2, 2, v3000-py2]
# - [ubuntu , 16.04, 3000.2, 2, v3000-py2]
# - [debian , 10 , 2019.2, 3, v201902-py3]
- [debian , 9 , 2019.2, 3, v201902-py3]
# - [ubuntu , 18.04, 2019.2, 3, v201902-py3]
- [ubuntu , 16.04, 2019.2, 3, v201902-py3]
# - [centos , 8 , 2019.2, 3, v201902-py3]
- [centos , 7 , 2019.2, 3, v201902-py3]
# # Won't install less than `3000.X`
# # - [fedora , 31 , 2019.2, 3, v201902-py3]
- [opensuse/leap, 15.1 , 2019.2, 3, v201902-py3]
# - [amazonlinux , 2 , 2019.2, 3, v201902-py3]
- [centos , 6 , 2019.2, 2, v201902-py2]
# # States don't complete
# # - [amazonlinux , 1 , 2019.2, 2, v201902-py2]
use_tofs: true
yamllint:
ignore:
Expand Down

0 comments on commit ed97e98

Please sign in to comment.