0
0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-12-18 08:22:54 +01:00

ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/299
This commit is contained in:
Imran Iqbal 2021-03-07 22:22:21 +00:00
parent e48ebb6431
commit cfefcc83c0
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
3 changed files with 257 additions and 261 deletions

View File

@ -46,7 +46,7 @@ variables:
DOCKER_DRIVER: 'overlay2' DOCKER_DRIVER: 'overlay2'
############################################################################### ###############################################################################
# `lint` stage: `commitlint` & `pre-commit` # `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
############################################################################### ###############################################################################
commitlint: commitlint:
stage: *stage_lint stage: *stage_lint
@ -123,55 +123,53 @@ rubocop:
## Define the rest of the matrix based on Kitchen testing ## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with # Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml` # the `platforms` defined in `kitchen.yml`
v3002-py3-debian-10-3002-2-py3: {extends: '.test_instance'} v3002-py3-debian-10-3002-5-py3: {extends: '.test_instance'}
v3002-py3-debian-9-3002-2-py3: {extends: '.test_instance'} v3002-py3-debian-9-3002-5-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-2004-3002-2-py3: {extends: '.test_instance'} v3002-py3-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-1804-3002-2-py3: {extends: '.test_instance'} v3002-py3-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-1604-3002-2-py3: {extends: '.test_instance'} v3002-py3-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
v3002-py3-centos-8-3002-2-py3: {extends: '.test_instance'} v3002-py3-centos-8-3002-5-py3: {extends: '.test_instance'}
v3002-py3-centos-7-3002-2-py3: {extends: '.test_instance'} v3002-py3-centos-7-3002-5-py3: {extends: '.test_instance'}
v3002-py3-fedora-33-3002-2-py3: {extends: '.test_instance'} v3002-py3-fedora-33-3002-5-py3: {extends: '.test_instance'}
# v3002-py3-fedora-32-3002-2-py3: {extends: '.test_instance'} # v3002-py3-fedora-32-3002-5-py3: {extends: '.test_instance'}
v3002-py3-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} v3002-py3-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
v3002-py3-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} v3002-py3-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'} v3002-py3-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'} # v3002-py3-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'} v3002-py3-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
# v3002-py3-arch-base-latest-3002-2-py3: {extends: '.test_instance'} v3002-py3-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'} v3001-py3-debian-10-3001-6-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'} # v3001-py3-debian-9-3001-6-py3: {extends: '.test_instance'}
v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'} v3001-py3-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-debian-9-3001-4-py3: {extends: '.test_instance'} # v3001-py3-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
v3001-py3-ubuntu-2004-3001-4-py3: {extends: '.test_instance'} # v3001-py3-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1804-3001-4-py3: {extends: '.test_instance'} v3001-py3-centos-8-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1604-3001-4-py3: {extends: '.test_instance'} # v3001-py3-centos-7-3001-6-py3: {extends: '.test_instance'}
v3001-py3-centos-8-3001-4-py3: {extends: '.test_instance'} # v3001-py3-fedora-33-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-centos-7-3001-4-py3: {extends: '.test_instance'} v3001-py3-fedora-32-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-fedora-33-3001-4-py3: {extends: '.test_instance'} # v3001-py3-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
v3001-py3-fedora-32-3001-4-py3: {extends: '.test_instance'} # v3001-py3-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'} # v3001-py3-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'} v3001-py3-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'} # v3001-py3-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'} # v3001-py3-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'} # v3001-py3-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-arch-base-latest-3001-4-py3: {extends: '.test_instance'} # v3001-py3-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'} # v3000-py3-debian-10-3000-8-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'} v3000-py3-debian-9-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'} v3000-py3-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
v3000-py3-debian-9-3000-6-py3: {extends: '.test_instance'} # v3000-py3-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
v3000-py3-ubuntu-1804-3000-6-py3: {extends: '.test_instance'} # v3000-py3-centos-8-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-ubuntu-1604-3000-6-py3: {extends: '.test_instance'} v3000-py3-centos-7-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-centos-8-3000-6-py3: {extends: '.test_instance'} # v3000-py3-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
v3000-py3-centos-7-3000-6-py3: {extends: '.test_instance'} # v3000-py3-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'} # v3000-py3-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-amazonlinux-2-3000-6-py3: {extends: '.test_instance'} v3000-py3-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-oraclelinux-8-3000-6-py3: {extends: '.test_instance'} # v3000-py3-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
v3000-py3-oraclelinux-7-3000-6-py3: {extends: '.test_instance'} # v3000-py3-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'} # v3000-py2-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'} v3000-py2-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
# v3000-py2-ubuntu-1804-3000-6-py2: {extends: '.test_instance'} # v3000-py2-arch-base-latest-3000-8-py2: {extends: '.test_instance'}
v3000-py2-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
# v3000-py2-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
############################################################################### ###############################################################################
# `release` stage: `semantic-release` # `release` stage: `semantic-release`

View File

@ -83,55 +83,53 @@ jobs:
## Define the rest of the matrix based on Kitchen testing ## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with # Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml` # the `platforms` defined in `kitchen.yml`
- env: INSTANCE=v3002-py3-debian-10-3002-2-py3 - env: INSTANCE=v3002-py3-debian-10-3002-5-py3
- env: INSTANCE=v3002-py3-debian-9-3002-2-py3 - env: INSTANCE=v3002-py3-debian-9-3002-5-py3
- env: INSTANCE=v3002-py3-ubuntu-2004-3002-2-py3 - env: INSTANCE=v3002-py3-ubuntu-2004-3002-5-py3
- env: INSTANCE=v3002-py3-ubuntu-1804-3002-2-py3 - env: INSTANCE=v3002-py3-ubuntu-1804-3002-5-py3
- env: INSTANCE=v3002-py3-ubuntu-1604-3002-2-py3 - env: INSTANCE=v3002-py3-ubuntu-1604-3002-5-py3
- env: INSTANCE=v3002-py3-centos-8-3002-2-py3 - env: INSTANCE=v3002-py3-centos-8-3002-5-py3
- env: INSTANCE=v3002-py3-centos-7-3002-2-py3 - env: INSTANCE=v3002-py3-centos-7-3002-5-py3
- env: INSTANCE=v3002-py3-fedora-33-3002-2-py3 - env: INSTANCE=v3002-py3-fedora-33-3002-5-py3
# - env: INSTANCE=v3002-py3-fedora-32-3002-2-py3 # - env: INSTANCE=v3002-py3-fedora-32-3002-5-py3
- env: INSTANCE=v3002-py3-opensuse-leap-152-3002-2-py3 - env: INSTANCE=v3002-py3-amazonlinux-2-3002-5-py3
- env: INSTANCE=v3002-py3-opensuse-tmbl-latest-3002-2-py3 - env: INSTANCE=v3002-py3-oraclelinux-8-3002-5-py3
- env: INSTANCE=v3002-py3-amazonlinux-2-3002-2-py3 - env: INSTANCE=v3002-py3-oraclelinux-7-3002-5-py3
- env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3 # - env: INSTANCE=v3002-py3-arch-base-latest-3002-5-py3
- env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3 - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-5-py3
# - env: INSTANCE=v3002-py3-arch-base-latest-3002-2-py3 - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-5-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3 - env: INSTANCE=v3001-py3-debian-10-3001-6-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3 # - env: INSTANCE=v3001-py3-debian-9-3001-6-py3
- env: INSTANCE=v3001-py3-debian-10-3001-4-py3 - env: INSTANCE=v3001-py3-ubuntu-2004-3001-6-py3
# - env: INSTANCE=v3001-py3-debian-9-3001-4-py3 # - env: INSTANCE=v3001-py3-ubuntu-1804-3001-6-py3
- env: INSTANCE=v3001-py3-ubuntu-2004-3001-4-py3 # - env: INSTANCE=v3001-py3-ubuntu-1604-3001-6-py3
# - env: INSTANCE=v3001-py3-ubuntu-1804-3001-4-py3 - env: INSTANCE=v3001-py3-centos-8-3001-6-py3
# - env: INSTANCE=v3001-py3-ubuntu-1604-3001-4-py3 # - env: INSTANCE=v3001-py3-centos-7-3001-6-py3
- env: INSTANCE=v3001-py3-centos-8-3001-4-py3 # - env: INSTANCE=v3001-py3-fedora-33-3001-6-py3
# - env: INSTANCE=v3001-py3-centos-7-3001-4-py3 - env: INSTANCE=v3001-py3-fedora-32-3001-6-py3
# - env: INSTANCE=v3001-py3-fedora-33-3001-4-py3 # - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-6-py3
- env: INSTANCE=v3001-py3-fedora-32-3001-4-py3 # - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-6-py3
# - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-4-py3 # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-6-py3
# - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-4-py3 - env: INSTANCE=v3001-py3-oraclelinux-8-3001-6-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3 # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-6-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3 # - env: INSTANCE=v3001-py3-arch-base-latest-3001-6-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3 # - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-6-py3
# - env: INSTANCE=v3001-py3-arch-base-latest-3001-4-py3 # - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-6-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3 # - env: INSTANCE=v3000-py3-debian-10-3000-8-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3 - env: INSTANCE=v3000-py3-debian-9-3000-8-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-6-py3 - env: INSTANCE=v3000-py3-ubuntu-1804-3000-8-py3
- env: INSTANCE=v3000-py3-debian-9-3000-6-py3 # - env: INSTANCE=v3000-py3-ubuntu-1604-3000-8-py3
- env: INSTANCE=v3000-py3-ubuntu-1804-3000-6-py3 # - env: INSTANCE=v3000-py3-centos-8-3000-8-py3
# - env: INSTANCE=v3000-py3-ubuntu-1604-3000-6-py3 - env: INSTANCE=v3000-py3-centos-7-3000-8-py3
# - env: INSTANCE=v3000-py3-centos-8-3000-6-py3 # - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-8-py3
- env: INSTANCE=v3000-py3-centos-7-3000-6-py3 # - env: INSTANCE=v3000-py3-amazonlinux-2-3000-8-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-6-py3 # - env: INSTANCE=v3000-py3-oraclelinux-8-3000-8-py3
# - env: INSTANCE=v3000-py3-amazonlinux-2-3000-6-py3 - env: INSTANCE=v3000-py3-oraclelinux-7-3000-8-py3
# - env: INSTANCE=v3000-py3-oraclelinux-8-3000-6-py3 # - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-8-py3
- env: INSTANCE=v3000-py3-oraclelinux-7-3000-6-py3 # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-8-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-6-py3 # - env: INSTANCE=v3000-py2-ubuntu-1804-3000-8-py2
# - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3 - env: INSTANCE=v3000-py2-ubuntu-1604-3000-8-py2
# - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2 # - env: INSTANCE=v3000-py2-arch-base-latest-3000-8-py2
- env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-6-py2
## Define the release stage that runs `semantic-release` ## Define the release stage that runs `semantic-release`
- stage: 'release' - stage: 'release'

View File

@ -102,34 +102,56 @@ platforms:
driver: driver:
image: saltimages/salt-master-py3:gentoo-stage3-systemd image: saltimages/salt-master-py3:gentoo-stage3-systemd
## SALT `3002.5`
- name: debian-10-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:debian-10
- name: debian-9-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:debian-9
- name: ubuntu-2004-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-20.04
- name: ubuntu-1804-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-18.04
- name: ubuntu-1604-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-16.04
- name: centos-8-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:centos-8
- name: centos-7-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:centos-7
- name: fedora-33-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:fedora-33
- name: fedora-32-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:fedora-32
- name: amazonlinux-2-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:amazonlinux-2
- name: oraclelinux-8-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:oraclelinux-8
- name: oraclelinux-7-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:oraclelinux-7
- name: arch-base-latest-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd
- name: gentoo-stage3-latest-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd
## SALT `3002.2` ## SALT `3002.2`
- name: debian-10-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:debian-10
- name: debian-9-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:debian-9
- name: ubuntu-2004-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:ubuntu-20.04
- name: ubuntu-1804-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:ubuntu-18.04
- name: ubuntu-1604-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:ubuntu-16.04
- name: centos-8-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:centos-8
- name: centos-7-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:centos-7
- name: fedora-33-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:fedora-33
- name: fedora-32-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:fedora-32
- name: opensuse-leap-152-3002-2-py3 - name: opensuse-leap-152-3002-2-py3
driver: driver:
image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
@ -146,144 +168,124 @@ platforms:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: amazonlinux-2-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:amazonlinux-2
- name: oraclelinux-8-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:oraclelinux-8
- name: oraclelinux-7-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:oraclelinux-7
- name: arch-base-latest-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd
- name: gentoo-stage3-latest-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:gentoo-stage3-systemd
## SALT `3001.4` ## SALT `3001.6`
- name: debian-10-3001-4-py3 - name: debian-10-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:debian-10 image: saltimages/salt-3001.6-py3:debian-10
- name: debian-9-3001-4-py3 - name: debian-9-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:debian-9 image: saltimages/salt-3001.6-py3:debian-9
- name: ubuntu-2004-3001-4-py3 - name: ubuntu-2004-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:ubuntu-20.04 image: saltimages/salt-3001.6-py3:ubuntu-20.04
- name: ubuntu-1804-3001-4-py3 - name: ubuntu-1804-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:ubuntu-18.04 image: saltimages/salt-3001.6-py3:ubuntu-18.04
- name: ubuntu-1604-3001-4-py3 - name: ubuntu-1604-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:ubuntu-16.04 image: saltimages/salt-3001.6-py3:ubuntu-16.04
- name: centos-8-3001-4-py3 - name: centos-8-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:centos-8 image: saltimages/salt-3001.6-py3:centos-8
- name: centos-7-3001-4-py3 - name: centos-7-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:centos-7 image: saltimages/salt-3001.6-py3:centos-7
- name: fedora-33-3001-4-py3 - name: fedora-33-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:fedora-33 image: saltimages/salt-3001.6-py3:fedora-33
- name: fedora-32-3001-4-py3 - name: fedora-32-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:fedora-32 image: saltimages/salt-3001.6-py3:fedora-32
- name: opensuse-leap-152-3001-4-py3 - name: opensuse-leap-152-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:opensuse-leap-15.2 image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: opensuse-tmbl-latest-3001-4-py3 - name: opensuse-tmbl-latest-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:opensuse-tumbleweed-latest image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: amazonlinux-2-3001-4-py3 - name: amazonlinux-2-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:amazonlinux-2 image: saltimages/salt-3001.6-py3:amazonlinux-2
- name: oraclelinux-8-3001-4-py3 - name: oraclelinux-8-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:oraclelinux-8 image: saltimages/salt-3001.6-py3:oraclelinux-8
- name: oraclelinux-7-3001-4-py3 - name: oraclelinux-7-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:oraclelinux-7 image: saltimages/salt-3001.6-py3:oraclelinux-7
- name: arch-base-latest-3001-4-py3 - name: arch-base-latest-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:arch-base-latest image: saltimages/salt-3001.6-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
- name: gentoo-stage3-latest-3001-4-py3 - name: gentoo-stage3-latest-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:gentoo-stage3-latest image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
run_command: /sbin/init run_command: /sbin/init
- name: gentoo-stage3-systemd-3001-4-py3 - name: gentoo-stage3-systemd-3001-6-py3
driver: driver:
image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
## SALT `3000.6` ## SALT `3000.8`
- name: debian-10-3000-6-py3 - name: debian-10-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:debian-10 image: saltimages/salt-3000.8-py3:debian-10
- name: debian-9-3000-6-py3 - name: debian-9-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:debian-9 image: saltimages/salt-3000.8-py3:debian-9
- name: ubuntu-1804-3000-6-py3 - name: ubuntu-1804-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:ubuntu-18.04 image: saltimages/salt-3000.8-py3:ubuntu-18.04
- name: ubuntu-1604-3000-6-py3 - name: ubuntu-1604-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:ubuntu-16.04 image: saltimages/salt-3000.8-py3:ubuntu-16.04
- name: centos-8-3000-6-py3 - name: centos-8-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:centos-8 image: saltimages/salt-3000.8-py3:centos-8
- name: centos-7-3000-6-py3 - name: centos-7-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:centos-7 image: saltimages/salt-3000.8-py3:centos-7
- name: opensuse-leap-152-3000-6-py3 - name: opensuse-leap-152-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:opensuse-leap-15.2 image: saltimages/salt-3000.8-py3:opensuse-leap-15.2
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: amazonlinux-2-3000-6-py3 - name: amazonlinux-2-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:amazonlinux-2 image: saltimages/salt-3000.8-py3:amazonlinux-2
- name: oraclelinux-8-3000-6-py3 - name: oraclelinux-8-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:oraclelinux-8 image: saltimages/salt-3000.8-py3:oraclelinux-8
- name: oraclelinux-7-3000-6-py3 - name: oraclelinux-7-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:oraclelinux-7 image: saltimages/salt-3000.8-py3:oraclelinux-7
- name: gentoo-stage3-latest-3000-6-py3 - name: gentoo-stage3-latest-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:gentoo-stage3-latest image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
run_command: /sbin/init run_command: /sbin/init
- name: gentoo-stage3-systemd-3000-6-py3 - name: gentoo-stage3-systemd-3000-8-py3
driver: driver:
image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
- name: ubuntu-1804-3000-6-py2 - name: ubuntu-1804-3000-8-py2
driver: driver:
image: saltimages/salt-3000.6-py2:ubuntu-18.04 image: saltimages/salt-3000.8-py2:ubuntu-18.04
- name: ubuntu-1604-3000-6-py2 - name: ubuntu-1604-3000-8-py2
driver: driver:
image: saltimages/salt-3000.6-py2:ubuntu-16.04 image: saltimages/salt-3000.8-py2:ubuntu-16.04
- name: arch-base-latest-3000-6-py2 - name: arch-base-latest-3000-8-py2
driver: driver:
image: saltimages/salt-3000.6-py2:arch-base-latest image: saltimages/salt-3000.8-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
provisioner: provisioner:
@ -307,23 +309,21 @@ verifier:
suites: suites:
- name: v3002-py3 - name: v3002-py3
includes: includes:
- debian-10-3002-2-py3 - debian-10-3002-5-py3
- debian-9-3002-2-py3 - debian-9-3002-5-py3
- ubuntu-2004-3002-2-py3 - ubuntu-2004-3002-5-py3
- ubuntu-1804-3002-2-py3 - ubuntu-1804-3002-5-py3
- ubuntu-1604-3002-2-py3 - ubuntu-1604-3002-5-py3
- centos-8-3002-2-py3 - centos-8-3002-5-py3
- centos-7-3002-2-py3 - centos-7-3002-5-py3
- fedora-33-3002-2-py3 - fedora-33-3002-5-py3
- fedora-32-3002-2-py3 - fedora-32-3002-5-py3
- opensuse-leap-152-3002-2-py3 - amazonlinux-2-3002-5-py3
- opensuse-tmbl-latest-3002-2-py3 - oraclelinux-8-3002-5-py3
- amazonlinux-2-3002-2-py3 - oraclelinux-7-3002-5-py3
- oraclelinux-8-3002-2-py3 - arch-base-latest-3002-5-py3
- oraclelinux-7-3002-2-py3 - gentoo-stage3-latest-3002-5-py3
- arch-base-latest-3002-2-py3 - gentoo-stage3-systemd-3002-5-py3
- gentoo-stage3-latest-3002-2-py3
- gentoo-stage3-systemd-3002-2-py3
provisioner: provisioner:
state_top: state_top:
base: base:
@ -346,23 +346,23 @@ suites:
- path: test/integration/v3002-py3 - path: test/integration/v3002-py3
- name: v3001-py3 - name: v3001-py3
includes: includes:
- debian-10-3001-4-py3 - debian-10-3001-6-py3
- debian-9-3001-4-py3 - debian-9-3001-6-py3
- ubuntu-2004-3001-4-py3 - ubuntu-2004-3001-6-py3
- ubuntu-1804-3001-4-py3 - ubuntu-1804-3001-6-py3
- ubuntu-1604-3001-4-py3 - ubuntu-1604-3001-6-py3
- centos-8-3001-4-py3 - centos-8-3001-6-py3
- centos-7-3001-4-py3 - centos-7-3001-6-py3
- fedora-33-3001-4-py3 - fedora-33-3001-6-py3
- fedora-32-3001-4-py3 - fedora-32-3001-6-py3
- opensuse-leap-152-3001-4-py3 - opensuse-leap-152-3001-6-py3
- opensuse-tmbl-latest-3001-4-py3 - opensuse-tmbl-latest-3001-6-py3
- amazonlinux-2-3001-4-py3 - amazonlinux-2-3001-6-py3
- oraclelinux-8-3001-4-py3 - oraclelinux-8-3001-6-py3
- oraclelinux-7-3001-4-py3 - oraclelinux-7-3001-6-py3
- arch-base-latest-3001-4-py3 - arch-base-latest-3001-6-py3
- gentoo-stage3-latest-3001-4-py3 - gentoo-stage3-latest-3001-6-py3
- gentoo-stage3-systemd-3001-4-py3 - gentoo-stage3-systemd-3001-6-py3
provisioner: provisioner:
state_top: state_top:
base: base:
@ -385,18 +385,18 @@ suites:
- path: test/integration/v3001-py3 - path: test/integration/v3001-py3
- name: v3000-py3 - name: v3000-py3
includes: includes:
- debian-10-3000-6-py3 - debian-10-3000-8-py3
- debian-9-3000-6-py3 - debian-9-3000-8-py3
- ubuntu-1804-3000-6-py3 - ubuntu-1804-3000-8-py3
- ubuntu-1604-3000-6-py3 - ubuntu-1604-3000-8-py3
- centos-8-3000-6-py3 - centos-8-3000-8-py3
- centos-7-3000-6-py3 - centos-7-3000-8-py3
- opensuse-leap-152-3000-6-py3 - opensuse-leap-152-3000-8-py3
- amazonlinux-2-3000-6-py3 - amazonlinux-2-3000-8-py3
- oraclelinux-8-3000-6-py3 - oraclelinux-8-3000-8-py3
- oraclelinux-7-3000-6-py3 - oraclelinux-7-3000-8-py3
- gentoo-stage3-latest-3000-6-py3 - gentoo-stage3-latest-3000-8-py3
- gentoo-stage3-systemd-3000-6-py3 - gentoo-stage3-systemd-3000-8-py3
provisioner: provisioner:
state_top: state_top:
base: base:
@ -419,9 +419,9 @@ suites:
- path: test/integration/v3000-py3 - path: test/integration/v3000-py3
- name: v3000-py2 - name: v3000-py2
includes: includes:
- ubuntu-1804-3000-6-py2 - ubuntu-1804-3000-8-py2
- ubuntu-1604-3000-6-py2 - ubuntu-1604-3000-8-py2
- arch-base-latest-3000-6-py2 - arch-base-latest-3000-8-py2
provisioner: provisioner:
state_top: state_top:
base: base: