Skip to content

Commit

Permalink
ci(kitchen+ci): update with pre-salted images [skip ci]
Browse files Browse the repository at this point in the history 
* Automated using myii/ssf-formula#385
  • Loading branch information
@myii
myii committed Nov 22, 2021
1 parent 2b970e1 commit 3af1d21
Show file tree
Hide file tree
Showing 5 changed files with 241 additions and 28 deletions.
63 changes: 58 additions & 5 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ rubocop:
###############################################################################
# Define `test` template
###############################################################################
.test_instance:
.test_instance: &test_instance
stage: *stage_test
image: *image_dindruby
services: *services_docker_dind
Expand All @@ -117,6 +117,13 @@ rubocop:
# Alternative value to consider: `${CI_JOB_NAME}`
- 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'

###############################################################################
# Define `test` template (`allow_failure: true`)
###############################################################################
.test_instance_failure_permitted:
<<: *test_instance
allow_failure: true

###############################################################################
# `test` stage: each instance below uses the `test` template above
###############################################################################
Expand All @@ -130,6 +137,7 @@ domains-debian-10-tiamat-py3: {extends: '.test_instance'}
# git-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
domains-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# git-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# git-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# git-centos-8-tiamat-py3: {extends: '.test_instance'}
# git-centos-7-tiamat-py3: {extends: '.test_instance'}
# git-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
Expand All @@ -140,52 +148,97 @@ domains-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# git-debian-11-master-py3: {extends: '.test_instance'}
deb-debian-11-master-py3: {extends: '.test_instance'}
# domains-debian-11-master-py3: {extends: '.test_instance'}
# pip-debian-11-master-py3: {extends: '.test_instance'}
# git-debian-10-master-py3: {extends: '.test_instance'}
deb-debian-10-master-py3: {extends: '.test_instance'}
# domains-debian-10-master-py3: {extends: '.test_instance'}
# pip-debian-10-master-py3: {extends: '.test_instance'}
# git-debian-9-master-py3: {extends: '.test_instance'}
deb-debian-9-master-py3: {extends: '.test_instance'}
# domains-debian-9-master-py3: {extends: '.test_instance'}
# pip-debian-9-master-py3: {extends: '.test_instance'}
git-ubuntu-2004-master-py3: {extends: '.test_instance'}
# domains-ubuntu-2004-master-py3: {extends: '.test_instance'}
# pip-ubuntu-2004-master-py3: {extends: '.test_instance'}
git-ubuntu-1804-master-py3: {extends: '.test_instance'}
# domains-ubuntu-1804-master-py3: {extends: '.test_instance'}
# pip-ubuntu-1804-master-py3: {extends: '.test_instance'}
# git-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
rpm-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
# pip-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
# git-centos-8-master-py3: {extends: '.test_instance'}
rpm-centos-8-master-py3: {extends: '.test_instance'}
# pip-centos-8-master-py3: {extends: '.test_instance'}
# git-centos-7-master-py3: {extends: '.test_instance'}
rpm-centos-7-master-py3: {extends: '.test_instance'}
# pip-centos-7-master-py3: {extends: '.test_instance'}
# git-fedora-34-master-py3: {extends: '.test_instance'}
rpm-fedora-34-master-py3: {extends: '.test_instance'}
# pip-fedora-34-master-py3: {extends: '.test_instance'}
# git-fedora-33-master-py3: {extends: '.test_instance'}
rpm-fedora-33-master-py3: {extends: '.test_instance'}
# pip-fedora-33-master-py3: {extends: '.test_instance'}
git-opensuse-leap-153-master-py3: {extends: '.test_instance'}
# pip-opensuse-leap-153-master-py3: {extends: '.test_instance'}
git-opensuse-leap-152-master-py3: {extends: '.test_instance'}
git-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
# pip-opensuse-leap-152-master-py3: {extends: '.test_instance'}
git-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
# pip-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
# git-amazonlinux-2-master-py3: {extends: '.test_instance'}
rpm-amazonlinux-2-master-py3: {extends: '.test_instance'}
# pip-amazonlinux-2-master-py3: {extends: '.test_instance'}
# git-oraclelinux-8-master-py3: {extends: '.test_instance'}
rpm-oraclelinux-8-master-py3: {extends: '.test_instance'}
# pip-oraclelinux-8-master-py3: {extends: '.test_instance'}
# git-oraclelinux-7-master-py3: {extends: '.test_instance'}
# rpm-oraclelinux-7-master-py3: {extends: '.test_instance'}
# pip-oraclelinux-7-master-py3: {extends: '.test_instance'}
git-arch-base-latest-master-py3: {extends: '.test_instance'}
# pip-arch-base-latest-master-py3: {extends: '.test_instance'}
git-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# pip-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# pip-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# git-almalinux-8-master-py3: {extends: '.test_instance'}
rpm-almalinux-8-master-py3: {extends: '.test_instance'}
# pip-almalinux-8-master-py3: {extends: '.test_instance'}
# git-rockylinux-8-master-py3: {extends: '.test_instance'}
rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
# pip-rockylinux-8-master-py3: {extends: '.test_instance'}
# git-debian-11-3004-0-py3: {extends: '.test_instance'}
# git-debian-10-3004-0-py3: {extends: '.test_instance'}
# git-debian-9-3004-0-py3: {extends: '.test_instance'}
# git-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
# git-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
# git-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
# git-centos-8-3004-0-py3: {extends: '.test_instance'}
# git-centos-7-3004-0-py3: {extends: '.test_instance'}
# git-fedora-34-3004-0-py3: {extends: '.test_instance'}
# git-fedora-33-3004-0-py3: {extends: '.test_instance'}
# git-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
# git-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
# git-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
# git-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
# git-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
# git-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
# git-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
# git-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
# git-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
# git-almalinux-8-3004-0-py3: {extends: '.test_instance'}
# git-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
# git-debian-11-3003-3-py3: {extends: '.test_instance'}
# git-debian-10-3003-3-py3: {extends: '.test_instance'}
# git-debian-9-3003-3-py3: {extends: '.test_instance'}
# git-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# git-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
# git-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# git-centos-8-3003-3-py3: {extends: '.test_instance'}
# git-centos-7-3003-3-py3: {extends: '.test_instance'}
# git-fedora-34-3003-3-py3: {extends: '.test_instance'}
# git-fedora-33-3003-3-py3: {extends: '.test_instance'}
# git-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
# git-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
# git-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
# git-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# git-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
# git-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
# git-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
Expand All @@ -204,7 +257,7 @@ rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
# git-fedora-33-3002-7-py3: {extends: '.test_instance'}
# git-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
# git-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
# git-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'}
# git-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
# git-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
# git-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
# git-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
Expand All @@ -221,7 +274,7 @@ rpm-rockylinux-8-master-py3: {extends: '.test_instance'}
# git-fedora-33-3001-8-py3: {extends: '.test_instance'}
# git-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
# git-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
# git-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'}
# git-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
# git-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
# git-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
# git-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
Expand Down
46 changes: 46 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ jobs:
# - env: INSTANCE=git-ubuntu-2004-tiamat-py3
- env: INSTANCE=domains-ubuntu-2004-tiamat-py3
# - env: INSTANCE=git-ubuntu-1804-tiamat-py3
# - env: INSTANCE=git-centos-stream8-tiamat-py3
# - env: INSTANCE=git-centos-8-tiamat-py3
# - env: INSTANCE=git-centos-7-tiamat-py3
# - env: INSTANCE=git-amazonlinux-2-tiamat-py3
Expand All @@ -100,45 +101,90 @@ jobs:
# - env: INSTANCE=git-debian-11-master-py3
- env: INSTANCE=deb-debian-11-master-py3
# - env: INSTANCE=domains-debian-11-master-py3
# - env: INSTANCE=pip-debian-11-master-py3
# - env: INSTANCE=git-debian-10-master-py3
- env: INSTANCE=deb-debian-10-master-py3
# - env: INSTANCE=domains-debian-10-master-py3
# - env: INSTANCE=pip-debian-10-master-py3
# - env: INSTANCE=git-debian-9-master-py3
- env: INSTANCE=deb-debian-9-master-py3
# - env: INSTANCE=domains-debian-9-master-py3
# - env: INSTANCE=pip-debian-9-master-py3
- env: INSTANCE=git-ubuntu-2004-master-py3
# - env: INSTANCE=domains-ubuntu-2004-master-py3
# - env: INSTANCE=pip-ubuntu-2004-master-py3
- env: INSTANCE=git-ubuntu-1804-master-py3
# - env: INSTANCE=domains-ubuntu-1804-master-py3
# - env: INSTANCE=pip-ubuntu-1804-master-py3
# - env: INSTANCE=git-centos-stream8-master-py3
- env: INSTANCE=rpm-centos-stream8-master-py3
# - env: INSTANCE=pip-centos-stream8-master-py3
# - env: INSTANCE=git-centos-8-master-py3
- env: INSTANCE=rpm-centos-8-master-py3
# - env: INSTANCE=pip-centos-8-master-py3
# - env: INSTANCE=git-centos-7-master-py3
- env: INSTANCE=rpm-centos-7-master-py3
# - env: INSTANCE=pip-centos-7-master-py3
# - env: INSTANCE=git-fedora-34-master-py3
- env: INSTANCE=rpm-fedora-34-master-py3
# - env: INSTANCE=pip-fedora-34-master-py3
# - env: INSTANCE=git-fedora-33-master-py3
- env: INSTANCE=rpm-fedora-33-master-py3
# - env: INSTANCE=pip-fedora-33-master-py3
- env: INSTANCE=git-opensuse-leap-153-master-py3
# - env: INSTANCE=pip-opensuse-leap-153-master-py3
- env: INSTANCE=git-opensuse-leap-152-master-py3
# - env: INSTANCE=pip-opensuse-leap-152-master-py3
- env: INSTANCE=git-opensuse-tmbl-latest-master-py3
# - env: INSTANCE=pip-opensuse-tmbl-latest-master-py3
# - env: INSTANCE=git-amazonlinux-2-master-py3
- env: INSTANCE=rpm-amazonlinux-2-master-py3
# - env: INSTANCE=pip-amazonlinux-2-master-py3
# - env: INSTANCE=git-oraclelinux-8-master-py3
- env: INSTANCE=rpm-oraclelinux-8-master-py3
# - env: INSTANCE=pip-oraclelinux-8-master-py3
# - env: INSTANCE=git-oraclelinux-7-master-py3
# - env: INSTANCE=rpm-oraclelinux-7-master-py3
# - env: INSTANCE=pip-oraclelinux-7-master-py3
- env: INSTANCE=git-arch-base-latest-master-py3
# - env: INSTANCE=pip-arch-base-latest-master-py3
- env: INSTANCE=git-gentoo-stage3-latest-master-py3
# - env: INSTANCE=pip-gentoo-stage3-latest-master-py3
- env: INSTANCE=git-gentoo-stage3-systemd-master-py3
# - env: INSTANCE=pip-gentoo-stage3-systemd-master-py3
# - env: INSTANCE=git-almalinux-8-master-py3
- env: INSTANCE=rpm-almalinux-8-master-py3
# - env: INSTANCE=pip-almalinux-8-master-py3
# - env: INSTANCE=git-rockylinux-8-master-py3
- env: INSTANCE=rpm-rockylinux-8-master-py3
# - env: INSTANCE=pip-rockylinux-8-master-py3
# - env: INSTANCE=git-debian-11-3004-0-py3
# - env: INSTANCE=git-debian-10-3004-0-py3
# - env: INSTANCE=git-debian-9-3004-0-py3
# - env: INSTANCE=git-ubuntu-2004-3004-0-py3
# - env: INSTANCE=git-ubuntu-1804-3004-0-py3
# - env: INSTANCE=git-centos-stream8-3004-0-py3
# - env: INSTANCE=git-centos-8-3004-0-py3
# - env: INSTANCE=git-centos-7-3004-0-py3
# - env: INSTANCE=git-fedora-34-3004-0-py3
# - env: INSTANCE=git-fedora-33-3004-0-py3
# - env: INSTANCE=git-opensuse-leap-153-3004-0-py3
# - env: INSTANCE=git-opensuse-leap-152-3004-0-py3
# - env: INSTANCE=git-opensuse-tmbl-latest-3004-0-py3
# - env: INSTANCE=git-amazonlinux-2-3004-0-py3
# - env: INSTANCE=git-oraclelinux-8-3004-0-py3
# - env: INSTANCE=git-oraclelinux-7-3004-0-py3
# - env: INSTANCE=git-arch-base-latest-3004-0-py3
# - env: INSTANCE=git-gentoo-stage3-latest-3004-0-py3
# - env: INSTANCE=git-gentoo-stage3-systemd-3004-0-py3
# - env: INSTANCE=git-almalinux-8-3004-0-py3
# - env: INSTANCE=git-rockylinux-8-3004-0-py3
# - env: INSTANCE=git-debian-11-3003-3-py3
# - env: INSTANCE=git-debian-10-3003-3-py3
# - env: INSTANCE=git-debian-9-3003-3-py3
# - env: INSTANCE=git-ubuntu-2004-3003-3-py3
# - env: INSTANCE=git-ubuntu-1804-3003-3-py3
# - env: INSTANCE=git-centos-stream8-3003-3-py3
# - env: INSTANCE=git-centos-8-3003-3-py3
# - env: INSTANCE=git-centos-7-3003-3-py3
# - env: INSTANCE=git-fedora-34-3003-3-py3
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
/test/integration/**/libraries/system.rb @saltstack-formulas/ssf
/test/integration/**/inspec.yml @saltstack-formulas/ssf
/test/integration/**/README.md @saltstack-formulas/ssf
/test/salt/pillar/top.sls @saltstack-formulas/ssf
/.gitignore @saltstack-formulas/ssf
/.cirrus.yml @saltstack-formulas/ssf
/.gitlab-ci.yml @saltstack-formulas/ssf
Expand Down
Loading

0 comments on commit 3af1d21

Please sign in to comment.