Skip to content

Commit

Permalink
ci(kitchen+gitlab): adjust matrix to add 3004
Browse files Browse the repository at this point in the history 
* Semi-automated using myii/ssf-formula#385
  • Loading branch information
@myii
myii committed Nov 20, 2021
1 parent f9ff8ea commit 93289f6
Show file tree
Hide file tree
Showing 6 changed files with 251 additions and 47 deletions.
1 change: 0 additions & 1 deletion .github/workflows/kitchen.vagrant.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
- default-freebsd-130-3003-1-py3
- default-freebsd-122-3003-1-py3
- default-openbsd-69-3002-6-py3
# - default-openbsd-68-3001-1-py3
- default-windows-10-latest-py3
- default-windows-81-latest-py3
steps:
Expand Down
66 changes: 45 additions & 21 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ rubocop:
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
Expand All @@ -147,13 +148,14 @@ rubocop:
# default-debian-9-master-py3: {extends: '.test_instance'}
# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-8-master-py3: {extends: '.test_instance'}
# default-centos-7-master-py3: {extends: '.test_instance'}
# default-fedora-34-master-py3: {extends: '.test_instance'}
# default-fedora-33-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
Expand All @@ -162,45 +164,67 @@ rubocop:
# 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-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# default-debian-10-3003-3-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-8-3004-0-py3: {extends: '.test_instance'}
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-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-11-3003-3-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-8-3003-3-py3: {extends: '.test_instance'}
# default-centos-7-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-8-3003-3-py3: {extends: '.test_instance'}
default-centos-7-3003-3-py3: {extends: '.test_instance'}
default-fedora-34-3003-3-py3: {extends: '.test_instance'}
default-fedora-33-3003-3-py3: {extends: '.test_instance'}
default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
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-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-arch-base-latest-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-11-3002-7-py3: {extends: '.test_instance_failure_permitted'}
default-debian-10-3002-7-py3: {extends: '.test_instance'}
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
# default-debian-11-3002-7-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-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
# default-centos-8-3002-7-py3: {extends: '.test_instance'}
default-centos-7-3002-7-py3: {extends: '.test_instance'}
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-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-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
# default-arch-base-latest-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-3001-8-py3: {extends: '.test_instance'}
default-debian-9-3001-8-py3: {extends: '.test_instance'}
# default-debian-9-3001-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
# default-centos-8-3001-8-py3: {extends: '.test_instance'}
Expand All @@ -209,7 +233,7 @@ default-debian-9-3001-8-py3: {extends: '.test_instance'}
# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
Expand Down
56 changes: 40 additions & 16 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
# - env: INSTANCE=default-debian-9-tiamat-py3
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
# - env: INSTANCE=default-centos-stream8-tiamat-py3
# - env: INSTANCE=default-centos-8-tiamat-py3
# - env: INSTANCE=default-centos-7-tiamat-py3
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
Expand All @@ -100,6 +101,7 @@ jobs:
# - env: INSTANCE=default-debian-9-master-py3
# - env: INSTANCE=default-ubuntu-2004-master-py3
# - env: INSTANCE=default-ubuntu-1804-master-py3
# - env: INSTANCE=default-centos-stream8-master-py3
# - env: INSTANCE=default-centos-8-master-py3
# - env: INSTANCE=default-centos-7-master-py3
# - env: INSTANCE=default-fedora-34-master-py3
Expand All @@ -115,45 +117,67 @@ 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-3003-3-py3
# - env: INSTANCE=default-debian-10-3003-3-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-8-3004-0-py3
# - env: INSTANCE=default-centos-7-3004-0-py3
# - env: INSTANCE=default-fedora-34-3004-0-py3
# - env: INSTANCE=default-fedora-33-3004-0-py3
# - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
# - env: INSTANCE=default-opensuse-leap-152-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-11-3003-3-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-8-3003-3-py3
# - env: INSTANCE=default-centos-7-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-8-3003-3-py3
- env: INSTANCE=default-centos-7-3003-3-py3
- env: INSTANCE=default-fedora-34-3003-3-py3
- env: INSTANCE=default-fedora-33-3003-3-py3
- env: INSTANCE=default-opensuse-leap-153-3003-3-py3
# - env: INSTANCE=default-opensuse-leap-152-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-amazonlinux-2-3003-3-py3
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
- env: INSTANCE=default-oraclelinux-7-3003-3-py3
# - env: INSTANCE=default-arch-base-latest-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-almalinux-8-3003-3-py3
# - env: INSTANCE=default-debian-11-3002-7-py3
- env: INSTANCE=default-debian-10-3002-7-py3
# - env: INSTANCE=default-debian-9-3002-7-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-ubuntu-1804-3002-7-py3
# - env: INSTANCE=default-centos-8-3002-7-py3
- env: INSTANCE=default-centos-7-3002-7-py3
# - env: INSTANCE=default-centos-7-3002-7-py3
# - env: INSTANCE=default-fedora-34-3002-7-py3
# - env: INSTANCE=default-fedora-33-3002-7-py3
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
# - env: INSTANCE=default-opensuse-leap-152-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-oraclelinux-7-3002-7-py3
# - env: INSTANCE=default-arch-base-latest-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-3001-8-py3
- env: INSTANCE=default-debian-9-3001-8-py3
# - env: INSTANCE=default-debian-9-3001-8-py3
# - env: INSTANCE=default-ubuntu-2004-3001-8-py3
# - env: INSTANCE=default-ubuntu-1804-3001-8-py3
# - env: INSTANCE=default-centos-8-3001-8-py3
Expand Down
9 changes: 0 additions & 9 deletions kitchen.vagrant.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,6 @@ platforms:
verifier:
inputs:
saltmajorversion: 3002
- name: openbsd-68-3001-1-py3
driver:
box: myii/openbsd-6.8-3001.1-py3
ssh:
shell: /bin/ksh
synced_folders: []
verifier:
inputs:
saltmajorversion: 3001
- name: windows-10-latest-py3
driver:
box: techneg/win10x64-pro-salt
Expand Down
Loading

0 comments on commit 93289f6

Please sign in to comment.