ci: use `pillars_from_directories` & `test/salt/pillar/top.sls`

* Automated using https://github.com/myii/ssf-formula/pull/384
This commit is contained in:
Imran Iqbal 2021-11-17 21:53:16 +00:00
parent 4b1cbef932
commit 98c9dbfcfb
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
12 changed files with 612 additions and 192 deletions

View File

@ -14,12 +14,14 @@ jobs:
fail-fast: false
matrix:
instance:
- v3003-py3-freebsd-130-3003-1-py3
- v3003-py3-freebsd-122-3003-1-py3
- v3002-py3-openbsd-69-3002-6-py3
- v3001-py3-openbsd-68-3001-1-py3
- v3003-py3-windows-10-latest-py3
- v3003-py3-windows-81-latest-py3
# - default-freebsd-130-master-py3
# - default-freebsd-122-master-py3
- default-freebsd-130-3003-1-py3
- default-freebsd-122-3003-1-py3
- default-openbsd-69-3002-6-py3
# - default-openbsd-68-3001-1-py3
- default-windows-10-latest-py3
- default-windows-81-latest-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'

View File

@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
instance:
- v3003-py3-windows-2019-latest-py3
- default-windows-2019-latest-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
@ -61,7 +61,7 @@ jobs:
fail-fast: false
matrix:
instance:
- v3003-py3-windows-2016-latest-py3
- default-windows-2016-latest-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'

View File

@ -130,46 +130,92 @@ rubocop:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
v3003-py3-debian-11-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# v3003-py3-debian-10-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-debian-9-3003-3-py3: {extends: '.test_instance'}
v3003-py3-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
v3003-py3-centos-8-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-centos-7-3003-3-py3: {extends: '.test_instance'}
v3003-py3-fedora-34-3003-3-py3: {extends: '.test_instance'}
v3003-py3-fedora-33-3003-3-py3: {extends: '.test_instance'}
v3003-py3-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
v3003-py3-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
v3003-py3-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
v3003-py3-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
v3003-py3-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
v3003-py3-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
v3003-py3-almalinux-8-3003-3-py3: {extends: '.test_instance'}
# v3002-py3-debian-11-3002-7-py3: {extends: '.test_instance_failure_permitted'}
v3002-py3-debian-10-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-debian-9-3002-7-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
v3002-py3-centos-8-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-centos-7-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
# v3001-py3-debian-10-3001-8-py3: {extends: '.test_instance'}
v3001-py3-debian-9-3001-8-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
v3001-py3-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
# v3001-py3-centos-8-3001-8-py3: {extends: '.test_instance'}
v3001-py3-centos-7-3001-8-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
# default-debian-11-tiamat-py3: {extends: '.test_instance'}
# default-debian-10-tiamat-py3: {extends: '.test_instance'}
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
# default-debian-11-master-py3: {extends: '.test_instance'}
# default-debian-10-master-py3: {extends: '.test_instance'}
# default-debian-9-master-py3: {extends: '.test_instance'}
# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-8-master-py3: {extends: '.test_instance'}
# default-centos-7-master-py3: {extends: '.test_instance'}
# default-fedora-34-master-py3: {extends: '.test_instance'}
# default-fedora-33-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
# default-arch-base-latest-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# default-almalinux-8-master-py3: {extends: '.test_instance'}
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
default-debian-11-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
default-centos-8-3003-3-py3: {extends: '.test_instance'}
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
default-fedora-34-3003-3-py3: {extends: '.test_instance'}
default-fedora-33-3003-3-py3: {extends: '.test_instance'}
default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
# default-debian-11-3002-7-py3: {extends: '.test_instance_failure_permitted'}
default-debian-10-3002-7-py3: {extends: '.test_instance'}
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
default-centos-7-3002-7-py3: {extends: '.test_instance'}
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
default-debian-9-3001-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
# default-centos-7-3001-8-py3: {extends: '.test_instance'}
# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}
###############################################################################
# `release` stage: `semantic-release`

View File

@ -83,46 +83,92 @@ jobs:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
- env: INSTANCE=v3003-py3-debian-11-3003-3-py3
# - env: INSTANCE=v3003-py3-debian-10-3003-3-py3
# - env: INSTANCE=v3003-py3-debian-9-3003-3-py3
- env: INSTANCE=v3003-py3-ubuntu-2004-3003-3-py3
# - env: INSTANCE=v3003-py3-ubuntu-1804-3003-3-py3
- env: INSTANCE=v3003-py3-centos-8-3003-3-py3
# - env: INSTANCE=v3003-py3-centos-7-3003-3-py3
- env: INSTANCE=v3003-py3-fedora-34-3003-3-py3
- env: INSTANCE=v3003-py3-fedora-33-3003-3-py3
- env: INSTANCE=v3003-py3-opensuse-leap-153-3003-3-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-3-py3
# - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-3-py3
- env: INSTANCE=v3003-py3-amazonlinux-2-3003-3-py3
- env: INSTANCE=v3003-py3-oraclelinux-8-3003-3-py3
# - env: INSTANCE=v3003-py3-oraclelinux-7-3003-3-py3
- env: INSTANCE=v3003-py3-arch-base-latest-3003-3-py3
- env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-3-py3
- env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-3-py3
- env: INSTANCE=v3003-py3-almalinux-8-3003-3-py3
# - env: INSTANCE=v3002-py3-debian-11-3002-7-py3
- env: INSTANCE=v3002-py3-debian-10-3002-7-py3
# - env: INSTANCE=v3002-py3-debian-9-3002-7-py3
- env: INSTANCE=v3002-py3-ubuntu-2004-3002-7-py3
# - env: INSTANCE=v3002-py3-ubuntu-1804-3002-7-py3
- env: INSTANCE=v3002-py3-centos-8-3002-7-py3
# - env: INSTANCE=v3002-py3-centos-7-3002-7-py3
# - env: INSTANCE=v3002-py3-amazonlinux-2-3002-7-py3
- env: INSTANCE=v3002-py3-oraclelinux-8-3002-7-py3
# - env: INSTANCE=v3002-py3-oraclelinux-7-3002-7-py3
# - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-7-py3
# - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-7-py3
# - env: INSTANCE=v3001-py3-debian-10-3001-8-py3
- env: INSTANCE=v3001-py3-debian-9-3001-8-py3
# - env: INSTANCE=v3001-py3-ubuntu-2004-3001-8-py3
- env: INSTANCE=v3001-py3-ubuntu-1804-3001-8-py3
# - env: INSTANCE=v3001-py3-centos-8-3001-8-py3
- env: INSTANCE=v3001-py3-centos-7-3001-8-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-8-py3
# - env: INSTANCE=v3001-py3-oraclelinux-8-3001-8-py3
- env: INSTANCE=v3001-py3-oraclelinux-7-3001-8-py3
# - env: INSTANCE=default-debian-11-tiamat-py3
# - env: INSTANCE=default-debian-10-tiamat-py3
# - env: INSTANCE=default-debian-9-tiamat-py3
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
# - env: INSTANCE=default-centos-8-tiamat-py3
# - env: INSTANCE=default-centos-7-tiamat-py3
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
# - env: INSTANCE=default-almalinux-8-tiamat-py3
# - env: INSTANCE=default-rockylinux-8-tiamat-py3
# - env: INSTANCE=default-debian-11-master-py3
# - env: INSTANCE=default-debian-10-master-py3
# - env: INSTANCE=default-debian-9-master-py3
# - env: INSTANCE=default-ubuntu-2004-master-py3
# - env: INSTANCE=default-ubuntu-1804-master-py3
# - env: INSTANCE=default-centos-8-master-py3
# - env: INSTANCE=default-centos-7-master-py3
# - env: INSTANCE=default-fedora-34-master-py3
# - env: INSTANCE=default-fedora-33-master-py3
# - env: INSTANCE=default-opensuse-leap-153-master-py3
# - env: INSTANCE=default-opensuse-leap-152-master-py3
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
# - env: INSTANCE=default-amazonlinux-2-master-py3
# - env: INSTANCE=default-oraclelinux-8-master-py3
# - env: INSTANCE=default-oraclelinux-7-master-py3
# - env: INSTANCE=default-arch-base-latest-master-py3
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
# - env: INSTANCE=default-almalinux-8-master-py3
# - env: INSTANCE=default-rockylinux-8-master-py3
- env: INSTANCE=default-debian-11-3003-3-py3
# - env: INSTANCE=default-debian-10-3003-3-py3
# - env: INSTANCE=default-debian-9-3003-3-py3
- env: INSTANCE=default-ubuntu-2004-3003-3-py3
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
- env: INSTANCE=default-centos-8-3003-3-py3
# - env: INSTANCE=default-centos-7-3003-3-py3
- env: INSTANCE=default-fedora-34-3003-3-py3
- env: INSTANCE=default-fedora-33-3003-3-py3
- env: INSTANCE=default-opensuse-leap-153-3003-3-py3
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
- env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
- env: INSTANCE=default-amazonlinux-2-3003-3-py3
- env: INSTANCE=default-oraclelinux-8-3003-3-py3
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
- env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
- env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
- env: INSTANCE=default-almalinux-8-3003-3-py3
# - env: INSTANCE=default-debian-11-3002-7-py3
- env: INSTANCE=default-debian-10-3002-7-py3
# - env: INSTANCE=default-debian-9-3002-7-py3
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
- env: INSTANCE=default-ubuntu-1804-3002-7-py3
# - env: INSTANCE=default-centos-8-3002-7-py3
- env: INSTANCE=default-centos-7-3002-7-py3
# - env: INSTANCE=default-fedora-34-3002-7-py3
# - env: INSTANCE=default-fedora-33-3002-7-py3
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
# - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
- env: INSTANCE=default-oraclelinux-7-3002-7-py3
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
# - env: INSTANCE=default-debian-10-3001-8-py3
- env: INSTANCE=default-debian-9-3001-8-py3
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
# - env: INSTANCE=default-centos-8-3001-8-py3
# - env: INSTANCE=default-centos-7-3001-8-py3
# - env: INSTANCE=default-fedora-34-3001-8-py3
# - env: INSTANCE=default-fedora-33-3001-8-py3
# - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
# - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
# - env: INSTANCE=default-amazonlinux-2-3001-8-py3
# - env: INSTANCE=default-oraclelinux-8-3001-8-py3
# - env: INSTANCE=default-oraclelinux-7-3001-8-py3
# - env: INSTANCE=default-arch-base-latest-3001-8-py3
# - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3
## Define the release stage that runs `semantic-release`
- stage: 'release'

View File

@ -23,6 +23,7 @@
/test/integration/**/libraries/system.rb @saltstack-formulas/ssf
/test/integration/**/inspec.yml @saltstack-formulas/ssf
/test/integration/**/README.md @saltstack-formulas/ssf
/test/salt/pillar/top.sls @saltstack-formulas/ssf
/.gitignore @saltstack-formulas/ssf
/.cirrus.yml @saltstack-formulas/ssf
/.gitlab-ci.yml @saltstack-formulas/ssf

View File

@ -22,28 +22,46 @@ platforms:
driver:
box: myii/freebsd-13.0-master-py3
synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
verifier:
inputs:
saltmajorversion: 3004
- name: freebsd-122-master-py3
driver:
box: myii/freebsd-12.2-master-py3
verifier:
inputs:
saltmajorversion: 3004
- name: freebsd-130-3003-1-py3
driver:
box: myii/freebsd-13.0-3003.1-py3
synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
verifier:
inputs:
saltmajorversion: 3003
- name: freebsd-122-3003-1-py3
driver:
box: myii/freebsd-12.2-3003.1-py3
verifier:
inputs:
saltmajorversion: 3003
- name: openbsd-69-3002-6-py3
driver:
box: myii/openbsd-6.9-3002.6-py3
ssh:
shell: /bin/ksh
synced_folders: []
verifier:
inputs:
saltmajorversion: 3002
- name: openbsd-68-3001-1-py3
driver:
box: myii/openbsd-6.8-3001.1-py3
ssh:
shell: /bin/ksh
synced_folders: []
verifier:
inputs:
saltmajorversion: 3001
- name: windows-10-latest-py3
driver:
box: techneg/win10x64-pro-salt
@ -65,6 +83,9 @@ platforms:
skip_verify=True makedirs=True
exit 0
# yamllint enable rule:line-length
verifier:
inputs:
saltmajorversion: 3003
- name: windows-81-latest-py3
driver:
box: techneg/win81x64-pro-salt
@ -86,3 +107,6 @@ platforms:
skip_verify=True makedirs=True
exit 0
# yamllint enable rule:line-length
verifier:
inputs:
saltmajorversion: 3003

View File

@ -22,4 +22,10 @@ provisioner:
platforms:
- name: windows-2019-latest-py3
verifier:
inputs:
saltmajorversion: 3003
- name: windows-2016-latest-py3
verifier:
inputs:
saltmajorversion: 3003

View File

@ -17,6 +17,8 @@ provisioner:
salt_copy_filter:
- .kitchen
- .git
pillars_from_directories:
- test/salt/pillar
platforms:
## SALT `tiamat`
@ -24,77 +26,140 @@ platforms:
driver:
image: saltimages/salt-tiamat-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-10-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-10
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-9-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-9
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-2004-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-1804-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: centos-8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:centos-8
verifier:
inputs:
saltmajorversion: 3004
- name: centos-7-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:centos-7
verifier:
inputs:
saltmajorversion: 3004
- name: amazonlinux-2-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-7-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3004
- name: almalinux-8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:almalinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: rockylinux-8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:rockylinux-8
verifier:
inputs:
saltmajorversion: 3004
## SALT `master`
- name: debian-11-master-py3
driver:
image: saltimages/salt-master-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-10-master-py3
driver:
image: saltimages/salt-master-py3:debian-10
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-9-master-py3
driver:
image: saltimages/salt-master-py3:debian-9
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-2004-master-py3
driver:
image: saltimages/salt-master-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-1804-master-py3
driver:
image: saltimages/salt-master-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: centos-8-master-py3
driver:
image: saltimages/salt-master-py3:centos-8
verifier:
inputs:
saltmajorversion: 3004
- name: centos-7-master-py3
driver:
image: saltimages/salt-master-py3:centos-7
verifier:
inputs:
saltmajorversion: 3004
- name: fedora-34-master-py3
driver:
image: saltimages/salt-master-py3:fedora-34
verifier:
inputs:
saltmajorversion: 3004
- name: fedora-33-master-py3
driver:
image: saltimages/salt-master-py3:fedora-33
verifier:
inputs:
saltmajorversion: 3004
- name: opensuse-leap-153-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.3
@ -102,6 +167,9 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3004
- name: opensuse-leap-152-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.2
@ -109,6 +177,9 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3004
- name: opensuse-tmbl-latest-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
@ -116,65 +187,119 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3004
- name: amazonlinux-2-master-py3
driver:
image: saltimages/salt-master-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-8-master-py3
driver:
image: saltimages/salt-master-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-7-master-py3
driver:
image: saltimages/salt-master-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3004
- name: arch-base-latest-master-py3
driver:
image: saltimages/salt-master-py3:arch-base-latest
verifier:
inputs:
saltmajorversion: 3004
- name: gentoo-stage3-latest-master-py3
driver:
image: saltimages/salt-master-py3:gentoo-stage3-latest
run_command: /sbin/init
verifier:
inputs:
saltmajorversion: 3004
- name: gentoo-stage3-systemd-master-py3
driver:
image: saltimages/salt-master-py3:gentoo-stage3-systemd
verifier:
inputs:
saltmajorversion: 3004
- name: almalinux-8-master-py3
driver:
image: saltimages/salt-master-py3:almalinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: rockylinux-8-master-py3
driver:
image: saltimages/salt-master-py3:rockylinux-8
verifier:
inputs:
saltmajorversion: 3004
## SALT `3003.3`
- name: debian-11-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: debian-10-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:debian-10
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: debian-9-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:debian-9
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: ubuntu-2004-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: ubuntu-1804-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: centos-8-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:centos-8
verifier:
inputs:
saltmajorversion: 3003
- name: centos-7-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:centos-7
verifier:
inputs:
saltmajorversion: 3003
- name: fedora-34-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:fedora-34
verifier:
inputs:
saltmajorversion: 3003
- name: fedora-33-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:fedora-33
verifier:
inputs:
saltmajorversion: 3003
- name: opensuse-leap-153-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
@ -182,6 +307,9 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3003
- name: opensuse-leap-152-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
@ -189,6 +317,9 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3003
- name: opensuse-tmbl-latest-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
@ -196,62 +327,113 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3003
- name: amazonlinux-2-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3003
- name: oraclelinux-8-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3003
- name: oraclelinux-7-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3003
- name: arch-base-latest-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:arch-base-latest
verifier:
inputs:
saltmajorversion: 3003
- name: gentoo-stage3-latest-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
run_command: /sbin/init
verifier:
inputs:
saltmajorversion: 3003
- name: gentoo-stage3-systemd-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
verifier:
inputs:
saltmajorversion: 3003
- name: almalinux-8-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:almalinux-8
verifier:
inputs:
saltmajorversion: 3003
## SALT `3002.7`
- name: debian-11-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3002
- name: debian-10-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:debian-10
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3002
- name: debian-9-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:debian-9
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3002
- name: ubuntu-2004-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3002
- name: ubuntu-1804-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3002
- name: centos-8-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:centos-8
verifier:
inputs:
saltmajorversion: 3002
- name: centos-7-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:centos-7
verifier:
inputs:
saltmajorversion: 3002
- name: fedora-34-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:fedora-34
verifier:
inputs:
saltmajorversion: 3002
- name: fedora-33-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:fedora-33
verifier:
inputs:
saltmajorversion: 3002
- name: opensuse-leap-153-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
@ -259,6 +441,9 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3002
- name: opensuse-leap-152-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
@ -266,6 +451,9 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3002
- name: opensuse-tmbl-latest-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest
@ -273,55 +461,100 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3002
- name: amazonlinux-2-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3002
- name: oraclelinux-8-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3002
- name: oraclelinux-7-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3002
- name: arch-base-latest-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:arch-base-latest
verifier:
inputs:
saltmajorversion: 3002
- name: gentoo-stage3-latest-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
run_command: /sbin/init
verifier:
inputs:
saltmajorversion: 3002
- name: gentoo-stage3-systemd-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
verifier:
inputs:
saltmajorversion: 3002
## SALT `3001.8`
- name: debian-10-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:debian-10
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3001
- name: debian-9-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:debian-9
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3001
- name: ubuntu-2004-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3001
- name: ubuntu-1804-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3001
- name: centos-8-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:centos-8
verifier:
inputs:
saltmajorversion: 3001
- name: centos-7-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:centos-7
verifier:
inputs:
saltmajorversion: 3001
- name: fedora-34-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:fedora-34
verifier:
inputs:
saltmajorversion: 3001
- name: fedora-33-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:fedora-33
verifier:
inputs:
saltmajorversion: 3001
- name: opensuse-leap-153-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:opensuse-leap-15.3
@ -329,6 +562,9 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3001
- name: opensuse-leap-152-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
@ -336,6 +572,9 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3001
- name: opensuse-tmbl-latest-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest
@ -343,25 +582,46 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3001
- name: amazonlinux-2-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3001
- name: oraclelinux-8-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3001
- name: oraclelinux-7-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3001
- name: arch-base-latest-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:arch-base-latest
verifier:
inputs:
saltmajorversion: 3001
- name: gentoo-stage3-latest-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:gentoo-stage3-latest
run_command: /sbin/init
verifier:
inputs:
saltmajorversion: 3001
- name: gentoo-stage3-systemd-3001-8-py3
driver:
image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd
verifier:
inputs:
saltmajorversion: 3001
verifier:
# https://www.inspec.io/
@ -372,33 +632,7 @@ verifier:
- cli
suites:
- name: v3003-py3
includes:
- debian-11-3003-3-py3
- debian-10-3003-3-py3
- debian-9-3003-3-py3
- ubuntu-2004-3003-3-py3
- ubuntu-1804-3003-3-py3
- centos-8-3003-3-py3
- centos-7-3003-3-py3
- fedora-34-3003-3-py3
- fedora-33-3003-3-py3
- opensuse-leap-153-3003-3-py3
- opensuse-leap-152-3003-3-py3
- opensuse-tmbl-latest-3003-3-py3
- amazonlinux-2-3003-3-py3
- oraclelinux-8-3003-3-py3
- oraclelinux-7-3003-3-py3
- arch-base-latest-3003-3-py3
- gentoo-stage3-latest-3003-3-py3
- gentoo-stage3-systemd-3003-3-py3
- almalinux-8-3003-3-py3
- freebsd-130-3003-1-py3
- freebsd-122-3003-1-py3
- windows-10-latest-py3
- windows-81-latest-py3
- windows-2019-latest-py3
- windows-2016-latest-py3
- name: default
provisioner:
state_top:
base:
@ -407,82 +641,6 @@ suites:
- salt.pkgrepo
- salt.master
- salt.minion
pillars:
top.sls:
base:
'*':
- salt
- v3003-py3
pillars_from_files:
salt.sls: test/salt/pillar/salt.sls
v3003-py3.sls: test/salt/pillar/v3003-py3.sls
verifier:
inspec_tests:
- path: test/integration/v3003-py3
- name: v3002-py3
includes:
- debian-11-3002-7-py3
- debian-10-3002-7-py3
- debian-9-3002-7-py3
- ubuntu-2004-3002-7-py3
- ubuntu-1804-3002-7-py3
- centos-8-3002-7-py3
- centos-7-3002-7-py3
- amazonlinux-2-3002-7-py3
- oraclelinux-8-3002-7-py3
- oraclelinux-7-3002-7-py3
- gentoo-stage3-latest-3002-7-py3
- gentoo-stage3-systemd-3002-7-py3
- openbsd-69-3002-6-py3
provisioner:
state_top:
base:
'*':
- salt._mapdata
- salt.pkgrepo
- salt.master
- salt.minion
pillars:
top.sls:
base:
'*':
- salt
- v3002-py3
pillars_from_files:
salt.sls: test/salt/pillar/salt.sls
v3002-py3.sls: test/salt/pillar/v3002-py3.sls
verifier:
inspec_tests:
- path: test/integration/v3002-py3
- name: v3001-py3
includes:
- debian-10-3001-8-py3
- debian-9-3001-8-py3
- ubuntu-2004-3001-8-py3
- ubuntu-1804-3001-8-py3
- centos-8-3001-8-py3
- centos-7-3001-8-py3
- amazonlinux-2-3001-8-py3
- oraclelinux-8-3001-8-py3
- oraclelinux-7-3001-8-py3
- openbsd-68-3001-1-py3
provisioner:
state_top:
base:
'*':
- salt._mapdata
- salt.pkgrepo
- salt.master
- salt.minion
pillars:
top.sls:
base:
'*':
- salt
- v3001-py3
pillars_from_files:
salt.sls: test/salt/pillar/salt.sls
v3001-py3.sls: test/salt/pillar/v3001-py3.sls
verifier:
inspec_tests:
- path: test/integration/v3001-py3
- path: test/integration/default

View File

@ -0,0 +1,50 @@
# InSpec Profile: `default`
This shows the implementation of the `default` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
## Verify a profile
InSpec ships with built-in features to verify a profile structure.
```bash
$ inspec check default
Summary
-------
Location: default
Profile: profile
Controls: 4
Timestamp: 2019-06-24T23:09:01+00:00
Valid: true
Errors
------
Warnings
--------
```
## Execute a profile
To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
```bash
$ inspec exec default
..
Finished in 0.0025 seconds (files took 0.12449 seconds to load)
8 examples, 0 failures
```
## Execute a specific control from a profile
To run one control from the profile use `inspec exec /path/to/profile --controls name`.
```bash
$ inspec exec default --controls package
.
Finished in 0.0025 seconds (files took 0.12449 seconds to load)
1 examples, 0 failures
```
See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).

View File

@ -0,0 +1,47 @@
# frozen_string_literal: true
require 'yaml'
control 'salt._mapdata' do
title '`map.jinja` should match the reference file'
### Method
# The steps below for each file appear convoluted but they are both required
# and similar in nature:
# 1. The earliest method was to simply compare the files textually but this often
# led to false positives due to inconsistencies (e.g. spacing, ordering)
# 2. The next method was to load the files back into YAML structures and then
# compare but InSpec provided block diffs this way, unusable by end users
# 3. The final step was to dump the YAML structures back into a string to use
# for the comparison; this both worked and provided human-friendly diffs
### Comparison file for the specific platform
### Static, adjusted as part of code contributions, as map data is changed
# Strip the `platform[:finger]` version number down to the "OS major release"
platform_finger = system.platform[:finger].split('.').first.to_s
# Use that to set the path to the file (relative to the InSpec suite directory)
mapdata_file_path = "_mapdata/#{platform_finger}.yaml"
# Load the mapdata from profile, into a YAML structure
# https://docs.chef.io/inspec/profiles/#profile-files
mapdata_file_yaml = YAML.load(inspec.profile.file(mapdata_file_path))
# Dump the YAML back into a string for comparison
mapdata_file_dump = YAML.dump(mapdata_file_yaml)
### Output file produced by running the `_mapdata` state
### Dynamic, generated during Kitchen's `converge` phase
# Derive the location of the dumped mapdata (differs for Windows)
output_dir = platform[:family] == 'windows' ? '/temp' : '/tmp'
# Use that to set the path to the file (absolute path, i.e. within the container)
output_file_path = "#{output_dir}/salt_mapdata_dump.yaml"
# Load the output into a YAML structure using InSpec's `yaml` resource
# https://github.com/inspec/inspec/blob/49b7d10/lib/inspec/resources/yaml.rb#L29
output_file_yaml = yaml(output_file_path).params
# Dump the YAML back into a string for comparison
output_file_dump = YAML.dump(output_file_yaml)
describe 'File content' do
it 'should match profile map data exactly' do
expect(output_file_dump).to eq(mapdata_file_dump)
end
end
end

View File

@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
name: default
title: salt formula
maintainer: SaltStack Formulas
license: Apache-2.0
summary: Verify that Salt is setup and configured
depends:
- name: share
path: test/integration/share
supports:
- platform-name: debian
- platform-name: ubuntu
- platform-name: centos
- platform-name: fedora
- platform-name: opensuse
- platform-name: suse
- platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon
- platform-name: oracle
- platform-name: arch
- platform-name: gentoo
- platform-name: almalinux
- platform-name: rocky
- platform: windows

13
test/salt/pillar/top.sls Normal file
View File

@ -0,0 +1,13 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
base:
'*':
- 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
...