Skip to content

Commit

Permalink
ci(kitchen+gitlab): update for new pre-salted images [skip ci]
Browse files Browse the repository at this point in the history
* Automated using myii/ssf-formula#410
  • Loading branch information
myii committed Feb 2, 2022
1 parent 8551ba1 commit c2210ab
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 257 deletions.
36 changes: 2 additions & 34 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ rubocop:
# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# redhat8-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# redhat8-centos-8-tiamat-py3: {extends: '.test_instance'}
# centos-centos-7-tiamat-py3: {extends: '.test_instance'}
# amazon-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
# redhat8-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
Expand All @@ -149,12 +148,9 @@ debian-debian-9-master-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
redhat8-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
redhat8-centos-8-master-py3: {extends: '.test_instance'}
centos-centos-7-master-py3: {extends: '.test_instance'}
# fedora-fedora-34-master-py3: {extends: '.test_instance'}
# fedora-fedora-33-master-py3: {extends: '.test_instance'}
suse-opensuse-leap-153-master-py3: {extends: '.test_instance'}
suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
amazon-amazonlinux-2-master-py3: {extends: '.test_instance'}
redhat8-oraclelinux-8-master-py3: {extends: '.test_instance'}
Expand All @@ -170,12 +166,9 @@ redhat8-rockylinux-8-master-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
# redhat8-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
# redhat8-centos-8-3004-0-py3: {extends: '.test_instance'}
# centos-centos-7-3004-0-py3: {extends: '.test_instance'}
# fedora-fedora-34-3004-0-py3: {extends: '.test_instance'}
# fedora-fedora-33-3004-0-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
# amazon-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
# redhat8-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
Expand All @@ -185,61 +178,36 @@ redhat8-rockylinux-8-master-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
# redhat8-almalinux-8-3004-0-py3: {extends: '.test_instance'}
# redhat8-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
# debian-debian-11-3003-3-py3: {extends: '.test_instance'}
# debian-debian-10-3003-3-py3: {extends: '.test_instance'}
# debian-debian-9-3003-3-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
# redhat8-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# redhat8-centos-8-3003-3-py3: {extends: '.test_instance'}
# centos-centos-7-3003-3-py3: {extends: '.test_instance'}
# fedora-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# fedora-fedora-34-3003-3-py3: {extends: '.test_instance'}
# fedora-fedora-33-3003-3-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# amazon-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
# redhat8-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
# centos-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
# arch-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
# redhat8-almalinux-8-3003-3-py3: {extends: '.test_instance'}
# debian-debian-11-3002-7-py3: {extends: '.test_instance'}
# debian-debian-10-3002-7-py3: {extends: '.test_instance'}
# debian-debian-9-3002-7-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
# redhat8-centos-8-3002-7-py3: {extends: '.test_instance'}
# centos-centos-7-3002-7-py3: {extends: '.test_instance'}
# fedora-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
# fedora-fedora-34-3002-7-py3: {extends: '.test_instance'}
# fedora-fedora-33-3002-7-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
# amazon-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
# redhat8-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
# centos-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
# arch-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
# debian-debian-10-3001-8-py3: {extends: '.test_instance'}
# debian-debian-9-3001-8-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
# ubuntu-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
# redhat8-centos-8-3001-8-py3: {extends: '.test_instance'}
# centos-centos-7-3001-8-py3: {extends: '.test_instance'}
# fedora-fedora-34-3001-8-py3: {extends: '.test_instance'}
# fedora-fedora-33-3001-8-py3: {extends: '.test_instance'}
# suse-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
# suse-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
# amazon-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
# redhat8-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
# centos-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
# arch-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
# gentoo-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}

###############################################################################
# `release` stage: `semantic-release`
Expand Down
36 changes: 2 additions & 34 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ jobs:
# - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
# - env: INSTANCE=redhat8-centos-stream8-tiamat-py3
# - env: INSTANCE=redhat8-centos-8-tiamat-py3
# - env: INSTANCE=centos-centos-7-tiamat-py3
# - env: INSTANCE=amazon-amazonlinux-2-tiamat-py3
# - env: INSTANCE=redhat8-oraclelinux-8-tiamat-py3
Expand All @@ -102,12 +101,9 @@ jobs:
# - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
- env: INSTANCE=ubuntu-ubuntu-1804-master-py3
- env: INSTANCE=redhat8-centos-stream8-master-py3
- env: INSTANCE=redhat8-centos-8-master-py3
- env: INSTANCE=centos-centos-7-master-py3
# - env: INSTANCE=fedora-fedora-34-master-py3
# - env: INSTANCE=fedora-fedora-33-master-py3
- env: INSTANCE=suse-opensuse-leap-153-master-py3
- env: INSTANCE=suse-opensuse-leap-152-master-py3
- env: INSTANCE=suse-opensuse-tmbl-latest-master-py3
- env: INSTANCE=amazon-amazonlinux-2-master-py3
- env: INSTANCE=redhat8-oraclelinux-8-master-py3
Expand All @@ -123,12 +119,9 @@ jobs:
# - env: INSTANCE=ubuntu-ubuntu-2004-3004-0-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3004-0-py3
# - env: INSTANCE=redhat8-centos-stream8-3004-0-py3
# - env: INSTANCE=redhat8-centos-8-3004-0-py3
# - env: INSTANCE=centos-centos-7-3004-0-py3
# - env: INSTANCE=fedora-fedora-34-3004-0-py3
# - env: INSTANCE=fedora-fedora-33-3004-0-py3
# - env: INSTANCE=suse-opensuse-leap-153-3004-0-py3
# - env: INSTANCE=suse-opensuse-leap-152-3004-0-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3004-0-py3
# - env: INSTANCE=amazon-amazonlinux-2-3004-0-py3
# - env: INSTANCE=redhat8-oraclelinux-8-3004-0-py3
Expand All @@ -138,61 +131,36 @@ jobs:
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3004-0-py3
# - env: INSTANCE=redhat8-almalinux-8-3004-0-py3
# - env: INSTANCE=redhat8-rockylinux-8-3004-0-py3
# - env: INSTANCE=debian-debian-11-3003-3-py3
# - env: INSTANCE=debian-debian-10-3003-3-py3
# - env: INSTANCE=debian-debian-9-3003-3-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3003-3-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3003-3-py3
# - env: INSTANCE=redhat8-centos-stream8-3003-3-py3
# - env: INSTANCE=redhat8-centos-8-3003-3-py3
# - env: INSTANCE=centos-centos-7-3003-3-py3
# - env: INSTANCE=fedora-fedora-35-3003-3-py3
# - env: INSTANCE=fedora-fedora-34-3003-3-py3
# - env: INSTANCE=fedora-fedora-33-3003-3-py3
# - env: INSTANCE=suse-opensuse-leap-153-3003-3-py3
# - env: INSTANCE=suse-opensuse-leap-152-3003-3-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3003-3-py3
# - env: INSTANCE=amazon-amazonlinux-2-3003-3-py3
# - env: INSTANCE=redhat8-oraclelinux-8-3003-3-py3
# - env: INSTANCE=centos-oraclelinux-7-3003-3-py3
# - env: INSTANCE=arch-arch-base-latest-3003-3-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3003-3-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3003-3-py3
# - env: INSTANCE=redhat8-almalinux-8-3003-3-py3
# - env: INSTANCE=debian-debian-11-3002-7-py3
# - env: INSTANCE=debian-debian-10-3002-7-py3
# - env: INSTANCE=debian-debian-9-3002-7-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3002-7-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3002-7-py3
# - env: INSTANCE=redhat8-centos-8-3002-7-py3
# - env: INSTANCE=centos-centos-7-3002-7-py3
# - env: INSTANCE=fedora-fedora-35-3002-7-py3
# - env: INSTANCE=fedora-fedora-34-3002-7-py3
# - env: INSTANCE=fedora-fedora-33-3002-7-py3
# - env: INSTANCE=suse-opensuse-leap-153-3002-7-py3
# - env: INSTANCE=suse-opensuse-leap-152-3002-7-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3002-7-py3
# - env: INSTANCE=amazon-amazonlinux-2-3002-7-py3
# - env: INSTANCE=redhat8-oraclelinux-8-3002-7-py3
# - env: INSTANCE=centos-oraclelinux-7-3002-7-py3
# - env: INSTANCE=arch-arch-base-latest-3002-7-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3002-7-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3002-7-py3
# - env: INSTANCE=debian-debian-10-3001-8-py3
# - env: INSTANCE=debian-debian-9-3001-8-py3
# - env: INSTANCE=ubuntu-ubuntu-2004-3001-8-py3
# - env: INSTANCE=ubuntu-ubuntu-1804-3001-8-py3
# - env: INSTANCE=redhat8-centos-8-3001-8-py3
# - env: INSTANCE=centos-centos-7-3001-8-py3
# - env: INSTANCE=fedora-fedora-34-3001-8-py3
# - env: INSTANCE=fedora-fedora-33-3001-8-py3
# - env: INSTANCE=suse-opensuse-leap-153-3001-8-py3
# - env: INSTANCE=suse-opensuse-leap-152-3001-8-py3
# - env: INSTANCE=suse-opensuse-tmbl-latest-3001-8-py3
# - env: INSTANCE=amazon-amazonlinux-2-3001-8-py3
# - env: INSTANCE=redhat8-oraclelinux-8-3001-8-py3
# - env: INSTANCE=centos-oraclelinux-7-3001-8-py3
# - env: INSTANCE=arch-arch-base-latest-3001-8-py3
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3001-8-py3
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-8-py3

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

0 comments on commit c2210ab

Please sign in to comment.