Skip to content
Snippets Groups Projects
Unverified Commit 8947cc48 authored by Imran Iqbal's avatar Imran Iqbal
Browse files

ci(kitchen+ci): update with `3004` pre-salted images/boxes [skip ci]

parent 505eb93e
Branches
No related tags found
No related merge requests found
......@@ -18,8 +18,8 @@ jobs:
# - freebsd-130-master-py3
- default-freebsd-122-master-py3
# - freebsd-122-master-py3
# - default-freebsd-130-3003-1-py3
# - default-freebsd-122-3003-1-py3
# - default-freebsd-130-3004-0-py3
# - default-freebsd-122-3004-0-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
......
......@@ -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'}
......@@ -157,6 +158,9 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# repo-ubuntu-1804-master-py3: {extends: '.test_instance'}
ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
# repo-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'}
# repo-centos-8-master-py3: {extends: '.test_instance'}
centos-8-master-py3: {extends: '.test_instance'}
......@@ -175,8 +179,8 @@ opensuse-leap-153-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
# repo-opensuse-leap-152-master-py3: {extends: '.test_instance_failure_permitted'}
opensuse-leap-152-master-py3: {extends: '.test_instance_failure_permitted'}
default-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'}
# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
# repo-amazonlinux-2-master-py3: {extends: '.test_instance'}
amazonlinux-2-master-py3: {extends: '.test_instance'}
......@@ -198,18 +202,40 @@ almalinux-8-master-py3: {extends: '.test_instance'}
# default-rockylinux-8-master-py3: {extends: '.test_instance'}
# repo-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'}
......@@ -228,7 +254,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'}
......@@ -245,7 +271,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'}
......
......@@ -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=repo-ubuntu-1804-master-py3
- env: INSTANCE=ubuntu-1804-master-py3
# - env: INSTANCE=default-centos-stream8-master-py3
# - env: INSTANCE=repo-centos-stream8-master-py3
- env: INSTANCE=centos-stream8-master-py3
# - env: INSTANCE=default-centos-8-master-py3
# - env: INSTANCE=repo-centos-8-master-py3
- env: INSTANCE=centos-8-master-py3
......@@ -151,11 +155,33 @@ jobs:
# - env: INSTANCE=default-rockylinux-8-master-py3
# - env: INSTANCE=repo-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
......
......@@ -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
......
......@@ -25,10 +25,10 @@ platforms:
- name: freebsd-122-master-py3
driver:
box: myii/freebsd-12.2-master-py3
- name: freebsd-130-3003-1-py3
- name: freebsd-130-3004-0-py3
driver:
box: myii/freebsd-13.0-3003.1-py3
box: myii/freebsd-13.0-3004.0-py3
synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
- name: freebsd-122-3003-1-py3
- name: freebsd-122-3004-0-py3
driver:
box: myii/freebsd-12.2-3003.1-py3
box: myii/freebsd-12.2-3004.0-py3
......@@ -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
......@@ -396,6 +488,7 @@ suites:
- debian-9-tiamat-py3
- ubuntu-2004-tiamat-py3
- ubuntu-1804-tiamat-py3
- centos-stream8-tiamat-py3
- centos-8-tiamat-py3
- centos-7-tiamat-py3
- amazonlinux-2-tiamat-py3
......@@ -408,6 +501,7 @@ suites:
- debian-9-master-py3
- ubuntu-2004-master-py3
- ubuntu-1804-master-py3
- centos-stream8-master-py3
- centos-8-master-py3
- centos-7-master-py3
- fedora-34-master-py3
......@@ -419,11 +513,29 @@ suites:
- oraclelinux-7-master-py3
- almalinux-8-master-py3
- rockylinux-8-master-py3
- debian-11-3004-0-py3
- debian-10-3004-0-py3
- debian-9-3004-0-py3
- ubuntu-2004-3004-0-py3
- ubuntu-1804-3004-0-py3
- centos-stream8-3004-0-py3
- centos-8-3004-0-py3
- centos-7-3004-0-py3
- fedora-34-3004-0-py3
- fedora-33-3004-0-py3
- opensuse-leap-153-3004-0-py3
- opensuse-leap-152-3004-0-py3
- amazonlinux-2-3004-0-py3
- oraclelinux-8-3004-0-py3
- oraclelinux-7-3004-0-py3
- almalinux-8-3004-0-py3
- rockylinux-8-3004-0-py3
- debian-11-3003-3-py3
- debian-10-3003-3-py3
- debian-9-3003-3-py3
- ubuntu-2004-3003-3-py3
- ubuntu-1804-3003-3-py3
- centos-stream8-3003-3-py3
- centos-8-3003-3-py3
- centos-7-3003-3-py3
- fedora-34-3003-3-py3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment