ci(kitchen+gitlab): adjust matrix to add 3003

* Semi-automated using https://github.com/myii/ssf-formula/pull/318
This commit is contained in:
Imran Iqbal
2021-04-22 23:53:05 +01:00
parent 752a1dea22
commit 480b7edbfb
10 changed files with 502 additions and 239 deletions
+241 -140
View File
@@ -63,6 +63,9 @@ platforms:
- name: centos-7-master-py3
driver:
image: saltimages/salt-master-py3:centos-7
- name: fedora-34-master-py3
driver:
image: saltimages/salt-master-py3:fedora-34
- name: fedora-33-master-py3
driver:
image: saltimages/salt-master-py3:fedora-33
@@ -102,47 +105,101 @@ platforms:
driver:
image: saltimages/salt-master-py3:gentoo-stage3-systemd
## SALT `3002.5`
- name: debian-10-3002-5-py3
## SALT `3003.0`
- name: debian-10-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:debian-10
- name: debian-9-3002-5-py3
image: saltimages/salt-3003.0-py3:debian-10
- name: debian-9-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:debian-9
- name: ubuntu-2004-3002-5-py3
image: saltimages/salt-3003.0-py3:debian-9
- name: ubuntu-2004-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-20.04
- name: ubuntu-1804-3002-5-py3
image: saltimages/salt-3003.0-py3:ubuntu-20.04
- name: ubuntu-1804-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-18.04
- name: ubuntu-1604-3002-5-py3
image: saltimages/salt-3003.0-py3:ubuntu-18.04
- name: centos-8-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-16.04
- name: centos-8-3002-5-py3
image: saltimages/salt-3003.0-py3:centos-8
- name: centos-7-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:centos-8
- name: centos-7-3002-5-py3
image: saltimages/salt-3003.0-py3:centos-7
- name: fedora-34-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:centos-7
- name: fedora-33-3002-5-py3
image: saltimages/salt-3003.0-py3:fedora-34
- name: fedora-33-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:fedora-33
- name: fedora-32-3002-5-py3
image: saltimages/salt-3003.0-py3:fedora-33
- name: fedora-32-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:fedora-32
- name: amazonlinux-2-3002-5-py3
image: saltimages/salt-3003.0-py3:fedora-32
- name: amazonlinux-2-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:amazonlinux-2
- name: oraclelinux-8-3002-5-py3
image: saltimages/salt-3003.0-py3:amazonlinux-2
- name: oraclelinux-8-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:oraclelinux-8
- name: oraclelinux-7-3002-5-py3
image: saltimages/salt-3003.0-py3:oraclelinux-8
- name: oraclelinux-7-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:oraclelinux-7
- name: arch-base-latest-3002-5-py3
image: saltimages/salt-3003.0-py3:oraclelinux-7
- name: arch-base-latest-3003-0-py3
driver:
image: saltimages/salt-3002.5-py3:arch-base-latest
image: saltimages/salt-3003.0-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd
- name: gentoo-stage3-latest-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd
## SALT `3002.6`
- name: debian-10-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-10
- name: debian-9-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-9
- name: ubuntu-2004-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:ubuntu-20.04
- name: ubuntu-1804-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:ubuntu-18.04
- name: ubuntu-1604-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:ubuntu-16.04
- name: centos-8-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:centos-8
- name: centos-7-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:centos-7
- name: fedora-34-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:fedora-34
- name: fedora-33-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:fedora-33
- name: fedora-32-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:fedora-32
- 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
run_command: /usr/lib/systemd/systemd
## SALT `3002.5`
- name: gentoo-stage3-latest-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
@@ -169,63 +226,68 @@ platforms:
transport:
max_ssh_sessions: 1
## SALT `3001.6`
- name: debian-10-3001-6-py3
## SALT `3001.7`
- name: debian-10-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:debian-10
- name: debian-9-3001-6-py3
image: saltimages/salt-3001.7-py3:debian-10
- name: debian-9-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:debian-9
- name: ubuntu-2004-3001-6-py3
image: saltimages/salt-3001.7-py3:debian-9
- name: ubuntu-2004-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:ubuntu-20.04
- name: ubuntu-1804-3001-6-py3
image: saltimages/salt-3001.7-py3:ubuntu-20.04
- name: ubuntu-1804-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:ubuntu-18.04
- name: ubuntu-1604-3001-6-py3
image: saltimages/salt-3001.7-py3:ubuntu-18.04
- name: ubuntu-1604-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:ubuntu-16.04
- name: centos-8-3001-6-py3
image: saltimages/salt-3001.7-py3:ubuntu-16.04
- name: centos-8-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:centos-8
- name: centos-7-3001-6-py3
image: saltimages/salt-3001.7-py3:centos-8
- name: centos-7-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:centos-7
- name: fedora-33-3001-6-py3
image: saltimages/salt-3001.7-py3:centos-7
- name: fedora-34-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:fedora-33
- name: fedora-32-3001-6-py3
image: saltimages/salt-3001.7-py3:fedora-34
- name: fedora-33-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:fedora-32
- name: opensuse-leap-152-3001-6-py3
image: saltimages/salt-3001.7-py3:fedora-33
- name: fedora-32-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
image: saltimages/salt-3001.7-py3:fedora-32
- name: opensuse-leap-152-3001-7-py3
driver:
image: saltimages/salt-3001.7-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-3001-6-py3
- name: opensuse-tmbl-latest-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3001.7-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-3001-6-py3
- name: amazonlinux-2-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:amazonlinux-2
- name: oraclelinux-8-3001-6-py3
image: saltimages/salt-3001.7-py3:amazonlinux-2
- name: oraclelinux-8-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:oraclelinux-8
- name: oraclelinux-7-3001-6-py3
image: saltimages/salt-3001.7-py3:oraclelinux-8
- name: oraclelinux-7-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:oraclelinux-7
- name: arch-base-latest-3001-6-py3
image: saltimages/salt-3001.7-py3:oraclelinux-7
- name: arch-base-latest-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:arch-base-latest
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
driver:
image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
@@ -234,42 +296,54 @@ platforms:
driver:
image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
## SALT `3000.8`
- name: debian-10-3000-8-py3
## SALT `3000.9`
- name: debian-10-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:debian-10
- name: debian-9-3000-8-py3
image: saltimages/salt-3000.9-py3:debian-10
- name: debian-9-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:debian-9
- name: ubuntu-1804-3000-8-py3
image: saltimages/salt-3000.9-py3:debian-9
- name: ubuntu-1804-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:ubuntu-18.04
- name: ubuntu-1604-3000-8-py3
image: saltimages/salt-3000.9-py3:ubuntu-18.04
- name: ubuntu-1604-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:ubuntu-16.04
- name: centos-8-3000-8-py3
image: saltimages/salt-3000.9-py3:ubuntu-16.04
- name: centos-8-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:centos-8
- name: centos-7-3000-8-py3
image: saltimages/salt-3000.9-py3:centos-8
- name: centos-7-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:centos-7
- name: opensuse-leap-152-3000-8-py3
image: saltimages/salt-3000.9-py3:centos-7
- name: opensuse-leap-152-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:opensuse-leap-15.2
image: saltimages/salt-3000.9-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: amazonlinux-2-3000-8-py3
- name: amazonlinux-2-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:amazonlinux-2
- name: oraclelinux-8-3000-8-py3
image: saltimages/salt-3000.9-py3:amazonlinux-2
- name: oraclelinux-8-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:oraclelinux-8
- name: oraclelinux-7-3000-8-py3
image: saltimages/salt-3000.9-py3:oraclelinux-8
- name: oraclelinux-7-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:oraclelinux-7
image: saltimages/salt-3000.9-py3:oraclelinux-7
- name: ubuntu-1804-3000-9-py2
driver:
image: saltimages/salt-3000.9-py2:ubuntu-18.04
- name: ubuntu-1604-3000-9-py2
driver:
image: saltimages/salt-3000.9-py2:ubuntu-16.04
- name: arch-base-latest-3000-9-py2
driver:
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
@@ -277,16 +351,6 @@ platforms:
- name: gentoo-stage3-systemd-3000-8-py3
driver:
image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
- name: ubuntu-1804-3000-8-py2
driver:
image: saltimages/salt-3000.8-py2:ubuntu-18.04
- name: ubuntu-1604-3000-8-py2
driver:
image: saltimages/salt-3000.8-py2:ubuntu-16.04
- name: arch-base-latest-3000-8-py2
driver:
image: saltimages/salt-3000.8-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd
provisioner:
name: salt_solo
@@ -307,30 +371,70 @@ verifier:
- cli
suites:
- name: v3002-py3
- name: v3003-py3
includes:
- debian-10-3002-5-py3
- debian-9-3002-5-py3
- ubuntu-2004-3002-5-py3
- ubuntu-1804-3002-5-py3
- ubuntu-1604-3002-5-py3
- centos-8-3002-5-py3
- centos-7-3002-5-py3
- fedora-33-3002-5-py3
- fedora-32-3002-5-py3
- amazonlinux-2-3002-5-py3
- oraclelinux-8-3002-5-py3
- oraclelinux-7-3002-5-py3
- arch-base-latest-3002-5-py3
- gentoo-stage3-latest-3002-5-py3
- gentoo-stage3-systemd-3002-5-py3
- freebsd-130-3002-6-py3
- freebsd-122-3002-6-py3
- freebsd-114-3002-6-py3
- 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
- fedora-32-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
- windows-10-latest-py3
- windows-81-latest-py3
- windows-2019-latest-py3
- windows-2016-latest-py3
provisioner:
state_top:
base:
'*':
- salt._mapdata
- salt.pkgrepo
- salt.master
- salt.minion
pillars:
top.sls:
base:
'*':
- salt
- v3003-py3
pillars_from_files:
salt.sls: test/salt/pillar/salt.sls
v3003-py3.sls: test/salt/pillar/v3003-py3.sls
verifier:
inspec_tests:
- path: test/integration/v3003-py3
- name: v3002-py3
includes:
- debian-10-3002-6-py3
- debian-9-3002-6-py3
- ubuntu-2004-3002-6-py3
- ubuntu-1804-3002-6-py3
- ubuntu-1604-3002-6-py3
- centos-8-3002-6-py3
- centos-7-3002-6-py3
- fedora-34-3002-6-py3
- fedora-33-3002-6-py3
- fedora-32-3002-6-py3
- amazonlinux-2-3002-6-py3
- 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
- opensuse-leap-152-3002-2-py3
- opensuse-tmbl-latest-3002-2-py3
- freebsd-130-3002-6-py3
- freebsd-122-3002-6-py3
- freebsd-114-3002-6-py3
provisioner:
state_top:
base:
@@ -353,23 +457,22 @@ suites:
- path: test/integration/v3002-py3
- name: v3001-py3
includes:
- debian-10-3001-6-py3
- debian-9-3001-6-py3
- ubuntu-2004-3001-6-py3
- ubuntu-1804-3001-6-py3
- ubuntu-1604-3001-6-py3
- centos-8-3001-6-py3
- centos-7-3001-6-py3
- fedora-33-3001-6-py3
- fedora-32-3001-6-py3
- opensuse-leap-152-3001-6-py3
- opensuse-tmbl-latest-3001-6-py3
- amazonlinux-2-3001-6-py3
- oraclelinux-8-3001-6-py3
- oraclelinux-7-3001-6-py3
- arch-base-latest-3001-6-py3
- gentoo-stage3-latest-3001-6-py3
- gentoo-stage3-systemd-3001-6-py3
- debian-10-3001-7-py3
- debian-9-3001-7-py3
- ubuntu-2004-3001-7-py3
- ubuntu-1804-3001-7-py3
- ubuntu-1604-3001-7-py3
- centos-8-3001-7-py3
- centos-7-3001-7-py3
- fedora-34-3001-7-py3
- fedora-33-3001-7-py3
- fedora-32-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
- openbsd-68-3001-1-py3
provisioner:
state_top:
@@ -393,18 +496,16 @@ suites:
- path: test/integration/v3001-py3
- name: v3000-py3
includes:
- debian-10-3000-8-py3
- debian-9-3000-8-py3
- ubuntu-1804-3000-8-py3
- ubuntu-1604-3000-8-py3
- centos-8-3000-8-py3
- centos-7-3000-8-py3
- opensuse-leap-152-3000-8-py3
- amazonlinux-2-3000-8-py3
- oraclelinux-8-3000-8-py3
- oraclelinux-7-3000-8-py3
- gentoo-stage3-latest-3000-8-py3
- gentoo-stage3-systemd-3000-8-py3
- debian-10-3000-9-py3
- debian-9-3000-9-py3
- ubuntu-1804-3000-9-py3
- ubuntu-1604-3000-9-py3
- centos-8-3000-9-py3
- centos-7-3000-9-py3
- opensuse-leap-152-3000-9-py3
- amazonlinux-2-3000-9-py3
- oraclelinux-8-3000-9-py3
- oraclelinux-7-3000-9-py3
provisioner:
state_top:
base:
@@ -427,9 +528,9 @@ suites:
- path: test/integration/v3000-py3
- name: v3000-py2
includes:
- ubuntu-1804-3000-8-py2
- ubuntu-1604-3000-8-py2
- arch-base-latest-3000-8-py2
- ubuntu-1804-3000-9-py2
- ubuntu-1604-3000-9-py2
- arch-base-latest-3000-9-py2
provisioner:
state_top:
base: