ci(kitchen+ci): update with 3004 pre-salted images/boxes [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/385
This commit is contained in:
Imran Iqbal
parent
92958d3ac8
commit
1ae87ddb8a
4 changed files with 159 additions and 7 deletions
|
|
@ -102,7 +102,7 @@ rubocop:
|
|||
###############################################################################
|
||||
# Define `test` template
|
||||
###############################################################################
|
||||
.test_instance:
|
||||
.test_instance: &test_instance
|
||||
stage: *stage_test
|
||||
image: *image_dindruby
|
||||
services: *services_docker_dind
|
||||
|
|
@ -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
|
||||
###############################################################################
|
||||
|
|
@ -128,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'}
|
||||
|
|
@ -150,6 +158,9 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
|
|||
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
|
||||
# appended-ubuntu-1804-master-py3: {extends: '.test_instance'}
|
||||
ubuntu-1804-master-py3: {extends: '.test_instance'}
|
||||
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# appended-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
|
||||
centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-centos-8-master-py3: {extends: '.test_instance'}
|
||||
# appended-centos-8-master-py3: {extends: '.test_instance'}
|
||||
centos-8-master-py3: {extends: '.test_instance'}
|
||||
|
|
@ -168,9 +179,9 @@ opensuse-leap-153-master-py3: {extends: '.test_instance'}
|
|||
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
|
||||
# appended-opensuse-leap-152-master-py3: {extends: '.test_instance'}
|
||||
opensuse-leap-152-master-py3: {extends: '.test_instance'}
|
||||
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
|
||||
# appended-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
|
||||
opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
|
||||
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# appended-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
|
||||
opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
|
||||
# appended-amazonlinux-2-master-py3: {extends: '.test_instance'}
|
||||
amazonlinux-2-master-py3: {extends: '.test_instance'}
|
||||
|
|
@ -195,18 +206,40 @@ almalinux-8-master-py3: {extends: '.test_instance'}
|
|||
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
|
||||
# appended-rockylinux-8-master-py3: {extends: '.test_instance'}
|
||||
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-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-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-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'}
|
||||
|
|
@ -225,7 +258,7 @@ rockylinux-8-master-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'}
|
||||
|
|
@ -242,7 +275,7 @@ rockylinux-8-master-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'}
|
||||
|
|
|
|||
26
.travis.yml
26
.travis.yml
|
|
@ -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
|
||||
|
|
@ -110,6 +111,9 @@ jobs:
|
|||
# - env: INSTANCE=default-ubuntu-1804-master-py3
|
||||
# - env: INSTANCE=appended-ubuntu-1804-master-py3
|
||||
- env: INSTANCE=ubuntu-1804-master-py3
|
||||
# - env: INSTANCE=default-centos-stream8-master-py3
|
||||
# - env: INSTANCE=appended-centos-stream8-master-py3
|
||||
- env: INSTANCE=centos-stream8-master-py3
|
||||
# - env: INSTANCE=default-centos-8-master-py3
|
||||
# - env: INSTANCE=appended-centos-8-master-py3
|
||||
- env: INSTANCE=centos-8-master-py3
|
||||
|
|
@ -155,11 +159,33 @@ jobs:
|
|||
# - env: INSTANCE=default-rockylinux-8-master-py3
|
||||
# - env: INSTANCE=appended-rockylinux-8-master-py3
|
||||
- env: INSTANCE=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-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-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
|
||||
|
|
|
|||
|
|
@ -26,6 +26,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
|
||||
|
|
|
|||
92
kitchen.yml
92
kitchen.yml
|
|
@ -40,6 +40,9 @@ platforms:
|
|||
driver:
|
||||
image: saltimages/salt-tiamat-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:centos-stream8
|
||||
- name: centos-8-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:centos-8
|
||||
|
|
@ -83,6 +86,9 @@ platforms:
|
|||
driver:
|
||||
image: saltimages/salt-master-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:centos-stream8
|
||||
- name: centos-8-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:centos-8
|
||||
|
|
@ -142,6 +148,89 @@ platforms:
|
|||
driver:
|
||||
image: saltimages/salt-master-py3:rockylinux-8
|
||||
|
||||
## SALT `3004.0`
|
||||
- name: debian-11-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:debian-11
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-10-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:debian-9
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2004-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:ubuntu-20.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:centos-stream8
|
||||
- name: centos-8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:centos-8
|
||||
- name: centos-7-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:centos-7
|
||||
- name: fedora-34-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:fedora-34
|
||||
- name: fedora-33-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:fedora-33
|
||||
- name: opensuse-leap-153-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
|
||||
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
|
||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||
transport:
|
||||
max_ssh_sessions: 1
|
||||
- name: opensuse-leap-152-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:opensuse-leap-15.2
|
||||
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
|
||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||
transport:
|
||||
max_ssh_sessions: 1
|
||||
- name: opensuse-tmbl-latest-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
|
||||
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
|
||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||
transport:
|
||||
max_ssh_sessions: 1
|
||||
- name: amazonlinux-2-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:oraclelinux-7
|
||||
- name: arch-base-latest-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:arch-base-latest
|
||||
- name: gentoo-stage3-latest-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
|
||||
run_command: /sbin/init
|
||||
- name: gentoo-stage3-systemd-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
|
||||
- name: almalinux-8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:almalinux-8
|
||||
- name: rockylinux-8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:rockylinux-8
|
||||
|
||||
## SALT `3003.3`
|
||||
- name: debian-11-3003-3-py3
|
||||
driver:
|
||||
|
|
@ -163,6 +252,9 @@ platforms:
|
|||
driver:
|
||||
image: saltimages/salt-3003.3-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.3-py3:centos-stream8
|
||||
- name: centos-8-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.3-py3:centos-8
|
||||
|
|
|
|||
Loading…
Reference in a new issue