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 5a22859 commit ca24121
Show file tree
Hide file tree
Showing 4 changed files with 241 additions and 238 deletions.
90 changes: 45 additions & 45 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 @@ -149,52 +149,52 @@ redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# debian-debian-10-3002-2-py3: {extends: '.test_instance'}
# debian-debian-9-3002-2-py3: {extends: '.test_instance'}
# debian-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
# debian-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
# debian-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
# redhat-centos-8-3002-2-py3: {extends: '.test_instance'}
# redhat-centos-7-3002-2-py3: {extends: '.test_instance'}
# redhat-fedora-33-3002-2-py3: {extends: '.test_instance'}
# redhat-fedora-32-3002-2-py3: {extends: '.test_instance'}
# debian-debian-10-3002-5-py3: {extends: '.test_instance'}
# debian-debian-9-3002-5-py3: {extends: '.test_instance'}
# debian-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
# debian-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
# debian-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
# redhat-centos-8-3002-5-py3: {extends: '.test_instance'}
# redhat-centos-7-3002-5-py3: {extends: '.test_instance'}
# redhat-fedora-33-3002-5-py3: {extends: '.test_instance'}
# redhat-fedora-32-3002-5-py3: {extends: '.test_instance'}
# amazonlinux-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
# amazonlinux-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
# debian-debian-10-3001-4-py3: {extends: '.test_instance'}
# debian-debian-9-3001-4-py3: {extends: '.test_instance'}
# debian-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
# debian-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
# debian-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
# redhat-centos-8-3001-4-py3: {extends: '.test_instance'}
# redhat-centos-7-3001-4-py3: {extends: '.test_instance'}
# redhat-fedora-33-3001-4-py3: {extends: '.test_instance'}
# redhat-fedora-32-3001-4-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'}
# amazonlinux-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
# debian-debian-10-3000-6-py3: {extends: '.test_instance'}
# debian-debian-9-3000-6-py3: {extends: '.test_instance'}
# debian-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
# debian-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
# redhat-centos-8-3000-6-py3: {extends: '.test_instance'}
# redhat-centos-7-3000-6-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
# amazonlinux-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
# debian-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
# debian-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
# debian-debian-10-3001-6-py3: {extends: '.test_instance'}
# debian-debian-9-3001-6-py3: {extends: '.test_instance'}
# debian-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
# debian-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
# debian-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
# redhat-centos-8-3001-6-py3: {extends: '.test_instance'}
# redhat-centos-7-3001-6-py3: {extends: '.test_instance'}
# redhat-fedora-33-3001-6-py3: {extends: '.test_instance'}
# redhat-fedora-32-3001-6-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
# amazonlinux-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
# debian-debian-10-3000-8-py3: {extends: '.test_instance'}
# debian-debian-9-3000-8-py3: {extends: '.test_instance'}
# debian-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
# debian-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
# redhat-centos-8-3000-8-py3: {extends: '.test_instance'}
# redhat-centos-7-3000-8-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
# amazonlinux-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
# redhat-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
# redhat-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
# debian-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
# debian-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}

###############################################################################
# `release` stage: `semantic-release`
Expand Down
88 changes: 44 additions & 44 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,52 +109,52 @@ jobs:
- env: INSTANCE=redhat-oraclelinux-7-master-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-master-py3
- env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
# - env: INSTANCE=debian-debian-10-3002-2-py3
# - env: INSTANCE=debian-debian-9-3002-2-py3
# - env: INSTANCE=debian-ubuntu-2004-3002-2-py3
# - env: INSTANCE=debian-ubuntu-1804-3002-2-py3
# - env: INSTANCE=debian-ubuntu-1604-3002-2-py3
# - env: INSTANCE=redhat-centos-8-3002-2-py3
# - env: INSTANCE=redhat-centos-7-3002-2-py3
# - env: INSTANCE=redhat-fedora-33-3002-2-py3
# - env: INSTANCE=redhat-fedora-32-3002-2-py3
# - env: INSTANCE=debian-debian-10-3002-5-py3
# - env: INSTANCE=debian-debian-9-3002-5-py3
# - env: INSTANCE=debian-ubuntu-2004-3002-5-py3
# - env: INSTANCE=debian-ubuntu-1804-3002-5-py3
# - env: INSTANCE=debian-ubuntu-1604-3002-5-py3
# - env: INSTANCE=redhat-centos-8-3002-5-py3
# - env: INSTANCE=redhat-centos-7-3002-5-py3
# - env: INSTANCE=redhat-fedora-33-3002-5-py3
# - env: INSTANCE=redhat-fedora-32-3002-5-py3
# - env: INSTANCE=amazonlinux-amazonlinux-2-3002-5-py3
# - env: INSTANCE=redhat-oraclelinux-8-3002-5-py3
# - env: INSTANCE=redhat-oraclelinux-7-3002-5-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3002-5-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3002-5-py3
# - env: INSTANCE=suse-opensuse-leap-152-3002-2-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3002-2-py3
# - env: INSTANCE=amazonlinux-amazonlinux-2-3002-2-py3
# - env: INSTANCE=redhat-oraclelinux-8-3002-2-py3
# - env: INSTANCE=redhat-oraclelinux-7-3002-2-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3002-2-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3002-2-py3
# - env: INSTANCE=debian-debian-10-3001-4-py3
# - env: INSTANCE=debian-debian-9-3001-4-py3
# - env: INSTANCE=debian-ubuntu-2004-3001-4-py3
# - env: INSTANCE=debian-ubuntu-1804-3001-4-py3
# - env: INSTANCE=debian-ubuntu-1604-3001-4-py3
# - env: INSTANCE=redhat-centos-8-3001-4-py3
# - env: INSTANCE=redhat-centos-7-3001-4-py3
# - env: INSTANCE=redhat-fedora-33-3001-4-py3
# - env: INSTANCE=redhat-fedora-32-3001-4-py3
# - env: INSTANCE=suse-opensuse-leap-152-3001-4-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3001-4-py3
# - env: INSTANCE=amazonlinux-amazonlinux-2-3001-4-py3
# - env: INSTANCE=redhat-oraclelinux-8-3001-4-py3
# - env: INSTANCE=redhat-oraclelinux-7-3001-4-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3001-4-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-4-py3
# - env: INSTANCE=debian-debian-10-3000-6-py3
# - env: INSTANCE=debian-debian-9-3000-6-py3
# - env: INSTANCE=debian-ubuntu-1804-3000-6-py3
# - env: INSTANCE=debian-ubuntu-1604-3000-6-py3
# - env: INSTANCE=redhat-centos-8-3000-6-py3
# - env: INSTANCE=redhat-centos-7-3000-6-py3
# - env: INSTANCE=suse-opensuse-leap-152-3000-6-py3
# - env: INSTANCE=amazonlinux-amazonlinux-2-3000-6-py3
# - env: INSTANCE=redhat-oraclelinux-8-3000-6-py3
# - env: INSTANCE=redhat-oraclelinux-7-3000-6-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3000-6-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3000-6-py3
# - env: INSTANCE=debian-ubuntu-1804-3000-6-py2
# - env: INSTANCE=debian-ubuntu-1604-3000-6-py2
# - env: INSTANCE=debian-debian-10-3001-6-py3
# - env: INSTANCE=debian-debian-9-3001-6-py3
# - env: INSTANCE=debian-ubuntu-2004-3001-6-py3
# - env: INSTANCE=debian-ubuntu-1804-3001-6-py3
# - env: INSTANCE=debian-ubuntu-1604-3001-6-py3
# - env: INSTANCE=redhat-centos-8-3001-6-py3
# - env: INSTANCE=redhat-centos-7-3001-6-py3
# - env: INSTANCE=redhat-fedora-33-3001-6-py3
# - env: INSTANCE=redhat-fedora-32-3001-6-py3
# - env: INSTANCE=suse-opensuse-leap-152-3001-6-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3001-6-py3
# - env: INSTANCE=amazonlinux-amazonlinux-2-3001-6-py3
# - env: INSTANCE=redhat-oraclelinux-8-3001-6-py3
# - env: INSTANCE=redhat-oraclelinux-7-3001-6-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3001-6-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-6-py3
# - env: INSTANCE=debian-debian-10-3000-8-py3
# - env: INSTANCE=debian-debian-9-3000-8-py3
# - env: INSTANCE=debian-ubuntu-1804-3000-8-py3
# - env: INSTANCE=debian-ubuntu-1604-3000-8-py3
# - env: INSTANCE=redhat-centos-8-3000-8-py3
# - env: INSTANCE=redhat-centos-7-3000-8-py3
# - env: INSTANCE=suse-opensuse-leap-152-3000-8-py3
# - env: INSTANCE=amazonlinux-amazonlinux-2-3000-8-py3
# - env: INSTANCE=redhat-oraclelinux-8-3000-8-py3
# - env: INSTANCE=redhat-oraclelinux-7-3000-8-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3000-8-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3000-8-py3
# - env: INSTANCE=debian-ubuntu-1804-3000-8-py2
# - env: INSTANCE=debian-ubuntu-1604-3000-8-py2

## Define the release stage that runs `semantic-release`
- stage: 'release'
Expand Down
1 change: 1 addition & 0 deletions .yamllint
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ ignore: |
node_modules/
test/**/states/**/*.sls
.kitchen/
test/salt/pillar/redhat.sls
yaml-files:
# Default settings
Expand Down
Loading

0 comments on commit ca24121

Please sign in to comment.