From de5a317e74be857bec8bc3422afdd3eed8fec352 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Fri, 3 Nov 2023 17:57:50 +0000 Subject: [PATCH] ci(kitchen+gitlab): adjust matrix to add `3006` --- .gitlab-ci.yml | 8 +++++--- kitchen.yml | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fbb55c6..7a8447bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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'} diff --git a/kitchen.yml b/kitchen.yml index e4203b3d..13c62a4b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -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: