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#426
  • Loading branch information
@myii
myii committed Apr 3, 2022
1 parent bbc8e2d commit 801be3d
Show file tree
Hide file tree
Showing 3 changed files with 154 additions and 230 deletions.
82 changes: 35 additions & 47 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,55 +208,43 @@ default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
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-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-7-3004-0-py3: {extends: '.test_instance'}
# default-fedora-35-3004-0-py3: {extends: '.test_instance'}
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
# default-debian-11-3004-1-py3: {extends: '.test_instance'}
# default-debian-10-3004-1-py3: {extends: '.test_instance'}
# default-debian-9-3004-1-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-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-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-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
# default-fedora-35-3003-3-py3: {extends: '.test_instance'}
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-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-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-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-centos-7-3002-7-py3: {extends: '.test_instance'}
# default-fedora-35-3002-7-py3: {extends: '.test_instance'}
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-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-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
# default-debian-10-3003-4-py3: {extends: '.test_instance'}
# default-debian-9-3003-4-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-7-3003-4-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
# default-debian-9-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
# default-centos-7-3002-8-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
82 changes: 35 additions & 47 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,55 +125,43 @@ 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-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-7-3004-0-py3
# - env: INSTANCE=default-fedora-35-3004-0-py3
# - env: INSTANCE=default-fedora-34-3004-0-py3
# - env: INSTANCE=default-debian-11-3004-1-py3
# - env: INSTANCE=default-debian-10-3004-1-py3
# - env: INSTANCE=default-debian-9-3004-1-py3
# - env: INSTANCE=default-ubuntu-2004-3004-1-py3
# - env: INSTANCE=default-ubuntu-1804-3004-1-py3
# - env: INSTANCE=default-centos-stream8-3004-1-py3
# - env: INSTANCE=default-centos-7-3004-1-py3
# - env: INSTANCE=default-fedora-35-3004-1-py3
# - env: INSTANCE=default-fedora-34-3004-1-py3
# - env: INSTANCE=default-amazonlinux-2-3004-1-py3
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3
# - env: INSTANCE=default-arch-base-latest-3004-1-py3
# - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
# - env: INSTANCE=default-almalinux-8-3004-1-py3
# - env: INSTANCE=default-rockylinux-8-3004-1-py3
# - env: INSTANCE=default-opensuse-leap-153-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-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-stream8-3003-3-py3
# - env: INSTANCE=default-centos-7-3003-3-py3
# - env: INSTANCE=default-fedora-35-3003-3-py3
# - env: INSTANCE=default-fedora-34-3003-3-py3
# - env: INSTANCE=default-opensuse-leap-153-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-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-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-centos-7-3002-7-py3
# - env: INSTANCE=default-fedora-35-3002-7-py3
# - env: INSTANCE=default-fedora-34-3002-7-py3
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
# - 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-gentoo-stage3-latest-3002-7-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
# - env: INSTANCE=default-debian-10-3003-4-py3
# - env: INSTANCE=default-debian-9-3003-4-py3
# - env: INSTANCE=default-ubuntu-2004-3003-4-py3
# - env: INSTANCE=default-ubuntu-1804-3003-4-py3
# - env: INSTANCE=default-centos-stream8-3003-4-py3
# - env: INSTANCE=default-centos-7-3003-4-py3
# - env: INSTANCE=default-amazonlinux-2-3003-4-py3
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
# - env: INSTANCE=default-oraclelinux-7-3003-4-py3
# - env: INSTANCE=default-almalinux-8-3003-4-py3
# - env: INSTANCE=default-debian-10-3002-8-py3
# - env: INSTANCE=default-debian-9-3002-8-py3
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3
# - env: INSTANCE=default-centos-7-3002-8-py3
# - env: INSTANCE=default-amazonlinux-2-3002-8-py3
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
# - env: INSTANCE=default-oraclelinux-7-3002-8-py3
# <REMOVEME

# Test the conversion of `template-formula` into another formula
Expand Down
Loading

0 comments on commit 801be3d

Please sign in to comment.