diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 9187248e..718f5ea3 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -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/246' + title: "ci(kitchen+travis): use latest pre-salted images" + body: '* Automated using https://github.com/myii/ssf-formula/pull/245' # yamllint enable rule:line-length rule:quoted-strings github: owner: 'saltstack-formulas' @@ -802,7 +802,15 @@ ssf: stack: *formula_default strongswan: *formula_default stunnel: *formula_default - sudoers: *formula_default + sudoers: + <<: *formula_default + context: + <<: *context_default + inspec_suites_kitchen: + <<: *isk_default + 1: + <<: *isk_suite_default + name: 'share' suricata: *formula_default sysctl: *formula_default syslog-ng: *formula_default diff --git a/ssf/files/tofs_sudoers-formula/inspec/README.md b/ssf/files/tofs_sudoers-formula/inspec/README.md new file mode 120000 index 00000000..2f6e311c --- /dev/null +++ b/ssf/files/tofs_sudoers-formula/inspec/README.md @@ -0,0 +1 @@ +../../tofs_libvirt-formula/inspec/README.md \ No newline at end of file diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index b9bc559f..6cd554bc 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -3905,6 +3905,7 @@ ssf: inspec_suites_kitchen: 0: inspec_yml: + depends: *depends_on_suite_share summary: >- Verify that the sudoers formula is setup and configured correctly provisioner: @@ -3917,8 +3918,16 @@ ssf: - .sls: 'test/salt/pillar/default.sls' state_top: - '*': + - ._mapdata - . - .included + 1: + includes: *includes_NONE + inspec_yml: + summary: >- + shared resources + platforms: *platforms_new + platforms_matrix: *platforms_matrix_new_mainly_master_images semrel_files: *semrel_files_default suricata: context: