Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(salt): adjust matrix to add 3000 & remove 2017.7 #135

Merged
merged 1 commit into from
Mar 21, 2020
Merged

feat(salt): adjust matrix to add 3000 & remove 2017.7 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions ssf/defaults.yaml
View file
Open in desktop
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(travis): adjust to new working matrix"
body: '* Automated using https://github.com/myii/ssf-formula/pull/134'
title: "ci(kitchen+travis): adjust matrix to add '`'3000'`' & remove '`'2017.7'`'"
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/135'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -432,16 +432,19 @@ ssf:
<<: *isk_default
0:
<<: *isk_suite_default
name: 'v201902-py3'
name: 'v3000-py3'
1:
<<: *isk_suite_default
name: 'v201902-py2'
name: 'v3000-py2'
2:
<<: *isk_suite_default
name: 'v201803-py2'
name: 'v201902-py3'
3:
<<: *isk_suite_default
name: 'v201707-py2'
name: 'v201902-py2'
4:
<<: *isk_suite_default
name: 'v201803-py2'
ssf: *formula_default
stack: *formula_default
strongswan: *formula_default
Expand Down
6 changes: 0 additions & 6 deletions ssf/files/default/.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,6 @@ jobs:
# to allow for comprehensive local testing
# Ref: https://github.com/saltstack-formulas/template-formula/issues/118
# Ref: https://github.com/saltstack-formulas/template-formula/issues/121
{%- elif semrel_formula == 'salt' %}
# The ordering used below has been selected based on the time required in Travis
# The slower ones are kept as high up as possible, to run concurrently rather than
# slow down the entire run at the end (i.e. `centos-6` and `opensuse`)
# However, the groupings needed to be maintained in some semblance of order
# so this is a best-effort matrix, in the circumstances
{%- endif %}
{{- format_ci_matrix(platforms, inspec_suites_kitchen, inspec_suites_matrix, platforms_matrix, platforms_matrix_commented_includes, semrel_formula, use_new_travis_format=True) }}
{%- endif %}
Expand Down
142 changes: 78 additions & 64 deletions ssf/formulas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,6 +1734,43 @@ ssf:
repo: 'salt-formula'
inspec_suites_kitchen:
0:
includes:
# [os , os_ver, salt_ver, py_ver]
- [debian , 10 , 3000, 3]
- [ubuntu , 18.04, 3000, 3]
- [centos , 8 , 3000, 3]
- [fedora , 31 , 3000, 3]
- [opensuse/leap, 15.1 , 3000, 3]
- [amazonlinux , 2 , 3000, 3]
inspec_yml:
summary: >-
Verify that Salt `v3000-py3` is setup and configured
provisioner:
pillars:
- '*':
- .
- v3000-py3
pillars_from_files:
- .sls: 'test/salt/pillar/salt.sls'
- v3000-py3.sls: 'test/salt/pillar/v3000-py3.sls'
state_top: *state_top_salt
1:
includes:
# [os , os_ver, salt_ver, py_ver]
- [arch-base , latest, 3000, 2]
inspec_yml:
summary: >-
Verify that Salt `v3000-py2` is setup and configured
provisioner:
pillars:
- '*':
- .
- v3000-py2
pillars_from_files:
- .sls: 'test/salt/pillar/salt.sls'
- v3000-py2.sls: 'test/salt/pillar/v3000-py2.sls'
state_top: *state_top_salt
2:
includes:
# [os , os_ver, salt_ver, py_ver]
- [debian , 10 , 2019.2, 3]
Expand All @@ -1755,7 +1792,7 @@ ssf:
- .sls: 'test/salt/pillar/salt.sls'
- v201902-py3.sls: 'test/salt/pillar/v201902-py3.sls'
state_top: *state_top_salt
1:
3:
includes:
# [os , os_ver, salt_ver, py_ver]
- [ubuntu , 18.04, 2019.2, 2]
Expand All @@ -1773,7 +1810,7 @@ ssf:
- .sls: 'test/salt/pillar/salt.sls'
- v201902-py2.sls: 'test/salt/pillar/v201902-py2.sls'
state_top: *state_top_salt
2:
4:
includes:
# [os , os_ver, salt_ver, py_ver]
- [debian , 9 , 2018.3, 2]
Expand All @@ -1794,86 +1831,63 @@ ssf:
- .sls: 'test/salt/pillar/salt.sls'
- v201803-py2.sls: 'test/salt/pillar/v201803-py2.sls'
state_top: *state_top_salt
3:
includes:
# [os , os_ver, salt_ver, py_ver]
- [debian , 8 , 2017.7, 2]
- [ubuntu , 16.04, 2017.7, 2]
- [centos , 6 , 2017.7, 2]
# Would need a forced version, Fedora could be pinned to `minor`, though
# - [fedora , 30 , 2017.7, 2]
# - [opensuse/leap, 15.1 , 2017.7, 2]
- [amazonlinux , 1 , 2017.7, 2]
- [arch-base , latest, 2017.7, 2]
inspec_yml:
summary: >-
Verify that Salt `v201707-py2` is setup and configured
provisioner:
pillars:
- '*':
- .
- v201707-py2
pillars_from_files:
- .sls: 'test/salt/pillar/salt.sls'
- v201707-py2.sls: 'test/salt/pillar/v201707-py2.sls'
state_top: *state_top_salt
inspec_suites_matrix:
- v3000-py3
- v3000-py2
- v201902-py3
- v201902-py2
- v201803-py2
- v201707-py2
# "Reversed" the ordering here to get the slowest instances closer to the top
platforms:
# [os , os_ver, salt_ver, py_ver]
- [debian , 8 , 2017.7, 2]
- [ubuntu , 16.04, 2017.7, 2]
- [centos , 6 , 2017.7, 2]
# - [fedora , 30 , 2017.7, 2]
# - [opensuse/leap, 15.1 , 2017.7, 2]
- [amazonlinux , 1 , 2017.7, 2]
- [arch-base , latest, 2017.7, 2]
- [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]
# - [fedora , 30 , 2018.3, 3]
- [ubuntu , 18.04, 2019.2, 2]
- [centos , 7 , 2019.2, 2]
- [amazonlinux , 2 , 2019.2, 3]
- [arch-base , latest, 2019.2, 2]
- [debian , 10 , 3000, 3]
- [ubuntu , 18.04, 3000, 3]
- [centos , 8 , 3000, 3]
- [fedora , 31 , 3000, 3]
- [opensuse/leap, 15.1 , 3000, 3]
- [amazonlinux , 2 , 3000, 3]
- [arch-base , latest, 3000, 2]
- [debian , 10 , 2019.2, 3]
- [debian , 9 , 2019.2, 3]
- [ubuntu , 18.04, 2019.2, 3]
- [centos , 8 , 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]
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
# - [debian , 8 , 2017.7, 2, v201707-py2]
- [ubuntu , 16.04, 2017.7, 2, v201707-py2]
- [centos , 6 , 2017.7, 2, v201707-py2]
# # - [fedora , 30 , 2017.7, 2, v201707-py2]
# # - [opensuse/leap, 15.1 , 2017.7, 2, v201707-py2]
# - [amazonlinux , 1 , 2017.7, 2, v201707-py2]
# # - [arch-base , latest, 2017.7, 2, v201707-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]
- [ubuntu , 18.04, 2019.2, 2, v201902-py2]
# - [centos , 7 , 2019.2, 2, v201902-py2]
- [amazonlinux , 2 , 2019.2, 3, v201902-py3]
# # - [arch-base , latest, 2019.2, 2, v201902-py2]
- [debian , 10 , 2019.2, 3, v201902-py3]
# - [debian , 9 , 2019.2, 3, v201902-py3]
- [debian , 10 , 3000, 3, v3000-py3]
- [ubuntu , 18.04, 3000, 3, v3000-py3]
- [centos , 8 , 3000, 3, v3000-py3]
- [fedora , 31 , 3000, 3, v3000-py3]
# - [opensuse/leap, 15.1 , 3000, 3, v3000-py3]
- [amazonlinux , 2 , 3000, 3, v3000-py3]
# # - [arch-base , latest, 3000, 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]
use_tofs: true
yamllint:
ignore:
Expand Down