Skip to content

Commit

Permalink
feat(salt): use pillars_from_directories & test/salt/pillar/top.sls
Browse files Browse the repository at this point in the history
  • Loading branch information
@myii
myii committed Nov 17, 2021
1 parent 93b1016 commit 1056947
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 147 deletions.
16 changes: 1 addition & 15 deletions ssf/defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1387,21 +1387,7 @@ ssf:
rspamd: *formula_default
rstudio: *formula_default
rundeck: *formula_default
salt:
<<: *formula_default
context:
<<: *context_default
inspec_suites_kitchen:
<<: *isk_default
0:
<<: *isk_suite_default
name: 'v3003-py3'
1:
<<: *isk_suite_default
name: 'v3002-py3'
2:
<<: *isk_suite_default
name: 'v3001-py3'
salt: *formula_default
splunkforwarder: *formula_default
sqldeveloper: *formula_default
sqlplus: *formula_default
Expand Down
203 changes: 71 additions & 132 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ ssf_node_anchors:
path: './test/salt'
- name: 'states'
path: './test/salt'
state_top_salt: &state_top_salt
- '*':
- ._mapdata
- .pkgrepo
- .master
- .minion
verifier: &verifier_inspec_tests_default
inspec_tests:
- default
Expand Down Expand Up @@ -4338,156 +4332,101 @@ ssf:
repo: 'salt-formula'
inspec_suites_kitchen:
0:
includes:
# [os , os_ver, salt_ver, py_ver]
- [0 , 0 , 3003.3, 3]
- [freebsd , 0 , 3003.1, 3]
- [windows , 0 , latest, 3]
inspec_yml:
summary: >-
Verify that Salt `v3003-py3` is setup and configured
provisioner:
pillars:
- '*':
- .
- v3003-py3
pillars_from_files:
- .sls: 'test/salt/pillar/salt.sls'
- v3003-py3.sls: 'test/salt/pillar/v3003-py3.sls'
state_top: *state_top_salt
1:
includes:
# [os , os_ver, salt_ver, py_ver]
- [debian , 0 , 3002.7, 3]
- [ubuntu , 0 , 3002.7, 3]
- [centos , 0 , 3002.7, 3]
# - [fedora , 0 , 3002.7, 3]
# - [opensuse/leap, 0 , 3002.7, 3]
# - [opensuse/tmbl, 0 , 3002.7, 3]
- [amazonlinux , 0 , 3002.7, 3]
- [oraclelinux , 0 , 3002.7, 3]
# - [arch-base , 0 , 3002.7, 3]
- [gentoo/stage3, 0 , 3002.7, 3]
- [almalinux , 0 , 3002.7, 3]
- [rockylinux , 0 , 3002.7, 3]
- [openbsd , 0 , 3002.6, 3]
inspec_yml:
summary: >-
Verify that Salt `v3002-py3` is setup and configured
provisioner:
pillars:
- '*':
- .
- v3002-py3
pillars_from_files:
- .sls: 'test/salt/pillar/salt.sls'
- v3002-py3.sls: 'test/salt/pillar/v3002-py3.sls'
state_top: *state_top_salt
2:
includes:
# [os , os_ver, salt_ver, py_ver]
- [debian , 0 , 3001.8, 3]
- [ubuntu , 0 , 3001.8, 3]
- [centos , 0 , 3001.8, 3]
# - [fedora , 0 , 3001.8, 3]
# - [opensuse/leap, 0 , 3001.8, 3]
# - [opensuse/tmbl, 0 , 3001.8, 3]
- [amazonlinux , 0 , 3001.8, 3]
- [oraclelinux , 0 , 3001.8, 3]
# - [arch-base , 0 , 3001.8, 3]
# - [gentoo/stage3, 0 , 3001.8, 3]
- [almalinux , 0 , 3001.8, 3]
- [rockylinux , 0 , 3001.8, 3]
- [openbsd , 0 , 3001.1, 3]
inspec_yml:
summary: >-
Verify that Salt `v3001-py3` is setup and configured
Verify that Salt is setup and configured
provisioner:
pillars:
state_top:
- '*':
- .
- v3001-py3
pillars_from_files:
- .sls: 'test/salt/pillar/salt.sls'
- v3001-py3.sls: 'test/salt/pillar/v3001-py3.sls'
state_top: *state_top_salt
inspec_suites_matrix:
- v3003-py3
- v3002-py3
- v3001-py3
- ._mapdata
- .pkgrepo
- .master
- .minion
kitchen:
provisioner:
pillars_from_directories:
- test/salt/pillar
top_sls:
- '*':
- salt
- 'G@saltversioninfo:0:3003 and G@pythonversion:0:3':
- v3003-py3
- 'G@saltversioninfo:0:3002 and G@pythonversion:0:3':
- v3002-py3
- 'G@saltversioninfo:0:3001 and G@pythonversion:0:3':
- v3001-py3
map_jinja:
verification:
import: ['salt_settings', 'formulas_settings']
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
### `v3004-py3`
# # `arch` unavailable below since only installs `3004.X`
# # This doesn't do anything right now until the `3004.0` pre-salted
# # images are pushed to the formula
- [arch-base , latest, 3004.0, 3, default]

### `v3003-py3`
- [debian , 11 , 3003.3, 3, v3003-py3]
# - [debian , 10 , 3003.3, 3, v3003-py3]
# - [debian , 9 , 3003.3, 3, v3003-py3]
- [ubuntu , 20.04, 3003.3, 3, v3003-py3]
# - [ubuntu , 18.04, 3003.3, 3, v3003-py3]
- [centos , 8 , 3003.3, 3, v3003-py3]
# - [centos , 7 , 3003.3, 3, v3003-py3]
- [debian , 11 , 3003.3, 3, default]
# - [debian , 10 , 3003.3, 3, default]
# - [debian , 9 , 3003.3, 3, default]
- [ubuntu , 20.04, 3003.3, 3, default]
# - [ubuntu , 18.04, 3003.3, 3, default]
- [centos , 8 , 3003.3, 3, default]
# - [centos , 7 , 3003.3, 3, default]
# # `fedora` unavailable below since only installs `3003.X`
- [fedora , 34 , 3003.3, 3, v3003-py3]
- [fedora , 33 , 3003.3, 3, v3003-py3]
- [fedora , 34 , 3003.3, 3, default]
- [fedora , 33 , 3003.3, 3, default]
# # `opensuse/*` unavailable below since only installs `3003.X`
# # Can't use both `15.3` & `15.2` together within the same
# # InSpec suite when there's a shared `_mapdata` verification file --
# # using the currently supported version for now (re: Salt repo)
- [opensuse/leap, 15.3 , 3003.3, 3, v3003-py3]
# - [opensuse/leap, 15.2 , 3003.3, 3, v3003-py3]
# # Was last working properly with `3002.2`, hitting a problem with `3003.3`:
# # `'service' __virtual__ returned False: No service execution module loaded`
# # Actually still works if running `kitchen converge` a second time;
# # thought it might work with the `retry_options` used for FreeBSD
# # but it didn't -- disabling for the time being
# - [opensuse/tmbl, latest, 3003.3, 3, v3003-py3]
- [amazonlinux , 2 , 3003.3, 3, v3003-py3]
- [oraclelinux , 8 , 3003.3, 3, v3003-py3]
# - [oraclelinux , 7 , 3003.3, 3, v3003-py3]
# # `arch` unavailable below since only installs `3003.X`
- [arch-base , latest, 3003.3, 3, v3003-py3]
- [gentoo/stage3, latest, 3003.3, 3, v3003-py3]
- [gentoo/stage3, systemd, 3003.3, 3, v3003-py3]
- [almalinux , 8 , 3003.3, 3, v3003-py3]
- [opensuse/leap, 15.3 , 3003.3, 3, default]
# - [opensuse/leap, 15.2 , 3003.3, 3, default]
- [opensuse/tmbl, latest, 3003.3, 3, default]
- [amazonlinux , 2 , 3003.3, 3, default]
- [oraclelinux , 8 , 3003.3, 3, default]
# - [oraclelinux , 7 , 3003.3, 3, default]
- [gentoo/stage3, latest, 3003.3, 3, default]
- [gentoo/stage3, systemd, 3003.3, 3, default]
- [almalinux , 8 , 3003.3, 3, default]
# # TODO: When supported in an official release, move this platform
# # to that release (as a minimum, no other Salt versions)
- [rockylinux , 0 , 3003.3, 3, v3003-py3]
- [rockylinux , 0 , 3003.3, 3, default]
# # FreeBSD and Windows won't always be in sync with the Linux
# # platforms above
- [freebsd , 0 , 3003.1, 3, v3003-py3]
- [windows , 0 , latest, 3, v3003-py3]
- [freebsd , 0 , 3003.1, 3, default]
- [windows , 0 , latest, 3, default]

### `v3002-py3`
# - [debian , 11 , 3002.7, 3, v3002-py3]
- [debian , 10 , 3002.7, 3, v3002-py3]
# - [debian , 9 , 3002.7, 3, v3002-py3]
- [ubuntu , 20.04, 3002.7, 3, v3002-py3]
# - [ubuntu , 18.04, 3002.7, 3, v3002-py3]
- [centos , 8 , 3002.7, 3, v3002-py3]
# - [centos , 7 , 3002.7, 3, v3002-py3]
# - [amazonlinux , 2 , 3002.7, 3, v3002-py3]
- [oraclelinux , 8 , 3002.7, 3, v3002-py3]
# - [oraclelinux , 7 , 3002.7, 3, v3002-py3]
# - [gentoo/stage3, latest, 3002.7, 3, v3002-py3]
# - [gentoo/stage3, systemd, 3002.7, 3, v3002-py3]
- [openbsd , 0 , 3002.6, 3, v3002-py3]
# - [debian , 11 , 3002.7, 3, default]
- [debian , 10 , 3002.7, 3, default]
# - [debian , 9 , 3002.7, 3, default]
# - [ubuntu , 20.04, 3002.7, 3, default]
- [ubuntu , 18.04, 3002.7, 3, default]
# - [centos , 8 , 3002.7, 3, default]
- [centos , 7 , 3002.7, 3, default]
# - [amazonlinux , 2 , 3002.7, 3, default]
# - [oraclelinux , 8 , 3002.7, 3, default]
- [oraclelinux , 7 , 3002.7, 3, default]
# - [gentoo/stage3, latest, 3002.7, 3, default]
# - [gentoo/stage3, systemd, 3002.7, 3, default]
- [openbsd , 0 , 3002.6, 3, default]

### `v3001-py3`
# - [debian , 10 , 3001.8, 3, v3001-py3]
- [debian , 9 , 3001.8, 3, v3001-py3]
# - [ubuntu , 20.04, 3001.8, 3, v3001-py3]
- [ubuntu , 18.04, 3001.8, 3, v3001-py3]
# - [centos , 8 , 3001.8, 3, v3001-py3]
- [centos , 7 , 3001.8, 3, v3001-py3]
# - [amazonlinux , 2 , 3001.8, 3, v3001-py3]
# - [oraclelinux , 8 , 3001.8, 3, v3001-py3]
- [oraclelinux , 7 , 3001.8, 3, v3001-py3]
- [openbsd , 0 , 3001.1, 3, v3001-py3]
# - [debian , 10 , 3001.8, 3, default]
- [debian , 9 , 3001.8, 3, default]
# - [ubuntu , 20.04, 3001.8, 3, default]
# - [ubuntu , 18.04, 3001.8, 3, default]
# - [centos , 8 , 3001.8, 3, default]
# - [centos , 7 , 3001.8, 3, default]
# - [amazonlinux , 2 , 3001.8, 3, default]
# - [oraclelinux , 8 , 3001.8, 3, default]
# - [oraclelinux , 7 , 3001.8, 3, default]
# - [openbsd , 0 , 3001.1, 3, default]
platforms_matrix_allow_failure:
- [debian , 11 , 3003.3, 3, v3003-py3]
- [debian , 11 , 3002.7, 3, v3002-py3]
- [debian , 11 , 3003.3, 3, default]
- [debian , 11 , 3002.7, 3, default]
testing_freebsd:
active: true
testing_openbsd:
Expand Down

0 comments on commit 1056947

Please sign in to comment.