From 0e628589866e9881407972c263494896bcacae45 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 2 Jul 2021 00:07:43 +0100
Subject: [PATCH] ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip
ci]
* Automated using https://github.com/myii/ssf-formula/pull/335
---
.gitlab-ci.yml | 42 +++--
.pre-commit-config.yaml | 11 ++
.travis.yml | 42 +++--
Gemfile.lock | 2 +-
kitchen.yml | 204 ++++++++++++++-------
test/integration/share/inspec.yml | 2 +
test/integration/share/libraries/system.rb | 2 +-
test/integration/v3000-py2/inspec.yml | 2 +
test/integration/v3000-py3/inspec.yml | 2 +
test/integration/v3001-py3/inspec.yml | 2 +
test/integration/v3002-py3/inspec.yml | 2 +
test/integration/v3003-py3/inspec.yml | 2 +
12 files changed, 215 insertions(+), 100 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f731224bb..e52ccd6ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,20 +123,23 @@ 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-10-3003-0-py3: {extends: '.test_instance'}
-# v3003-py3-debian-9-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
-# v3003-py3-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-centos-8-3003-0-py3: {extends: '.test_instance'}
-# v3003-py3-centos-7-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-fedora-34-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-fedora-33-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
-# v3003-py3-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
-v3003-py3-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
+v3003-py3-debian-10-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-debian-9-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-centos-8-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-centos-7-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-fedora-34-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-fedora-33-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
# v3002-py3-debian-10-3002-6-py3: {extends: '.test_instance'}
v3002-py3-debian-9-3002-6-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
@@ -149,8 +152,9 @@ v3002-py3-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
-# v3002-py3-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
-# v3002-py3-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
+# v3002-py3-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
+# v3002-py3-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
+# v3002-py3-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
v3002-py3-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
v3002-py3-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
v3001-py3-debian-10-3001-7-py3: {extends: '.test_instance'}
@@ -161,21 +165,27 @@ v3001-py3-centos-8-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-centos-7-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-fedora-34-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-fedora-33-3001-7-py3: {extends: '.test_instance'}
+# v3001-py3-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
+# v3001-py3-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
+# v3001-py3-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-9-py3: {extends: '.test_instance'}
v3000-py3-debian-9-3000-9-py3: {extends: '.test_instance'}
v3000-py3-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-centos-8-3000-9-py3: {extends: '.test_instance'}
v3000-py3-centos-7-3000-9-py3: {extends: '.test_instance'}
+# v3000-py3-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
v3000-py3-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
+# v3000-py3-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
+# v3000-py3-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
v3000-py2-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
# v3000-py2-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9bc410971..41b5f35da 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 91f0cd634..368db6b3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,20 +83,23 @@ 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-10-3003-0-py3
- # - env: INSTANCE=v3003-py3-debian-9-3003-0-py3
- - env: INSTANCE=v3003-py3-ubuntu-2004-3003-0-py3
- # - env: INSTANCE=v3003-py3-ubuntu-1804-3003-0-py3
- - env: INSTANCE=v3003-py3-centos-8-3003-0-py3
- # - env: INSTANCE=v3003-py3-centos-7-3003-0-py3
- - env: INSTANCE=v3003-py3-fedora-34-3003-0-py3
- - env: INSTANCE=v3003-py3-fedora-33-3003-0-py3
- - env: INSTANCE=v3003-py3-amazonlinux-2-3003-0-py3
- - env: INSTANCE=v3003-py3-oraclelinux-8-3003-0-py3
- # - env: INSTANCE=v3003-py3-oraclelinux-7-3003-0-py3
- - env: INSTANCE=v3003-py3-arch-base-latest-3003-0-py3
- - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-0-py3
- - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-0-py3
+ - env: INSTANCE=v3003-py3-debian-10-3003-1-py3
+ # - env: INSTANCE=v3003-py3-debian-9-3003-1-py3
+ - env: INSTANCE=v3003-py3-ubuntu-2004-3003-1-py3
+ # - env: INSTANCE=v3003-py3-ubuntu-1804-3003-1-py3
+ - env: INSTANCE=v3003-py3-centos-8-3003-1-py3
+ # - env: INSTANCE=v3003-py3-centos-7-3003-1-py3
+ - env: INSTANCE=v3003-py3-fedora-34-3003-1-py3
+ - env: INSTANCE=v3003-py3-fedora-33-3003-1-py3
+ # - env: INSTANCE=v3003-py3-opensuse-leap-153-3003-1-py3
+ # - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-1-py3
+ # - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-1-py3
+ - env: INSTANCE=v3003-py3-amazonlinux-2-3003-1-py3
+ - env: INSTANCE=v3003-py3-oraclelinux-8-3003-1-py3
+ # - env: INSTANCE=v3003-py3-oraclelinux-7-3003-1-py3
+ - env: INSTANCE=v3003-py3-arch-base-latest-3003-1-py3
+ - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-1-py3
+ - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-1-py3
# - env: INSTANCE=v3002-py3-debian-10-3002-6-py3
- env: INSTANCE=v3002-py3-debian-9-3002-6-py3
- env: INSTANCE=v3002-py3-ubuntu-2004-3002-6-py3
@@ -109,8 +112,9 @@ jobs:
# - env: INSTANCE=v3002-py3-oraclelinux-8-3002-6-py3
- env: INSTANCE=v3002-py3-oraclelinux-7-3002-6-py3
# - env: INSTANCE=v3002-py3-arch-base-latest-3002-6-py3
- # - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-5-py3
- # - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-5-py3
+ # - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-6-py3
+ # - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-6-py3
+ # - env: INSTANCE=v3002-py3-opensuse-leap-153-3002-2-py3
- env: INSTANCE=v3002-py3-opensuse-leap-152-3002-2-py3
- env: INSTANCE=v3002-py3-opensuse-tmbl-latest-3002-2-py3
- env: INSTANCE=v3001-py3-debian-10-3001-7-py3
@@ -121,21 +125,27 @@ jobs:
# - env: INSTANCE=v3001-py3-centos-7-3001-7-py3
# - env: INSTANCE=v3001-py3-fedora-34-3001-7-py3
# - env: INSTANCE=v3001-py3-fedora-33-3001-7-py3
+ # - env: INSTANCE=v3001-py3-opensuse-leap-153-3001-7-py3
# - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-7-py3
# - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-7-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-7-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-7-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-7-py3
# - env: INSTANCE=v3001-py3-arch-base-latest-3001-7-py3
+ # - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-7-py3
+ # - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-7-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-9-py3
- env: INSTANCE=v3000-py3-debian-9-3000-9-py3
- env: INSTANCE=v3000-py3-ubuntu-1804-3000-9-py3
# - env: INSTANCE=v3000-py3-centos-8-3000-9-py3
- env: INSTANCE=v3000-py3-centos-7-3000-9-py3
+ # - env: INSTANCE=v3000-py3-opensuse-leap-153-3000-9-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-9-py3
# - env: INSTANCE=v3000-py3-amazonlinux-2-3000-9-py3
# - env: INSTANCE=v3000-py3-oraclelinux-8-3000-9-py3
- env: INSTANCE=v3000-py3-oraclelinux-7-3000-9-py3
+ # - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-9-py3
+ # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-9-py3
- env: INSTANCE=v3000-py2-ubuntu-1804-3000-9-py2
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-9-py2
diff --git a/Gemfile.lock b/Gemfile.lock
index ef26d96b8..e2f62f3a4 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 c7b7a1ecc..f38e7d2bf 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
@@ -347,20 +409,23 @@ verifier:
suites:
- name: v3003-py3
includes:
- - debian-10-3003-0-py3
- - debian-9-3003-0-py3
- - ubuntu-2004-3003-0-py3
- - ubuntu-1804-3003-0-py3
- - centos-8-3003-0-py3
- - centos-7-3003-0-py3
- - fedora-34-3003-0-py3
- - fedora-33-3003-0-py3
- - amazonlinux-2-3003-0-py3
- - oraclelinux-8-3003-0-py3
- - oraclelinux-7-3003-0-py3
- - arch-base-latest-3003-0-py3
- - gentoo-stage3-latest-3003-0-py3
- - gentoo-stage3-systemd-3003-0-py3
+ - debian-10-3003-1-py3
+ - debian-9-3003-1-py3
+ - ubuntu-2004-3003-1-py3
+ - ubuntu-1804-3003-1-py3
+ - centos-8-3003-1-py3
+ - centos-7-3003-1-py3
+ - fedora-34-3003-1-py3
+ - fedora-33-3003-1-py3
+ - opensuse-leap-153-3003-1-py3
+ - opensuse-leap-152-3003-1-py3
+ - opensuse-tmbl-latest-3003-1-py3
+ - amazonlinux-2-3003-1-py3
+ - oraclelinux-8-3003-1-py3
+ - oraclelinux-7-3003-1-py3
+ - arch-base-latest-3003-1-py3
+ - gentoo-stage3-latest-3003-1-py3
+ - gentoo-stage3-systemd-3003-1-py3
- windows-10-latest-py3
- windows-81-latest-py3
- windows-2019-latest-py3
@@ -399,8 +464,9 @@ suites:
- oraclelinux-8-3002-6-py3
- oraclelinux-7-3002-6-py3
- arch-base-latest-3002-6-py3
- - gentoo-stage3-latest-3002-5-py3
- - gentoo-stage3-systemd-3002-5-py3
+ - gentoo-stage3-latest-3002-6-py3
+ - gentoo-stage3-systemd-3002-6-py3
+ - opensuse-leap-153-3002-2-py3
- opensuse-leap-152-3002-2-py3
- opensuse-tmbl-latest-3002-2-py3
- freebsd-130-3002-6-py3
@@ -437,12 +503,15 @@ suites:
- centos-7-3001-7-py3
- fedora-34-3001-7-py3
- fedora-33-3001-7-py3
+ - opensuse-leap-153-3001-7-py3
- opensuse-leap-152-3001-7-py3
- opensuse-tmbl-latest-3001-7-py3
- amazonlinux-2-3001-7-py3
- oraclelinux-8-3001-7-py3
- oraclelinux-7-3001-7-py3
- arch-base-latest-3001-7-py3
+ - gentoo-stage3-latest-3001-7-py3
+ - gentoo-stage3-systemd-3001-7-py3
- openbsd-68-3001-1-py3
provisioner:
state_top:
@@ -471,10 +540,13 @@ suites:
- ubuntu-1804-3000-9-py3
- centos-8-3000-9-py3
- centos-7-3000-9-py3
+ - opensuse-leap-153-3000-9-py3
- opensuse-leap-152-3000-9-py3
- amazonlinux-2-3000-9-py3
- oraclelinux-8-3000-9-py3
- oraclelinux-7-3000-9-py3
+ - gentoo-stage3-latest-3000-9-py3
+ - gentoo-stage3-systemd-3000-9-py3
provisioner:
state_top:
base:
diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml
index cf623a196..ee200809b 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 461dea4b6..87daf086f 100644
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@@ -36,7 +36,7 @@ def build_platform_family
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/v3000-py2/inspec.yml b/test/integration/v3000-py2/inspec.yml
index d8cf32870..8603ca6df 100644
--- a/test/integration/v3000-py2/inspec.yml
+++ b/test/integration/v3000-py2/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/v3000-py3/inspec.yml b/test/integration/v3000-py3/inspec.yml
index dca4eeeea..724ae734d 100644
--- a/test/integration/v3000-py3/inspec.yml
+++ b/test/integration/v3000-py3/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/v3001-py3/inspec.yml b/test/integration/v3001-py3/inspec.yml
index f63b0844f..d189f245b 100644
--- a/test/integration/v3001-py3/inspec.yml
+++ b/test/integration/v3001-py3/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/v3002-py3/inspec.yml b/test/integration/v3002-py3/inspec.yml
index 16524ecb2..3a1a25c51 100644
--- a/test/integration/v3002-py3/inspec.yml
+++ b/test/integration/v3002-py3/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/v3003-py3/inspec.yml b/test/integration/v3003-py3/inspec.yml
index e048343e9..477ea5d26 100644
--- a/test/integration/v3003-py3/inspec.yml
+++ b/test/integration/v3003-py3/inspec.yml
@@ -22,4 +22,6 @@ supports:
- platform-name: oracle
- platform-name: arch
- platform-name: gentoo
+ - platform-name: almalinux
+ - platform-name: rocky
- platform: windows