Browse Source

Merge de5a317e74 into bf52207a9b

pull/558/merge
Dafydd Jones 2 weeks ago
parent
commit
da6d21fba3
No account linked to committer's email address
2 changed files with 21 additions and 3 deletions
  1. +5
    -3
      .gitlab-ci.yml
  2. +16
    -0
      kitchen.yml

+ 5
- 3
.gitlab-ci.yml View File

@@ -162,7 +162,9 @@ 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-3004-1-py3: {extends: '.test_instance'}
default-debian-11-3006-4-py3: {extends: '.test_instance'}
# default-debian-10-3006-4-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-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
@@ -182,8 +184,8 @@ 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-debian-10-3003-4-py3: {extends: '.test_instance'}
default-debian-9-3003-4-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'}

+ 16
- 0
kitchen.yml View File

@@ -244,6 +244,22 @@ platforms:
inputs:
saltmajorversion: 3004

## SALT `3006.4`
- name: debian-11-3006-4-py3
driver:
image: saltimages/salt-3006.4-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3006
- name: debian-10-3006-4-py3
driver:
image: saltimages/salt-3006.4-py3:debian-10
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3006

## SALT `3004.1`
- name: debian-11-3004-1-py3
driver:

Loading…
Cancel
Save