Skip to content

Commit

Permalink
ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]
Browse files Browse the repository at this point in the history 
* Automated using myii/ssf-formula#299
  • Loading branch information
@myii
myii committed Mar 7, 2021
1 parent e48ebb6 commit cfefcc8
Show file tree
Hide file tree
Showing 3 changed files with 249 additions and 253 deletions.
98 changes: 48 additions & 50 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ variables:
DOCKER_DRIVER: 'overlay2'

###############################################################################
# `lint` stage: `commitlint` & `pre-commit`
# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
###############################################################################
commitlint:
stage: *stage_lint
Expand Down Expand Up @@ -123,55 +123,53 @@ 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`
v3002-py3-debian-10-3002-2-py3: {extends: '.test_instance'}
v3002-py3-debian-9-3002-2-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
v3002-py3-centos-8-3002-2-py3: {extends: '.test_instance'}
v3002-py3-centos-7-3002-2-py3: {extends: '.test_instance'}
v3002-py3-fedora-33-3002-2-py3: {extends: '.test_instance'}
# v3002-py3-fedora-32-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'}
v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
# v3002-py3-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-debian-9-3001-4-py3: {extends: '.test_instance'}
v3001-py3-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
v3001-py3-centos-8-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-centos-7-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-fedora-33-3001-4-py3: {extends: '.test_instance'}
v3001-py3-fedora-32-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'}
v3000-py3-debian-9-3000-6-py3: {extends: '.test_instance'}
v3000-py3-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-centos-8-3000-6-py3: {extends: '.test_instance'}
v3000-py3-centos-7-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
v3000-py3-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
# v3000-py2-ubuntu-1804-3000-6-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'}
v3002-py3-debian-10-3002-5-py3: {extends: '.test_instance'}
v3002-py3-debian-9-3002-5-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
v3002-py3-centos-8-3002-5-py3: {extends: '.test_instance'}
v3002-py3-centos-7-3002-5-py3: {extends: '.test_instance'}
v3002-py3-fedora-33-3002-5-py3: {extends: '.test_instance'}
# v3002-py3-fedora-32-3002-5-py3: {extends: '.test_instance'}
v3002-py3-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
# v3002-py3-arch-base-latest-3002-5-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'}
v3001-py3-debian-10-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-debian-9-3001-6-py3: {extends: '.test_instance'}
v3001-py3-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
v3001-py3-centos-8-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-centos-7-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-fedora-33-3001-6-py3: {extends: '.test_instance'}
v3001-py3-fedora-32-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-8-py3: {extends: '.test_instance'}
v3000-py3-debian-9-3000-8-py3: {extends: '.test_instance'}
v3000-py3-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-centos-8-3000-8-py3: {extends: '.test_instance'}
v3000-py3-centos-7-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
v3000-py3-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
# v3000-py2-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
v3000-py2-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
# v3000-py2-arch-base-latest-3000-8-py2: {extends: '.test_instance'}

###############################################################################
# `release` stage: `semantic-release`
Expand Down
96 changes: 47 additions & 49 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,55 +83,53 @@ 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=v3002-py3-debian-10-3002-2-py3
- env: INSTANCE=v3002-py3-debian-9-3002-2-py3
- env: INSTANCE=v3002-py3-ubuntu-2004-3002-2-py3
- env: INSTANCE=v3002-py3-ubuntu-1804-3002-2-py3
- env: INSTANCE=v3002-py3-ubuntu-1604-3002-2-py3
- env: INSTANCE=v3002-py3-centos-8-3002-2-py3
- env: INSTANCE=v3002-py3-centos-7-3002-2-py3
- env: INSTANCE=v3002-py3-fedora-33-3002-2-py3
# - env: INSTANCE=v3002-py3-fedora-32-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=v3002-py3-amazonlinux-2-3002-2-py3
- env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3
- env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3
# - env: INSTANCE=v3002-py3-arch-base-latest-3002-2-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3
- env: INSTANCE=v3001-py3-debian-10-3001-4-py3
# - env: INSTANCE=v3001-py3-debian-9-3001-4-py3
- env: INSTANCE=v3001-py3-ubuntu-2004-3001-4-py3
# - env: INSTANCE=v3001-py3-ubuntu-1804-3001-4-py3
# - env: INSTANCE=v3001-py3-ubuntu-1604-3001-4-py3
- env: INSTANCE=v3001-py3-centos-8-3001-4-py3
# - env: INSTANCE=v3001-py3-centos-7-3001-4-py3
# - env: INSTANCE=v3001-py3-fedora-33-3001-4-py3
- env: INSTANCE=v3001-py3-fedora-32-3001-4-py3
# - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-4-py3
# - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-4-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3
# - env: INSTANCE=v3001-py3-arch-base-latest-3001-4-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-6-py3
- env: INSTANCE=v3000-py3-debian-9-3000-6-py3
- env: INSTANCE=v3000-py3-ubuntu-1804-3000-6-py3
# - env: INSTANCE=v3000-py3-ubuntu-1604-3000-6-py3
# - env: INSTANCE=v3000-py3-centos-8-3000-6-py3
- env: INSTANCE=v3000-py3-centos-7-3000-6-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-6-py3
# - env: INSTANCE=v3000-py3-amazonlinux-2-3000-6-py3
# - env: INSTANCE=v3000-py3-oraclelinux-8-3000-6-py3
- env: INSTANCE=v3000-py3-oraclelinux-7-3000-6-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-6-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3
# - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2
- env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-6-py2
- env: INSTANCE=v3002-py3-debian-10-3002-5-py3
- env: INSTANCE=v3002-py3-debian-9-3002-5-py3
- env: INSTANCE=v3002-py3-ubuntu-2004-3002-5-py3
- env: INSTANCE=v3002-py3-ubuntu-1804-3002-5-py3
- env: INSTANCE=v3002-py3-ubuntu-1604-3002-5-py3
- env: INSTANCE=v3002-py3-centos-8-3002-5-py3
- env: INSTANCE=v3002-py3-centos-7-3002-5-py3
- env: INSTANCE=v3002-py3-fedora-33-3002-5-py3
# - env: INSTANCE=v3002-py3-fedora-32-3002-5-py3
- env: INSTANCE=v3002-py3-amazonlinux-2-3002-5-py3
- env: INSTANCE=v3002-py3-oraclelinux-8-3002-5-py3
- env: INSTANCE=v3002-py3-oraclelinux-7-3002-5-py3
# - env: INSTANCE=v3002-py3-arch-base-latest-3002-5-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-5-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-5-py3
- env: INSTANCE=v3001-py3-debian-10-3001-6-py3
# - env: INSTANCE=v3001-py3-debian-9-3001-6-py3
- env: INSTANCE=v3001-py3-ubuntu-2004-3001-6-py3
# - env: INSTANCE=v3001-py3-ubuntu-1804-3001-6-py3
# - env: INSTANCE=v3001-py3-ubuntu-1604-3001-6-py3
- env: INSTANCE=v3001-py3-centos-8-3001-6-py3
# - env: INSTANCE=v3001-py3-centos-7-3001-6-py3
# - env: INSTANCE=v3001-py3-fedora-33-3001-6-py3
- env: INSTANCE=v3001-py3-fedora-32-3001-6-py3
# - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-6-py3
# - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-6-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-6-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-6-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-6-py3
# - env: INSTANCE=v3001-py3-arch-base-latest-3001-6-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-6-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-6-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-8-py3
- env: INSTANCE=v3000-py3-debian-9-3000-8-py3
- env: INSTANCE=v3000-py3-ubuntu-1804-3000-8-py3
# - env: INSTANCE=v3000-py3-ubuntu-1604-3000-8-py3
# - env: INSTANCE=v3000-py3-centos-8-3000-8-py3
- env: INSTANCE=v3000-py3-centos-7-3000-8-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-8-py3
# - env: INSTANCE=v3000-py3-amazonlinux-2-3000-8-py3
# - env: INSTANCE=v3000-py3-oraclelinux-8-3000-8-py3
- env: INSTANCE=v3000-py3-oraclelinux-7-3000-8-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-8-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-8-py3
# - env: INSTANCE=v3000-py2-ubuntu-1804-3000-8-py2
- env: INSTANCE=v3000-py2-ubuntu-1604-3000-8-py2
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-8-py2

## Define the release stage that runs `semantic-release`
- stage: 'release'
Expand Down

0 comments on commit cfefcc8

Please sign in to comment.