Skip to content

Commit

Permalink
feat(template): fix centos6 suite and rename to upstart
Browse files Browse the repository at this point in the history
* Problems identified while reviewing:
  - saltstack-formulas/template-formula#203
  • Loading branch information
myii committed Sep 4, 2020
1 parent c59747c commit 9760abb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
6 changes: 3 additions & 3 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "chore: standardise structure"
body: '* Checked using https://github.com/myii/ssf-formula/pull/248'
title: "ci(kitchen+travis): fix '`'centos6'`' suite and rename to '`'upstart'`'"
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/247'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -834,7 +834,7 @@ ssf:
<<: *isk_default
1:
<<: *isk_suite_default
name: 'centos6'
name: 'upstart'
timezone: *formula_default
tomcat: *formula_default
ufw:
Expand Down
17 changes: 9 additions & 8 deletions ssf/formulas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,6 @@ ssf_node_anchors:
- [centos , 8 , 2019.2, 3]
- [centos , 7 , 2019.2, 3]
- [centos , 6 , 2019.2, 2]
platforms_os_centos6: &platforms_os_centos6
# [os , os_ver, salt_ver, py_ver]
- [centos , 6 , 2018.3, 2]
platforms_os_amazonlinux: &platforms_os_amazonlinux
# [os , os_ver, salt_ver, py_ver]
- [amazonlinux , 2 , master, 3]
Expand All @@ -334,6 +331,10 @@ ssf_node_anchors:
- [amazonlinux , 2 , 3000.3, 3]
- [amazonlinux , 2 , 2019.2, 3]
- [amazonlinux , 1 , 2019.2, 2]
platforms_os_upstart: &platforms_os_upstart
# [os , os_ver, salt_ver, py_ver]
- [centos , 6 , 2019.2, 2]
- [amazonlinux , 1 , 2019.2, 2]
platforms_os_arch_base: &platforms_os_arch_base
# [os , os_ver, salt_ver, py_ver]
- [arch-base , latest, 2019.2, 2]
Expand Down Expand Up @@ -4187,7 +4188,7 @@ ssf:
repo: 'template-formula'
inspec_suites_kitchen:
0:
excludes: *platforms_os_centos6
excludes: *platforms_os_upstart
inspec_yml:
summary: >-
Verify that the TEMPLATE formula is setup and configured correctly
Expand All @@ -4203,22 +4204,22 @@ ssf:
- '*':
- TEMPLATE
1:
includes: *platforms_os_centos6
includes: *platforms_os_upstart
provisioner:
pillars:
- '*':
- TEMPLATE
- define_roles
pillars_from_files:
- TEMPLATE.sls: 'test/salt/pillar/centos6.sls'
- TEMPLATE.sls: 'test/salt/pillar/upstart.sls'
- define_roles.sls: 'test/salt/pillar/define_roles.sls'
state_top:
- '*':
- TEMPLATE
verifier: *verifier_inspec_tests_default
inspec_suites_matrix:
- default
- centos6
- upstart
platforms: *platforms_new
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
Expand All @@ -4228,7 +4229,7 @@ ssf:
- [fedora , 32 , master, 3, default]
- [opensuse/leap, 15.2 , 3000.3, 3, default]
- [amazonlinux , 2 , 3000.3, 3, default]
- [centos , 6 , 2019.2, 2, centos6]
- [centos , 6 , 2019.2, 2, upstart]
- [arch-base , latest, 2019.2, 2, default]
use_libsaltcli: true
use_tofs: true
Expand Down

0 comments on commit 9760abb

Please sign in to comment.