From ded03de05e777a4c3b0a1aad8de650470c244d6a Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 5 Oct 2021 11:16:02 +0100
Subject: [PATCH] ci(kitchen+ci): update with latest CVE pre-salted images
[skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/374
---
.github/workflows/kitchen.vagrant.yml | 2 -
.gitignore | 1 +
.gitlab-ci.yml | 101 +++----
.travis.yml | 101 +++----
kitchen.vagrant.yml | 6 -
kitchen.yml | 410 ++++++++++----------------
6 files changed, 254 insertions(+), 367 deletions(-)
diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index b9d4ca8..9c16270 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -16,10 +16,8 @@ jobs:
instance:
- freebsd-freebsd-130-master-py3
- freebsd-freebsd-122-master-py3
- - freebsd-freebsd-114-master-py3
# - freebsd-freebsd-130-3003-1-py3
# - freebsd-freebsd-122-3003-1-py3
- # - freebsd-freebsd-114-3003-1-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
diff --git a/.gitignore b/.gitignore
index 94f77a8..39752a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,6 +127,7 @@ tmp/
# `salt-formula` -- Vagrant Specific files
.vagrant
top.sls
+!test/salt/pillar/top.sls
# `suricata-formula` -- Platform binaries
*.rpm
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d0e313..b932451 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,62 +152,51 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
redhat-almalinux-8-master-py3: {extends: '.test_instance'}
redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
-# debian-debian-11-3003-2-py3: {extends: '.test_instance'}
-# debian-debian-10-3003-2-py3: {extends: '.test_instance'}
-# debian-debian-9-3003-2-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
-# redhat-centos-8-3003-2-py3: {extends: '.test_instance'}
-# redhat-centos-7-3003-2-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3003-2-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3003-2-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
-# redhat-almalinux-8-3003-2-py3: {extends: '.test_instance'}
-# debian-debian-11-3002-6-py3: {extends: '.test_instance'}
-# debian-debian-10-3002-6-py3: {extends: '.test_instance'}
-# debian-debian-9-3002-6-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
-# redhat-centos-8-3002-6-py3: {extends: '.test_instance'}
-# redhat-centos-7-3002-6-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3002-6-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3002-6-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
-# debian-debian-10-3001-7-py3: {extends: '.test_instance'}
-# debian-debian-9-3001-7-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
-# redhat-centos-8-3001-7-py3: {extends: '.test_instance'}
-# redhat-centos-7-3001-7-py3: {extends: '.test_instance'}
-# redhat-fedora-34-3001-7-py3: {extends: '.test_instance'}
-# redhat-fedora-33-3001-7-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
-# debian-debian-10-3000-9-py3: {extends: '.test_instance'}
-# debian-debian-9-3000-9-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-# redhat-centos-8-3000-9-py3: {extends: '.test_instance'}
-# redhat-centos-7-3000-9-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
+# debian-debian-11-3003-3-py3: {extends: '.test_instance'}
+# debian-debian-10-3003-3-py3: {extends: '.test_instance'}
+# debian-debian-9-3003-3-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# redhat-centos-8-3003-3-py3: {extends: '.test_instance'}
+# redhat-centos-7-3003-3-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3003-3-py3: {extends: '.test_instance'}
+# redhat-fedora-33-3003-3-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
+# redhat-almalinux-8-3003-3-py3: {extends: '.test_instance'}
+# debian-debian-11-3002-7-py3: {extends: '.test_instance'}
+# debian-debian-10-3002-7-py3: {extends: '.test_instance'}
+# debian-debian-9-3002-7-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# redhat-centos-8-3002-7-py3: {extends: '.test_instance'}
+# redhat-centos-7-3002-7-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3002-7-py3: {extends: '.test_instance'}
+# redhat-fedora-33-3002-7-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
+# debian-debian-10-3001-8-py3: {extends: '.test_instance'}
+# debian-debian-9-3001-8-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
+# redhat-centos-8-3001-8-py3: {extends: '.test_instance'}
+# redhat-centos-7-3001-8-py3: {extends: '.test_instance'}
+# redhat-fedora-34-3001-8-py3: {extends: '.test_instance'}
+# redhat-fedora-33-3001-8-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
+# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
+# redhat-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
###############################################################################
# `release` stage: `semantic-release`
diff --git a/.travis.yml b/.travis.yml
index 4205a67..dfc2260 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,62 +112,51 @@ jobs:
- env: INSTANCE=redhat-oraclelinux-7-master-py3
- env: INSTANCE=redhat-almalinux-8-master-py3
- env: INSTANCE=redhat-rockylinux-8-master-py3
- # - env: INSTANCE=debian-debian-11-3003-2-py3
- # - env: INSTANCE=debian-debian-10-3003-2-py3
- # - env: INSTANCE=debian-debian-9-3003-2-py3
- # - env: INSTANCE=ubuntu-ubuntu-2004-3003-2-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3003-2-py3
- # - env: INSTANCE=redhat-centos-8-3003-2-py3
- # - env: INSTANCE=redhat-centos-7-3003-2-py3
- # - env: INSTANCE=redhat-fedora-34-3003-2-py3
- # - env: INSTANCE=redhat-fedora-33-3003-2-py3
- # - env: INSTANCE=suse-opensuse-leap-153-3003-2-py3
- # - env: INSTANCE=suse-opensuse-leap-152-3003-2-py3
- # - env: INSTANCE=suse-opensuse-tmbl-latest-3003-2-py3
- # - env: INSTANCE=redhat-amazonlinux-2-3003-2-py3
- # - env: INSTANCE=redhat-oraclelinux-8-3003-2-py3
- # - env: INSTANCE=redhat-oraclelinux-7-3003-2-py3
- # - env: INSTANCE=redhat-almalinux-8-3003-2-py3
- # - env: INSTANCE=debian-debian-11-3002-6-py3
- # - env: INSTANCE=debian-debian-10-3002-6-py3
- # - env: INSTANCE=debian-debian-9-3002-6-py3
- # - env: INSTANCE=ubuntu-ubuntu-2004-3002-6-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3002-6-py3
- # - env: INSTANCE=redhat-centos-8-3002-6-py3
- # - env: INSTANCE=redhat-centos-7-3002-6-py3
- # - env: INSTANCE=redhat-fedora-34-3002-6-py3
- # - env: INSTANCE=redhat-fedora-33-3002-6-py3
- # - env: INSTANCE=redhat-amazonlinux-2-3002-6-py3
- # - env: INSTANCE=redhat-oraclelinux-8-3002-6-py3
- # - env: INSTANCE=redhat-oraclelinux-7-3002-6-py3
- # - env: INSTANCE=suse-opensuse-leap-153-3002-2-py3
- # - env: INSTANCE=suse-opensuse-leap-152-3002-2-py3
- # - env: INSTANCE=suse-opensuse-tmbl-latest-3002-2-py3
- # - env: INSTANCE=debian-debian-10-3001-7-py3
- # - env: INSTANCE=debian-debian-9-3001-7-py3
- # - env: INSTANCE=ubuntu-ubuntu-2004-3001-7-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3001-7-py3
- # - env: INSTANCE=redhat-centos-8-3001-7-py3
- # - env: INSTANCE=redhat-centos-7-3001-7-py3
- # - env: INSTANCE=redhat-fedora-34-3001-7-py3
- # - env: INSTANCE=redhat-fedora-33-3001-7-py3
- # - env: INSTANCE=suse-opensuse-leap-153-3001-7-py3
- # - env: INSTANCE=suse-opensuse-leap-152-3001-7-py3
- # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-7-py3
- # - env: INSTANCE=redhat-amazonlinux-2-3001-7-py3
- # - env: INSTANCE=redhat-oraclelinux-8-3001-7-py3
- # - env: INSTANCE=redhat-oraclelinux-7-3001-7-py3
- # - env: INSTANCE=debian-debian-10-3000-9-py3
- # - env: INSTANCE=debian-debian-9-3000-9-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py3
- # - env: INSTANCE=redhat-centos-8-3000-9-py3
- # - env: INSTANCE=redhat-centos-7-3000-9-py3
- # - env: INSTANCE=suse-opensuse-leap-153-3000-9-py3
- # - env: INSTANCE=suse-opensuse-leap-152-3000-9-py3
- # - env: INSTANCE=redhat-amazonlinux-2-3000-9-py3
- # - env: INSTANCE=redhat-oraclelinux-8-3000-9-py3
- # - env: INSTANCE=redhat-oraclelinux-7-3000-9-py3
- # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py2
+ # - env: INSTANCE=debian-debian-11-3003-3-py3
+ # - env: INSTANCE=debian-debian-10-3003-3-py3
+ # - env: INSTANCE=debian-debian-9-3003-3-py3
+ # - env: INSTANCE=ubuntu-ubuntu-2004-3003-3-py3
+ # - env: INSTANCE=ubuntu-ubuntu-1804-3003-3-py3
+ # - env: INSTANCE=redhat-centos-8-3003-3-py3
+ # - env: INSTANCE=redhat-centos-7-3003-3-py3
+ # - env: INSTANCE=redhat-fedora-34-3003-3-py3
+ # - env: INSTANCE=redhat-fedora-33-3003-3-py3
+ # - env: INSTANCE=suse-opensuse-leap-153-3003-3-py3
+ # - env: INSTANCE=suse-opensuse-leap-152-3003-3-py3
+ # - env: INSTANCE=suse-opensuse-tmbl-latest-3003-3-py3
+ # - env: INSTANCE=redhat-amazonlinux-2-3003-3-py3
+ # - env: INSTANCE=redhat-oraclelinux-8-3003-3-py3
+ # - env: INSTANCE=redhat-oraclelinux-7-3003-3-py3
+ # - env: INSTANCE=redhat-almalinux-8-3003-3-py3
+ # - env: INSTANCE=debian-debian-11-3002-7-py3
+ # - env: INSTANCE=debian-debian-10-3002-7-py3
+ # - env: INSTANCE=debian-debian-9-3002-7-py3
+ # - env: INSTANCE=ubuntu-ubuntu-2004-3002-7-py3
+ # - env: INSTANCE=ubuntu-ubuntu-1804-3002-7-py3
+ # - env: INSTANCE=redhat-centos-8-3002-7-py3
+ # - env: INSTANCE=redhat-centos-7-3002-7-py3
+ # - env: INSTANCE=redhat-fedora-34-3002-7-py3
+ # - env: INSTANCE=redhat-fedora-33-3002-7-py3
+ # - env: INSTANCE=suse-opensuse-leap-153-3002-7-py3
+ # - env: INSTANCE=suse-opensuse-leap-152-3002-7-py3
+ # - env: INSTANCE=suse-opensuse-tmbl-latest-3002-7-py3
+ # - env: INSTANCE=redhat-amazonlinux-2-3002-7-py3
+ # - env: INSTANCE=redhat-oraclelinux-8-3002-7-py3
+ # - env: INSTANCE=redhat-oraclelinux-7-3002-7-py3
+ # - env: INSTANCE=debian-debian-10-3001-8-py3
+ # - env: INSTANCE=debian-debian-9-3001-8-py3
+ # - env: INSTANCE=ubuntu-ubuntu-2004-3001-8-py3
+ # - env: INSTANCE=ubuntu-ubuntu-1804-3001-8-py3
+ # - env: INSTANCE=redhat-centos-8-3001-8-py3
+ # - env: INSTANCE=redhat-centos-7-3001-8-py3
+ # - env: INSTANCE=redhat-fedora-34-3001-8-py3
+ # - env: INSTANCE=redhat-fedora-33-3001-8-py3
+ # - env: INSTANCE=suse-opensuse-leap-153-3001-8-py3
+ # - env: INSTANCE=suse-opensuse-leap-152-3001-8-py3
+ # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-8-py3
+ # - env: INSTANCE=redhat-amazonlinux-2-3001-8-py3
+ # - env: INSTANCE=redhat-oraclelinux-8-3001-8-py3
+ # - env: INSTANCE=redhat-oraclelinux-7-3001-8-py3
## Define the release stage that runs `semantic-release`
- stage: 'release'
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index 2197d92..eff870a 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -25,9 +25,6 @@ platforms:
- name: freebsd-122-master-py3
driver:
box: myii/freebsd-12.2-master-py3
- - name: freebsd-114-master-py3
- driver:
- box: myii/freebsd-11.4-master-py3
- name: freebsd-130-3003-1-py3
driver:
box: myii/freebsd-13.0-3003.1-py3
@@ -35,6 +32,3 @@ platforms:
- name: freebsd-122-3003-1-py3
driver:
box: myii/freebsd-12.2-3003.1-py3
- - name: freebsd-114-3003-1-py3
- driver:
- box: myii/freebsd-11.4-3003.1-py3
diff --git a/kitchen.yml b/kitchen.yml
index dbf914f..4f9280c 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -142,297 +142,226 @@ platforms:
driver:
image: saltimages/salt-master-py3:rockylinux-8
- ## SALT `3003.2`
- - name: debian-11-3003-2-py3
+ ## SALT `3003.3`
+ - name: debian-11-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:debian-11
+ image: saltimages/salt-3003.3-py3:debian-11
run_command: /lib/systemd/systemd
- - name: debian-10-3003-2-py3
+ - name: debian-10-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:debian-10
+ image: saltimages/salt-3003.3-py3:debian-10
run_command: /lib/systemd/systemd
- - name: debian-9-3003-2-py3
+ - name: debian-9-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:debian-9
+ image: saltimages/salt-3003.3-py3:debian-9
run_command: /lib/systemd/systemd
- - name: ubuntu-2004-3003-2-py3
+ - name: ubuntu-2004-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:ubuntu-20.04
+ image: saltimages/salt-3003.3-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- - name: ubuntu-1804-3003-2-py3
+ - name: ubuntu-1804-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:ubuntu-18.04
+ image: saltimages/salt-3003.3-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- - name: centos-8-3003-2-py3
+ - name: centos-8-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:centos-8
- - name: centos-7-3003-2-py3
+ image: saltimages/salt-3003.3-py3:centos-8
+ - name: centos-7-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:centos-7
- - name: fedora-34-3003-2-py3
+ image: saltimages/salt-3003.3-py3:centos-7
+ - name: fedora-34-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:fedora-34
- - name: fedora-33-3003-2-py3
+ image: saltimages/salt-3003.3-py3:fedora-34
+ - name: fedora-33-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:fedora-33
- - name: opensuse-leap-153-3003-2-py3
+ image: saltimages/salt-3003.3-py3:fedora-33
+ - name: opensuse-leap-153-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
+ image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
# 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-2-py3
+ - name: opensuse-leap-152-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
+ image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
# 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-2-py3
+ - name: opensuse-tmbl-latest-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
+ image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
# 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-2-py3
+ - name: amazonlinux-2-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:amazonlinux-2
- - name: oraclelinux-8-3003-2-py3
+ image: saltimages/salt-3003.3-py3:amazonlinux-2
+ - name: oraclelinux-8-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:oraclelinux-8
- - name: oraclelinux-7-3003-2-py3
+ image: saltimages/salt-3003.3-py3:oraclelinux-8
+ - name: oraclelinux-7-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:oraclelinux-7
- - name: arch-base-latest-3003-2-py3
+ image: saltimages/salt-3003.3-py3:oraclelinux-7
+ - name: arch-base-latest-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:arch-base-latest
- - name: gentoo-stage3-latest-3003-2-py3
+ image: saltimages/salt-3003.3-py3:arch-base-latest
+ - name: gentoo-stage3-latest-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
+ image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
run_command: /sbin/init
- - name: gentoo-stage3-systemd-3003-2-py3
+ - name: gentoo-stage3-systemd-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
- - name: almalinux-8-3003-2-py3
+ image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
+ - name: almalinux-8-3003-3-py3
driver:
- image: saltimages/salt-3003.2-py3:almalinux-8
+ image: saltimages/salt-3003.3-py3:almalinux-8
- ## SALT `3003.1`
- - name: arch-base-latest-3003-1-py3
+ ## SALT `3002.7`
+ - name: debian-11-3002-7-py3
driver:
- image: saltimages/salt-3003.1-py3:arch-base-latest
- - name: gentoo-stage3-latest-3003-1-py3
- driver:
- image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
- run_command: /sbin/init
- - name: gentoo-stage3-systemd-3003-1-py3
- driver:
- image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd
-
- ## SALT `3002.6`
- - name: debian-11-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:debian-11
+ image: saltimages/salt-3002.7-py3:debian-11
run_command: /lib/systemd/systemd
- - name: debian-10-3002-6-py3
+ - name: debian-10-3002-7-py3
driver:
- image: saltimages/salt-3002.6-py3:debian-10
+ image: saltimages/salt-3002.7-py3:debian-10
run_command: /lib/systemd/systemd
- - name: debian-9-3002-6-py3
+ - name: debian-9-3002-7-py3
driver:
- image: saltimages/salt-3002.6-py3:debian-9
+ image: saltimages/salt-3002.7-py3:debian-9
run_command: /lib/systemd/systemd
- - name: ubuntu-2004-3002-6-py3
+ - name: ubuntu-2004-3002-7-py3
driver:
- image: saltimages/salt-3002.6-py3:ubuntu-20.04
+ image: saltimages/salt-3002.7-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- - name: ubuntu-1804-3002-6-py3
+ - name: ubuntu-1804-3002-7-py3
driver:
- image: saltimages/salt-3002.6-py3:ubuntu-18.04
+ image: saltimages/salt-3002.7-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- - name: centos-8-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:centos-8
- - name: centos-7-3002-6-py3
+ - name: centos-8-3002-7-py3
driver:
- image: saltimages/salt-3002.6-py3:centos-7
- - name: fedora-34-3002-6-py3
+ image: saltimages/salt-3002.7-py3:centos-8
+ - name: centos-7-3002-7-py3
driver:
- image: saltimages/salt-3002.6-py3:fedora-34
- - name: fedora-33-3002-6-py3
+ image: saltimages/salt-3002.7-py3:centos-7
+ - name: fedora-34-3002-7-py3
driver:
- image: saltimages/salt-3002.6-py3:fedora-33
- - name: amazonlinux-2-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:amazonlinux-2
- - name: oraclelinux-8-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:oraclelinux-8
- - name: oraclelinux-7-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:oraclelinux-7
- - name: arch-base-latest-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:arch-base-latest
- - name: gentoo-stage3-latest-3002-6-py3
- driver:
- image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
- run_command: /sbin/init
- - name: gentoo-stage3-systemd-3002-6-py3
+ image: saltimages/salt-3002.7-py3:fedora-34
+ - name: fedora-33-3002-7-py3
driver:
- image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd
-
- ## SALT `3002.2`
- - name: opensuse-leap-153-3002-2-py3
+ image: saltimages/salt-3002.7-py3:fedora-33
+ - name: opensuse-leap-153-3002-7-py3
driver:
- image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
+ image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
# 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
+ - name: opensuse-leap-152-3002-7-py3
driver:
- image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
+ image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
# 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-3002-2-py3
+ - name: opensuse-tmbl-latest-3002-7-py3
driver:
- image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
+ image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest
# 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-3002-7-py3
+ driver:
+ image: saltimages/salt-3002.7-py3:amazonlinux-2
+ - name: oraclelinux-8-3002-7-py3
+ driver:
+ image: saltimages/salt-3002.7-py3:oraclelinux-8
+ - name: oraclelinux-7-3002-7-py3
+ driver:
+ image: saltimages/salt-3002.7-py3:oraclelinux-7
+ - name: arch-base-latest-3002-7-py3
+ driver:
+ image: saltimages/salt-3002.7-py3:arch-base-latest
+ - name: gentoo-stage3-latest-3002-7-py3
+ driver:
+ image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
+ run_command: /sbin/init
+ - name: gentoo-stage3-systemd-3002-7-py3
+ driver:
+ image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
- ## SALT `3001.7`
- - name: debian-10-3001-7-py3
+ ## SALT `3001.8`
+ - name: debian-10-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:debian-10
+ image: saltimages/salt-3001.8-py3:debian-10
run_command: /lib/systemd/systemd
- - name: debian-9-3001-7-py3
+ - name: debian-9-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:debian-9
+ image: saltimages/salt-3001.8-py3:debian-9
run_command: /lib/systemd/systemd
- - name: ubuntu-2004-3001-7-py3
+ - name: ubuntu-2004-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:ubuntu-20.04
+ image: saltimages/salt-3001.8-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- - name: ubuntu-1804-3001-7-py3
+ - name: ubuntu-1804-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:ubuntu-18.04
+ image: saltimages/salt-3001.8-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- - name: centos-8-3001-7-py3
+ - name: centos-8-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:centos-8
- - name: centos-7-3001-7-py3
+ image: saltimages/salt-3001.8-py3:centos-8
+ - name: centos-7-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:centos-7
- - name: fedora-34-3001-7-py3
+ image: saltimages/salt-3001.8-py3:centos-7
+ - name: fedora-34-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:fedora-34
- - name: fedora-33-3001-7-py3
+ image: saltimages/salt-3001.8-py3:fedora-34
+ - name: fedora-33-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:fedora-33
- - name: opensuse-leap-153-3001-7-py3
+ image: saltimages/salt-3001.8-py3:fedora-33
+ - name: opensuse-leap-153-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
+ image: saltimages/salt-3001.8-py3:opensuse-leap-15.3
# 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
+ - name: opensuse-leap-152-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
+ image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
# 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-3001-7-py3
+ - name: opensuse-tmbl-latest-3001-8-py3
driver:
- image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest
+ image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest
# 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-3001-7-py3
- driver:
- image: saltimages/salt-3001.7-py3:amazonlinux-2
- - name: oraclelinux-8-3001-7-py3
- driver:
- image: saltimages/salt-3001.7-py3:oraclelinux-8
- - name: oraclelinux-7-3001-7-py3
- driver:
- image: saltimages/salt-3001.7-py3:oraclelinux-7
- - name: arch-base-latest-3001-7-py3
- driver:
- image: saltimages/salt-3001.7-py3:arch-base-latest
- - name: gentoo-stage3-latest-3001-7-py3
- driver:
- image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
- run_command: /sbin/init
- - name: gentoo-stage3-systemd-3001-7-py3
- driver:
- image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd
-
- ## SALT `3000.9`
- - name: debian-10-3000-9-py3
- driver:
- image: saltimages/salt-3000.9-py3:debian-10
- run_command: /lib/systemd/systemd
- - name: debian-9-3000-9-py3
- driver:
- image: saltimages/salt-3000.9-py3:debian-9
- run_command: /lib/systemd/systemd
- - name: ubuntu-1804-3000-9-py3
- driver:
- image: saltimages/salt-3000.9-py3:ubuntu-18.04
- run_command: /lib/systemd/systemd
- - name: centos-8-3000-9-py3
- driver:
- image: saltimages/salt-3000.9-py3:centos-8
- - 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
- # 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
+ - name: amazonlinux-2-3001-8-py3
driver:
- image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
- # 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: amazonlinux-2-3000-9-py3
+ image: saltimages/salt-3001.8-py3:amazonlinux-2
+ - name: oraclelinux-8-3001-8-py3
driver:
- image: saltimages/salt-3000.9-py3:amazonlinux-2
- - name: oraclelinux-8-3000-9-py3
+ image: saltimages/salt-3001.8-py3:oraclelinux-8
+ - name: oraclelinux-7-3001-8-py3
driver:
- image: saltimages/salt-3000.9-py3:oraclelinux-8
- - name: oraclelinux-7-3000-9-py3
+ image: saltimages/salt-3001.8-py3:oraclelinux-7
+ - name: arch-base-latest-3001-8-py3
driver:
- image: saltimages/salt-3000.9-py3:oraclelinux-7
- - name: gentoo-stage3-latest-3000-9-py3
+ image: saltimages/salt-3001.8-py3:arch-base-latest
+ - name: gentoo-stage3-latest-3001-8-py3
driver:
- image: saltimages/salt-3000.9-py3:gentoo-stage3-latest
+ image: saltimages/salt-3001.8-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
- run_command: /lib/systemd/systemd
- - name: arch-base-latest-3000-9-py2
+ - name: gentoo-stage3-systemd-3001-8-py3
driver:
- image: saltimages/salt-3000.9-py2:arch-base-latest
+ image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd
verifier:
# https://www.inspec.io/
@@ -451,16 +380,14 @@ suites:
- debian-11-master-py3
- debian-10-master-py3
- debian-9-master-py3
- - debian-11-3003-2-py3
- - debian-10-3003-2-py3
- - debian-9-3003-2-py3
- - debian-11-3002-6-py3
- - debian-10-3002-6-py3
- - debian-9-3002-6-py3
- - debian-10-3001-7-py3
- - debian-9-3001-7-py3
- - debian-10-3000-9-py3
- - debian-9-3000-9-py3
+ - debian-11-3003-3-py3
+ - debian-10-3003-3-py3
+ - debian-9-3003-3-py3
+ - debian-11-3002-7-py3
+ - debian-10-3002-7-py3
+ - debian-9-3002-7-py3
+ - debian-10-3001-8-py3
+ - debian-9-3001-8-py3
provisioner:
state_top:
base:
@@ -488,14 +415,12 @@ suites:
- ubuntu-1804-tiamat-py3
- ubuntu-2004-master-py3
- ubuntu-1804-master-py3
- - ubuntu-2004-3003-2-py3
- - ubuntu-1804-3003-2-py3
- - ubuntu-2004-3002-6-py3
- - ubuntu-1804-3002-6-py3
- - ubuntu-2004-3001-7-py3
- - ubuntu-1804-3001-7-py3
- - ubuntu-1804-3000-9-py3
- - ubuntu-1804-3000-9-py2
+ - ubuntu-2004-3003-3-py3
+ - ubuntu-1804-3003-3-py3
+ - ubuntu-2004-3002-7-py3
+ - ubuntu-1804-3002-7-py3
+ - ubuntu-2004-3001-8-py3
+ - ubuntu-1804-3001-8-py3
provisioner:
state_top:
base:
@@ -537,33 +462,28 @@ suites:
- oraclelinux-7-master-py3
- almalinux-8-master-py3
- rockylinux-8-master-py3
- - centos-8-3003-2-py3
- - centos-7-3003-2-py3
- - fedora-34-3003-2-py3
- - fedora-33-3003-2-py3
- - amazonlinux-2-3003-2-py3
- - oraclelinux-8-3003-2-py3
- - oraclelinux-7-3003-2-py3
- - almalinux-8-3003-2-py3
- - centos-8-3002-6-py3
- - centos-7-3002-6-py3
- - fedora-34-3002-6-py3
- - fedora-33-3002-6-py3
- - amazonlinux-2-3002-6-py3
- - oraclelinux-8-3002-6-py3
- - oraclelinux-7-3002-6-py3
- - centos-8-3001-7-py3
- - centos-7-3001-7-py3
- - fedora-34-3001-7-py3
- - fedora-33-3001-7-py3
- - amazonlinux-2-3001-7-py3
- - oraclelinux-8-3001-7-py3
- - oraclelinux-7-3001-7-py3
- - centos-8-3000-9-py3
- - centos-7-3000-9-py3
- - amazonlinux-2-3000-9-py3
- - oraclelinux-8-3000-9-py3
- - oraclelinux-7-3000-9-py3
+ - centos-8-3003-3-py3
+ - centos-7-3003-3-py3
+ - fedora-34-3003-3-py3
+ - fedora-33-3003-3-py3
+ - amazonlinux-2-3003-3-py3
+ - oraclelinux-8-3003-3-py3
+ - oraclelinux-7-3003-3-py3
+ - almalinux-8-3003-3-py3
+ - centos-8-3002-7-py3
+ - centos-7-3002-7-py3
+ - fedora-34-3002-7-py3
+ - fedora-33-3002-7-py3
+ - amazonlinux-2-3002-7-py3
+ - oraclelinux-8-3002-7-py3
+ - oraclelinux-7-3002-7-py3
+ - centos-8-3001-8-py3
+ - centos-7-3001-8-py3
+ - fedora-34-3001-8-py3
+ - fedora-33-3001-8-py3
+ - amazonlinux-2-3001-8-py3
+ - oraclelinux-8-3001-8-py3
+ - oraclelinux-7-3001-8-py3
provisioner:
state_top:
base:
@@ -585,17 +505,15 @@ suites:
- opensuse-leap-153-master-py3
- opensuse-leap-152-master-py3
- opensuse-tmbl-latest-master-py3
- - opensuse-leap-153-3003-2-py3
- - opensuse-leap-152-3003-2-py3
- - opensuse-tmbl-latest-3003-2-py3
- - opensuse-leap-153-3002-2-py3
- - opensuse-leap-152-3002-2-py3
- - opensuse-tmbl-latest-3002-2-py3
- - opensuse-leap-153-3001-7-py3
- - opensuse-leap-152-3001-7-py3
- - opensuse-tmbl-latest-3001-7-py3
- - opensuse-leap-153-3000-9-py3
- - opensuse-leap-152-3000-9-py3
+ - opensuse-leap-153-3003-3-py3
+ - opensuse-leap-152-3003-3-py3
+ - opensuse-tmbl-latest-3003-3-py3
+ - opensuse-leap-153-3002-7-py3
+ - opensuse-leap-152-3002-7-py3
+ - opensuse-tmbl-latest-3002-7-py3
+ - opensuse-leap-153-3001-8-py3
+ - opensuse-leap-152-3001-8-py3
+ - opensuse-tmbl-latest-3001-8-py3
provisioner:
state_top:
base:
@@ -616,10 +534,8 @@ suites:
includes:
- freebsd-130-master-py3
- freebsd-122-master-py3
- - freebsd-114-master-py3
- freebsd-130-3003-1-py3
- freebsd-122-3003-1-py3
- - freebsd-114-3003-1-py3
provisioner:
state_top:
base:
--
GitLab