2
0

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

* Semi-automated using https://github.com/myii/ssf-formula/pull/385
This commit is contained in:
Imran Iqbal 2021-11-19 22:08:25 +00:00
parent f9ff8eab10
commit 93289f6df1
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
6 changed files with 251 additions and 47 deletions

View File

@ -19,7 +19,6 @@ jobs:
- default-freebsd-130-3003-1-py3
- default-freebsd-122-3003-1-py3
- default-openbsd-69-3002-6-py3
# - default-openbsd-68-3001-1-py3
- default-windows-10-latest-py3
- default-windows-81-latest-py3
steps:

View File

@ -135,6 +135,7 @@ rubocop:
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
@ -147,13 +148,14 @@ rubocop:
# default-debian-9-master-py3: {extends: '.test_instance'}
# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-8-master-py3: {extends: '.test_instance'}
# default-centos-7-master-py3: {extends: '.test_instance'}
# default-fedora-34-master-py3: {extends: '.test_instance'}
# default-fedora-33-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
@ -162,45 +164,67 @@ rubocop:
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# default-almalinux-8-master-py3: {extends: '.test_instance'}
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
default-debian-11-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
default-debian-11-3004-0-py3: {extends: '.test_instance'}
# default-debian-10-3004-0-py3: {extends: '.test_instance'}
# default-debian-9-3004-0-py3: {extends: '.test_instance'}
default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
default-centos-8-3004-0-py3: {extends: '.test_instance'}
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
# default-debian-11-3003-3-py3: {extends: '.test_instance'}
default-debian-10-3003-3-py3: {extends: '.test_instance'}
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
default-centos-8-3003-3-py3: {extends: '.test_instance'}
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-8-3003-3-py3: {extends: '.test_instance'}
default-centos-7-3003-3-py3: {extends: '.test_instance'}
default-fedora-34-3003-3-py3: {extends: '.test_instance'}
default-fedora-33-3003-3-py3: {extends: '.test_instance'}
default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
# default-debian-11-3002-7-py3: {extends: '.test_instance_failure_permitted'}
default-debian-10-3002-7-py3: {extends: '.test_instance'}
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
# default-debian-11-3002-7-py3: {extends: '.test_instance'}
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
default-debian-9-3002-7-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
default-centos-7-3002-7-py3: {extends: '.test_instance'}
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
# default-debian-10-3001-8-py3: {extends: '.test_instance'}
default-debian-9-3001-8-py3: {extends: '.test_instance'}
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
@ -209,7 +233,7 @@ default-debian-9-3001-8-py3: {extends: '.test_instance'}
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}

View File

@ -88,6 +88,7 @@ jobs:
# - env: INSTANCE=default-debian-9-tiamat-py3
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
# - env: INSTANCE=default-centos-stream8-tiamat-py3
# - env: INSTANCE=default-centos-8-tiamat-py3
# - env: INSTANCE=default-centos-7-tiamat-py3
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
@ -100,6 +101,7 @@ jobs:
# - env: INSTANCE=default-debian-9-master-py3
# - env: INSTANCE=default-ubuntu-2004-master-py3
# - env: INSTANCE=default-ubuntu-1804-master-py3
# - env: INSTANCE=default-centos-stream8-master-py3
# - env: INSTANCE=default-centos-8-master-py3
# - env: INSTANCE=default-centos-7-master-py3
# - env: INSTANCE=default-fedora-34-master-py3
@ -115,32 +117,54 @@ jobs:
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
# - env: INSTANCE=default-almalinux-8-master-py3
# - env: INSTANCE=default-rockylinux-8-master-py3
- env: INSTANCE=default-debian-11-3003-3-py3
# - env: INSTANCE=default-debian-10-3003-3-py3
- env: INSTANCE=default-debian-11-3004-0-py3
# - env: INSTANCE=default-debian-10-3004-0-py3
# - env: INSTANCE=default-debian-9-3004-0-py3
- env: INSTANCE=default-ubuntu-2004-3004-0-py3
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
- env: INSTANCE=default-centos-stream8-3004-0-py3
- env: INSTANCE=default-centos-8-3004-0-py3
# - env: INSTANCE=default-centos-7-3004-0-py3
# - env: INSTANCE=default-fedora-34-3004-0-py3
# - env: INSTANCE=default-fedora-33-3004-0-py3
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
# - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
# - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
- env: INSTANCE=default-amazonlinux-2-3004-0-py3
- env: INSTANCE=default-oraclelinux-8-3004-0-py3
# - env: INSTANCE=default-oraclelinux-7-3004-0-py3
- env: INSTANCE=default-arch-base-latest-3004-0-py3
# - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
- env: INSTANCE=default-almalinux-8-3004-0-py3
- env: INSTANCE=default-rockylinux-8-3004-0-py3
# - env: INSTANCE=default-debian-11-3003-3-py3
- env: INSTANCE=default-debian-10-3003-3-py3
# - env: INSTANCE=default-debian-9-3003-3-py3
- env: INSTANCE=default-ubuntu-2004-3003-3-py3
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
- env: INSTANCE=default-centos-8-3003-3-py3
# - env: INSTANCE=default-centos-7-3003-3-py3
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
- env: INSTANCE=default-ubuntu-1804-3003-3-py3
# - env: INSTANCE=default-centos-stream8-3003-3-py3
# - env: INSTANCE=default-centos-8-3003-3-py3
- env: INSTANCE=default-centos-7-3003-3-py3
- env: INSTANCE=default-fedora-34-3003-3-py3
- env: INSTANCE=default-fedora-33-3003-3-py3
- env: INSTANCE=default-opensuse-leap-153-3003-3-py3
# - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
- env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
- env: INSTANCE=default-amazonlinux-2-3003-3-py3
- env: INSTANCE=default-oraclelinux-8-3003-3-py3
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
- env: INSTANCE=default-oraclelinux-7-3003-3-py3
# - env: INSTANCE=default-arch-base-latest-3003-3-py3
- env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
- env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
- env: INSTANCE=default-almalinux-8-3003-3-py3
# - env: INSTANCE=default-almalinux-8-3003-3-py3
# - env: INSTANCE=default-debian-11-3002-7-py3
- env: INSTANCE=default-debian-10-3002-7-py3
# - env: INSTANCE=default-debian-9-3002-7-py3
# - env: INSTANCE=default-debian-10-3002-7-py3
- env: INSTANCE=default-debian-9-3002-7-py3
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
- env: INSTANCE=default-ubuntu-1804-3002-7-py3
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
# - env: INSTANCE=default-centos-8-3002-7-py3
- env: INSTANCE=default-centos-7-3002-7-py3
# - env: INSTANCE=default-centos-7-3002-7-py3
# - env: INSTANCE=default-fedora-34-3002-7-py3
# - env: INSTANCE=default-fedora-33-3002-7-py3
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
@ -148,12 +172,12 @@ jobs:
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
- env: INSTANCE=default-oraclelinux-7-3002-7-py3
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
# - env: INSTANCE=default-arch-base-latest-3002-7-py3
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
# - env: INSTANCE=default-debian-10-3001-8-py3
- env: INSTANCE=default-debian-9-3001-8-py3
# - env: INSTANCE=default-debian-9-3001-8-py3
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
# - env: INSTANCE=default-centos-8-3001-8-py3

View File

@ -53,15 +53,6 @@ platforms:
verifier:
inputs:
saltmajorversion: 3002
- name: openbsd-68-3001-1-py3
driver:
box: myii/openbsd-6.8-3001.1-py3
ssh:
shell: /bin/ksh
synced_folders: []
verifier:
inputs:
saltmajorversion: 3001
- name: windows-10-latest-py3
driver:
box: techneg/win10x64-pro-salt

View File

@ -57,6 +57,12 @@ platforms:
verifier:
inputs:
saltmajorversion: 3004
- name: centos-stream8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:centos-stream8
verifier:
inputs:
saltmajorversion: 3004
- name: centos-8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:centos-8
@ -136,6 +142,12 @@ platforms:
verifier:
inputs:
saltmajorversion: 3004
- name: centos-stream8-master-py3
driver:
image: saltimages/salt-master-py3:centos-stream8
verifier:
inputs:
saltmajorversion: 3004
- name: centos-8-master-py3
driver:
image: saltimages/salt-master-py3:centos-8
@ -240,6 +252,152 @@ platforms:
inputs:
saltmajorversion: 3004
## SALT `3004.0`
- name: debian-11-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-10-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:debian-10
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-9-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:debian-9
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-2004-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-1804-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: centos-stream8-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:centos-stream8
verifier:
inputs:
saltmajorversion: 3004
- name: centos-8-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:centos-8
verifier:
inputs:
saltmajorversion: 3004
- name: centos-7-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:centos-7
verifier:
inputs:
saltmajorversion: 3004
- name: fedora-34-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:fedora-34
verifier:
inputs:
saltmajorversion: 3004
- name: fedora-33-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:fedora-33
verifier:
inputs:
saltmajorversion: 3004
- name: opensuse-leap-153-3004-0-py3
driver:
image: saltimages/salt-3004.0-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
verifier:
inputs:
saltmajorversion: 3004
- name: opensuse-leap-152-3004-0-py3
driver:
image: saltimages/salt-3004.0-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
verifier:
inputs:
saltmajorversion: 3004
- name: opensuse-tmbl-latest-3004-0-py3
driver:
image: saltimages/salt-3004.0-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
verifier:
inputs:
saltmajorversion: 3004
- name: amazonlinux-2-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-8-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-7-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3004
- name: arch-base-latest-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:arch-base-latest
verifier:
inputs:
saltmajorversion: 3004
- name: gentoo-stage3-latest-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
run_command: /sbin/init
verifier:
inputs:
saltmajorversion: 3004
- name: gentoo-stage3-systemd-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
verifier:
inputs:
saltmajorversion: 3004
- name: almalinux-8-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:almalinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: rockylinux-8-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:rockylinux-8
verifier:
inputs:
saltmajorversion: 3004
## SALT `3003.3`
- name: debian-11-3003-3-py3
driver:
@ -276,6 +434,12 @@ platforms:
verifier:
inputs:
saltmajorversion: 3003
- name: centos-stream8-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:centos-stream8
verifier:
inputs:
saltmajorversion: 3003
- name: centos-8-3003-3-py3
driver:
image: saltimages/salt-3003.3-py3:centos-8

View File

@ -4,6 +4,8 @@
base:
'*':
- salt
'G@saltversioninfo:0:3004 and G@pythonversion:0:3':
- v3004-py3
'G@saltversioninfo:0:3003 and G@pythonversion:0:3':
- v3003-py3
'G@saltversioninfo:0:3002 and G@pythonversion:0:3':