* Automated using https://github.com/myii/ssf-formula/pull/335pull/53/head
@@ -132,6 +132,8 @@ rubocop: | |||
# 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-10-master-py3: {extends: '.test_instance'} | |||
default-debian-9-master-py3: {extends: '.test_instance'} | |||
# default-ubuntu-2004-master-py3: {extends: '.test_instance'} | |||
@@ -140,6 +142,7 @@ 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'} | |||
@@ -148,20 +151,25 @@ 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-debian-10-3003-0-py3: {extends: '.test_instance'} | |||
# default-debian-9-3003-0-py3: {extends: '.test_instance'} | |||
# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} | |||
# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} | |||
# default-centos-8-3003-0-py3: {extends: '.test_instance'} | |||
# default-centos-7-3003-0-py3: {extends: '.test_instance'} | |||
# default-fedora-34-3003-0-py3: {extends: '.test_instance'} | |||
# default-fedora-33-3003-0-py3: {extends: '.test_instance'} | |||
# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} | |||
# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'} | |||
default-almalinux-8-master-py3: {extends: '.test_instance'} | |||
default-rockylinux-8-master-py3: {extends: '.test_instance'} | |||
# default-debian-10-3003-1-py3: {extends: '.test_instance'} | |||
# default-debian-9-3003-1-py3: {extends: '.test_instance'} | |||
# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} | |||
# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} | |||
# default-centos-8-3003-1-py3: {extends: '.test_instance'} | |||
# default-centos-7-3003-1-py3: {extends: '.test_instance'} | |||
# default-fedora-34-3003-1-py3: {extends: '.test_instance'} | |||
# default-fedora-33-3003-1-py3: {extends: '.test_instance'} | |||
# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'} | |||
# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'} | |||
# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'} | |||
# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} | |||
# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} | |||
# default-debian-10-3002-6-py3: {extends: '.test_instance'} | |||
# default-debian-9-3002-6-py3: {extends: '.test_instance'} | |||
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} | |||
@@ -174,8 +182,9 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} | |||
# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'} | |||
# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'} | |||
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} | |||
# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} | |||
# default-debian-10-3001-7-py3: {extends: '.test_instance'} | |||
@@ -186,27 +195,29 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'} | |||
# default-centos-7-3001-7-py3: {extends: '.test_instance'} | |||
# default-fedora-34-3001-7-py3: {extends: '.test_instance'} | |||
# default-fedora-33-3001-7-py3: {extends: '.test_instance'} | |||
# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'} | |||
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} | |||
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} | |||
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} | |||
# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'} | |||
# default-debian-10-3000-9-py3: {extends: '.test_instance'} | |||
# default-debian-9-3000-9-py3: {extends: '.test_instance'} | |||
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} | |||
# default-centos-8-3000-9-py3: {extends: '.test_instance'} | |||
# default-centos-7-3000-9-py3: {extends: '.test_instance'} | |||
# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'} | |||
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} | |||
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} | |||
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'} | |||
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} | |||
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} | |||
# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} | |||
# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} | |||
############################################################################### | |||
# `release` stage: `semantic-release` |
@@ -52,3 +52,14 @@ repos: | |||
- id: rstcheck | |||
name: Check reST files using rstcheck | |||
exclude: 'docs/CHANGELOG.rst' | |||
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint | |||
rev: v1.3.2 | |||
hooks: | |||
- id: rst-lint | |||
name: Check reST files using rst-lint | |||
exclude: | | |||
(?x)^( | |||
docs/CHANGELOG.rst| | |||
docs/TOFS_pattern.rst| | |||
)$ | |||
additional_dependencies: [pygments==2.9.0] |
@@ -92,6 +92,8 @@ jobs: | |||
# - 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-10-master-py3 | |||
- env: INSTANCE=default-debian-9-master-py3 | |||
# - env: INSTANCE=default-ubuntu-2004-master-py3 | |||
@@ -100,6 +102,7 @@ jobs: | |||
- 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 | |||
@@ -108,20 +111,25 @@ jobs: | |||
- 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-debian-10-3003-0-py3 | |||
# - env: INSTANCE=default-debian-9-3003-0-py3 | |||
# - env: INSTANCE=default-ubuntu-2004-3003-0-py3 | |||
# - env: INSTANCE=default-ubuntu-1804-3003-0-py3 | |||
# - env: INSTANCE=default-centos-8-3003-0-py3 | |||
# - env: INSTANCE=default-centos-7-3003-0-py3 | |||
# - env: INSTANCE=default-fedora-34-3003-0-py3 | |||
# - env: INSTANCE=default-fedora-33-3003-0-py3 | |||
# - env: INSTANCE=default-amazonlinux-2-3003-0-py3 | |||
# - env: INSTANCE=default-oraclelinux-8-3003-0-py3 | |||
# - env: INSTANCE=default-oraclelinux-7-3003-0-py3 | |||
# - env: INSTANCE=default-arch-base-latest-3003-0-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-py3 | |||
- env: INSTANCE=default-almalinux-8-master-py3 | |||
- env: INSTANCE=default-rockylinux-8-master-py3 | |||
# - env: INSTANCE=default-debian-10-3003-1-py3 | |||
# - env: INSTANCE=default-debian-9-3003-1-py3 | |||
# - env: INSTANCE=default-ubuntu-2004-3003-1-py3 | |||
# - env: INSTANCE=default-ubuntu-1804-3003-1-py3 | |||
# - env: INSTANCE=default-centos-8-3003-1-py3 | |||
# - env: INSTANCE=default-centos-7-3003-1-py3 | |||
# - env: INSTANCE=default-fedora-34-3003-1-py3 | |||
# - env: INSTANCE=default-fedora-33-3003-1-py3 | |||
# - env: INSTANCE=default-opensuse-leap-153-3003-1-py3 | |||
# - env: INSTANCE=default-opensuse-leap-152-3003-1-py3 | |||
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3 | |||
# - env: INSTANCE=default-amazonlinux-2-3003-1-py3 | |||
# - env: INSTANCE=default-oraclelinux-8-3003-1-py3 | |||
# - env: INSTANCE=default-oraclelinux-7-3003-1-py3 | |||
# - env: INSTANCE=default-arch-base-latest-3003-1-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 | |||
# - env: INSTANCE=default-debian-10-3002-6-py3 | |||
# - env: INSTANCE=default-debian-9-3002-6-py3 | |||
# - env: INSTANCE=default-ubuntu-2004-3002-6-py3 | |||
@@ -134,8 +142,9 @@ jobs: | |||
# - env: INSTANCE=default-oraclelinux-8-3002-6-py3 | |||
# - env: INSTANCE=default-oraclelinux-7-3002-6-py3 | |||
# - env: INSTANCE=default-arch-base-latest-3002-6-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3 | |||
# - env: INSTANCE=default-opensuse-leap-153-3002-2-py3 | |||
# - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 | |||
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 | |||
# - env: INSTANCE=default-debian-10-3001-7-py3 | |||
@@ -146,27 +155,29 @@ jobs: | |||
# - env: INSTANCE=default-centos-7-3001-7-py3 | |||
# - env: INSTANCE=default-fedora-34-3001-7-py3 | |||
# - env: INSTANCE=default-fedora-33-3001-7-py3 | |||
# - env: INSTANCE=default-opensuse-leap-153-3001-7-py3 | |||
# - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 | |||
# - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 | |||
# - env: INSTANCE=default-amazonlinux-2-3001-7-py3 | |||
# - env: INSTANCE=default-oraclelinux-8-3001-7-py3 | |||
# - env: INSTANCE=default-oraclelinux-7-3001-7-py3 | |||
# - env: INSTANCE=default-arch-base-latest-3001-7-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3 | |||
# - env: INSTANCE=default-debian-10-3000-9-py3 | |||
# - env: INSTANCE=default-debian-9-3000-9-py3 | |||
# - env: INSTANCE=default-ubuntu-1804-3000-9-py3 | |||
# - env: INSTANCE=default-centos-8-3000-9-py3 | |||
# - env: INSTANCE=default-centos-7-3000-9-py3 | |||
# - env: INSTANCE=default-opensuse-leap-153-3000-9-py3 | |||
# - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 | |||
# - env: INSTANCE=default-amazonlinux-2-3000-9-py3 | |||
# - env: INSTANCE=default-oraclelinux-8-3000-9-py3 | |||
# - env: INSTANCE=default-oraclelinux-7-3000-9-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3 | |||
# - env: INSTANCE=default-ubuntu-1804-3000-9-py2 | |||
# - env: INSTANCE=default-arch-base-latest-3000-9-py2 | |||
# - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 | |||
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 | |||
## Define the release stage that runs `semantic-release` | |||
- stage: 'release' |
@@ -1,6 +1,6 @@ | |||
GIT | |||
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker | |||
revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 | |||
revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 | |||
branch: ssf | |||
specs: | |||
kitchen-docker (2.10.0) |
@@ -37,6 +37,12 @@ platforms: | |||
- name: oraclelinux-7-tiamat-py3 | |||
driver: | |||
image: saltimages/salt-tiamat-py3:oraclelinux-7 | |||
- name: almalinux-8-tiamat-py3 | |||
driver: | |||
image: saltimages/salt-tiamat-py3:almalinux-8 | |||
- name: rockylinux-8-tiamat-py3 | |||
driver: | |||
image: saltimages/salt-tiamat-py3:rockylinux-8 | |||
## SALT `master` | |||
- name: debian-10-master-py3 | |||
@@ -63,6 +69,14 @@ platforms: | |||
- name: fedora-33-master-py3 | |||
driver: | |||
image: saltimages/salt-master-py3:fedora-33 | |||
- name: opensuse-leap-153-master-py3 | |||
driver: | |||
image: saltimages/salt-master-py3:opensuse-leap-15.3 | |||
run_command: /usr/lib/systemd/systemd | |||
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`: | |||
# => SCP did not finish successfully (255): (Net::SCP::Error) | |||
transport: | |||
max_ssh_sessions: 1 | |||
- name: opensuse-leap-152-master-py3 | |||
driver: | |||
image: saltimages/salt-master-py3:opensuse-leap-15.2 | |||
@@ -99,52 +113,82 @@ platforms: | |||
- name: gentoo-stage3-systemd-master-py3 | |||
driver: | |||
image: saltimages/salt-master-py3:gentoo-stage3-systemd | |||
- name: almalinux-8-master-py3 | |||
driver: | |||
image: saltimages/salt-master-py3:almalinux-8 | |||
- name: rockylinux-8-master-py3 | |||
driver: | |||
image: saltimages/salt-master-py3:rockylinux-8 | |||
## SALT `3003.0` | |||
- name: debian-10-3003-0-py3 | |||
## SALT `3003.1` | |||
- name: debian-10-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.1-py3:debian-10 | |||
- name: debian-9-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:debian-10 | |||
- name: debian-9-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:debian-9 | |||
- name: ubuntu-2004-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:debian-9 | |||
- name: ubuntu-2004-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:ubuntu-20.04 | |||
- name: ubuntu-1804-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:ubuntu-20.04 | |||
- name: ubuntu-1804-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:ubuntu-18.04 | |||
- name: centos-8-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:ubuntu-18.04 | |||
- name: centos-8-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:centos-8 | |||
- name: centos-7-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:centos-8 | |||
- name: centos-7-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:centos-7 | |||
- name: fedora-34-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:centos-7 | |||
- name: fedora-34-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:fedora-34 | |||
- name: fedora-33-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:fedora-34 | |||
- name: fedora-33-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:fedora-33 | |||
- name: opensuse-leap-153-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:fedora-33 | |||
- name: amazonlinux-2-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 | |||
run_command: /usr/lib/systemd/systemd | |||
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`: | |||
# => SCP did not finish successfully (255): (Net::SCP::Error) | |||
transport: | |||
max_ssh_sessions: 1 | |||
- name: opensuse-leap-152-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 | |||
run_command: /usr/lib/systemd/systemd | |||
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`: | |||
# => SCP did not finish successfully (255): (Net::SCP::Error) | |||
transport: | |||
max_ssh_sessions: 1 | |||
- name: opensuse-tmbl-latest-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest | |||
run_command: /usr/lib/systemd/systemd | |||
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`: | |||
# => SCP did not finish successfully (255): (Net::SCP::Error) | |||
transport: | |||
max_ssh_sessions: 1 | |||
- name: amazonlinux-2-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:amazonlinux-2 | |||
- name: oraclelinux-8-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:amazonlinux-2 | |||
- name: oraclelinux-8-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:oraclelinux-8 | |||
- name: oraclelinux-7-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:oraclelinux-8 | |||
- name: oraclelinux-7-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:oraclelinux-7 | |||
- name: arch-base-latest-3003-0-py3 | |||
image: saltimages/salt-3003.1-py3:oraclelinux-7 | |||
- name: arch-base-latest-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:arch-base-latest | |||
image: saltimages/salt-3003.1-py3:arch-base-latest | |||
run_command: /usr/lib/systemd/systemd | |||
- name: gentoo-stage3-latest-3003-0-py3 | |||
- name: gentoo-stage3-latest-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:gentoo-stage3-latest | |||
image: saltimages/salt-3003.1-py3:gentoo-stage3-latest | |||
run_command: /sbin/init | |||
- name: gentoo-stage3-systemd-3003-0-py3 | |||
- name: gentoo-stage3-systemd-3003-1-py3 | |||
driver: | |||
image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd | |||
image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd | |||
## SALT `3002.6` | |||
- name: debian-10-3002-6-py3 | |||
@@ -184,17 +228,23 @@ platforms: | |||
driver: | |||
image: saltimages/salt-3002.6-py3:arch-base-latest | |||
run_command: /usr/lib/systemd/systemd | |||
## SALT `3002.5` | |||
- name: gentoo-stage3-latest-3002-5-py3 | |||
- name: gentoo-stage3-latest-3002-6-py3 | |||
driver: | |||
image: saltimages/salt-3002.5-py3:gentoo-stage3-latest | |||
image: saltimages/salt-3002.6-py3:gentoo-stage3-latest | |||
run_command: /sbin/init | |||
- name: gentoo-stage3-systemd-3002-5-py3 | |||
- name: gentoo-stage3-systemd-3002-6-py3 | |||
driver: | |||
image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd | |||
image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd | |||
## SALT `3002.2` | |||
- name: opensuse-leap-153-3002-2-py3 | |||
driver: | |||
image: saltimages/salt-3002.2-py3:opensuse-leap-15.3 | |||
run_command: /usr/lib/systemd/systemd | |||
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`: | |||
# => SCP did not finish successfully (255): (Net::SCP::Error) | |||
transport: | |||
max_ssh_sessions: 1 | |||
- name: opensuse-leap-152-3002-2-py3 | |||
driver: | |||
image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 | |||
@@ -237,6 +287,14 @@ platforms: | |||
- name: fedora-33-3001-7-py3 | |||
driver: | |||
image: saltimages/salt-3001.7-py3:fedora-33 | |||
- name: opensuse-leap-153-3001-7-py3 | |||
driver: | |||
image: saltimages/salt-3001.7-py3:opensuse-leap-15.3 | |||
run_command: /usr/lib/systemd/systemd | |||
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`: | |||
# => SCP did not finish successfully (255): (Net::SCP::Error) | |||
transport: | |||
max_ssh_sessions: 1 | |||
- name: opensuse-leap-152-3001-7-py3 | |||
driver: | |||
image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 | |||
@@ -266,15 +324,13 @@ platforms: | |||
driver: | |||
image: saltimages/salt-3001.7-py3:arch-base-latest | |||
run_command: /usr/lib/systemd/systemd | |||
## SALT `3001.6` | |||
- name: gentoo-stage3-latest-3001-6-py3 | |||
- name: gentoo-stage3-latest-3001-7-py3 | |||
driver: | |||
image: saltimages/salt-3001.6-py3:gentoo-stage3-latest | |||
image: saltimages/salt-3001.7-py3:gentoo-stage3-latest | |||
run_command: /sbin/init | |||
- name: gentoo-stage3-systemd-3001-6-py3 | |||
- name: gentoo-stage3-systemd-3001-7-py3 | |||
driver: | |||
image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd | |||
image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd | |||
## SALT `3000.9` | |||
- name: debian-10-3000-9-py3 | |||
@@ -292,6 +348,14 @@ platforms: | |||
- name: centos-7-3000-9-py3 | |||
driver: | |||
image: saltimages/salt-3000.9-py3:centos-7 | |||
- name: opensuse-leap-153-3000-9-py3 | |||
driver: | |||
image: saltimages/salt-3000.9-py3:opensuse-leap-15.3 | |||
run_command: /usr/lib/systemd/systemd | |||
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`: | |||
# => SCP did not finish successfully (255): (Net::SCP::Error) | |||
transport: | |||
max_ssh_sessions: 1 | |||
- name: opensuse-leap-152-3000-9-py3 | |||
driver: | |||
image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 | |||
@@ -309,6 +373,13 @@ platforms: | |||
- name: oraclelinux-7-3000-9-py3 | |||
driver: | |||
image: saltimages/salt-3000.9-py3:oraclelinux-7 | |||
- name: gentoo-stage3-latest-3000-9-py3 | |||
driver: | |||
image: saltimages/salt-3000.9-py3:gentoo-stage3-latest | |||
run_command: /sbin/init | |||
- name: gentoo-stage3-systemd-3000-9-py3 | |||
driver: | |||
image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd | |||
- name: ubuntu-1804-3000-9-py2 | |||
driver: | |||
image: saltimages/salt-3000.9-py2:ubuntu-18.04 | |||
@@ -317,15 +388,6 @@ platforms: | |||
image: saltimages/salt-3000.9-py2:arch-base-latest | |||
run_command: /usr/lib/systemd/systemd | |||
## SALT `3000.8` | |||
- name: gentoo-stage3-latest-3000-8-py3 | |||
driver: | |||
image: saltimages/salt-3000.8-py3:gentoo-stage3-latest | |||
run_command: /sbin/init | |||
- name: gentoo-stage3-systemd-3000-8-py3 | |||
driver: | |||
image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd | |||
provisioner: | |||
name: salt_solo | |||
log_level: debug |
@@ -22,4 +22,6 @@ supports: | |||
- platform-name: oracle | |||
- platform-name: arch | |||
- platform-name: gentoo | |||
- platform-name: almalinux | |||
- platform-name: rocky | |||
- platform: windows |
@@ -19,4 +19,6 @@ supports: | |||
- platform-name: oracle | |||
- platform-name: arch | |||
- platform-name: gentoo | |||
- platform-name: almalinux | |||
- platform-name: rocky | |||
- platform: windows |
@@ -36,7 +36,7 @@ class SystemResource < Inspec.resource(1) | |||
def build_platform_name | |||
case inspec.platform[:name] | |||
when 'amazon', 'oracle' | |||
when 'amazon', 'oracle', 'rocky' | |||
"#{inspec.platform[:name]}linux" | |||
when /^windows_/ | |||
inspec.platform[:family] |