diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33340daf8912ee4d27d5715677fe4c40758713f7..90c8434f2f443c5a0ed85e7819263384d9b63fa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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'}
vimrc-debian-10-master-py3: {extends: '.test_instance'}
# default-debian-9-master-py3: {extends: '.test_instance'}
@@ -148,6 +150,8 @@ vimrc-centos-7-master-py3: {extends: '.test_instance'}
vimrc-fedora-34-master-py3: {extends: '.test_instance'}
# default-fedora-33-master-py3: {extends: '.test_instance'}
vimrc-fedora-33-master-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+vimrc-opensuse-leap-153-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
vimrc-opensuse-leap-152-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
@@ -164,20 +168,27 @@ vimrc-oraclelinux-7-master-py3: {extends: '.test_instance'}
# vimrc-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# vimrc-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'}
+vimrc-almalinux-8-master-py3: {extends: '.test_instance'}
+# default-rockylinux-8-master-py3: {extends: '.test_instance'}
+vimrc-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'}
@@ -190,8 +201,9 @@ vimrc-oraclelinux-7-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'}
@@ -202,27 +214,29 @@ vimrc-oraclelinux-7-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`
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9bc41097157f7fbb3561ec9c4d7079a202f422a6..41b5f35da16e4ceca5f8e909baed492b6b7a8529 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -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]
diff --git a/.travis.yml b/.travis.yml
index c23cffd20bb0abbb275623c91e77fd7be5584c8e..e7d7e7d3563600e51bd0c97f3cfcbb14bf79a2a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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=vimrc-debian-10-master-py3
# - env: INSTANCE=default-debian-9-master-py3
@@ -108,6 +110,8 @@ jobs:
- env: INSTANCE=vimrc-fedora-34-master-py3
# - env: INSTANCE=default-fedora-33-master-py3
- env: INSTANCE=vimrc-fedora-33-master-py3
+ # - env: INSTANCE=default-opensuse-leap-153-master-py3
+ - env: INSTANCE=vimrc-opensuse-leap-153-master-py3
# - env: INSTANCE=default-opensuse-leap-152-master-py3
- env: INSTANCE=vimrc-opensuse-leap-152-master-py3
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
@@ -124,20 +128,27 @@ jobs:
# - env: INSTANCE=vimrc-gentoo-stage3-latest-master-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
# - env: INSTANCE=vimrc-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=vimrc-almalinux-8-master-py3
+ # - env: INSTANCE=default-rockylinux-8-master-py3
+ - env: INSTANCE=vimrc-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
@@ -150,8 +161,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
@@ -162,27 +174,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'
diff --git a/Gemfile.lock b/Gemfile.lock
index d7cbc3b1779d702f958502de8f02301fc9bb36ee..6ad4ef9d79db9dd3edfeb8deb5d6c6f5a808d8ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
diff --git a/kitchen.yml b/kitchen.yml
index 5247ff2a89f7bb4da410d68410dd653f11bc52e1..de75059c032a3c2d08141ea515de14e217f30349 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -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
diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml
index 596f5021a42fa131bdc7f74d7e6ccb1bc9af2b63..1677bb0aa2b86703ced6e12c4f3f38b0b8ba8ebd 100644
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -22,4 +22,6 @@ supports:
- platform-name: oracle
- platform-name: arch
- platform-name: gentoo
+ - platform-name: almalinux
+ - platform-name: rocky
- platform: windows
diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml
index cf623a1962a059e12106b5dbbaa3cbcd803abe52..ee200809b8db18b1d70579592553d490838c3ff1 100644
--- a/test/integration/share/inspec.yml
+++ b/test/integration/share/inspec.yml
@@ -19,4 +19,6 @@ supports:
- platform-name: oracle
- platform-name: arch
- platform-name: gentoo
+ - platform-name: almalinux
+ - platform-name: rocky
- platform: windows
diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb
index 461dea4b6e4766f567532c93198f233798011afc..87daf086f2e9d199dd8d4ce630baf0d06649744d 100644
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@@ -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]
diff --git a/test/integration/vimrc/inspec.yml b/test/integration/vimrc/inspec.yml
index ae4d8ab8e4064fa6142cd6c9dd78c30483c240c4..a46f46d81cb620d913a8a45a420a8e8967ca2942 100644
--- a/test/integration/vimrc/inspec.yml
+++ b/test/integration/vimrc/inspec.yml
@@ -22,4 +22,6 @@ supports:
- platform-name: oracle
- platform-name: arch
- platform-name: gentoo
+ - platform-name: almalinux
+ - platform-name: rocky
- platform: windows