From 0bb9afbf9e3f8d0af0f883e7b5b28161c7391597 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 23 Apr 2021 08:43:19 +0100 Subject: [PATCH 1/1] ci(kitchen+gitlab): adjust matrix to add `3003` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/318 --- .gitlab-ci.yml | 71 ++++++++++++---------- kitchen.yml | 159 +++++++++++++++++++++++++++++-------------------- 2 files changed, 134 insertions(+), 96 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6cd6c9..2d4b1fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,37 +173,46 @@ keepstore-centos-7-master-py3: {extends: '.test_instance'} # workbench-oraclelinux-7-master-py3: {extends: '.test_instance'} # shell-oraclelinux-7-master-py3: {extends: '.test_instance'} # keepstore-oraclelinux-7-master-py3: {extends: '.test_instance'} -# api-debian-10-3002-5-py3: {extends: '.test_instance'} -# api-debian-9-3002-5-py3: {extends: '.test_instance'} -# api-ubuntu-2004-3002-5-py3: {extends: '.test_instance'} -# api-ubuntu-1804-3002-5-py3: {extends: '.test_instance'} -# api-ubuntu-1604-3002-5-py3: {extends: '.test_instance'} -# api-centos-8-3002-5-py3: {extends: '.test_instance'} -# api-centos-7-3002-5-py3: {extends: '.test_instance'} -# api-amazonlinux-2-3002-5-py3: {extends: '.test_instance'} -# api-oraclelinux-8-3002-5-py3: {extends: '.test_instance'} -# api-oraclelinux-7-3002-5-py3: {extends: '.test_instance'} -# api-debian-10-3001-6-py3: {extends: '.test_instance'} -# api-debian-9-3001-6-py3: {extends: '.test_instance'} -# api-ubuntu-2004-3001-6-py3: {extends: '.test_instance'} -# api-ubuntu-1804-3001-6-py3: {extends: '.test_instance'} -# api-ubuntu-1604-3001-6-py3: {extends: '.test_instance'} -# api-centos-8-3001-6-py3: {extends: '.test_instance'} -# api-centos-7-3001-6-py3: {extends: '.test_instance'} -# api-amazonlinux-2-3001-6-py3: {extends: '.test_instance'} -# api-oraclelinux-8-3001-6-py3: {extends: '.test_instance'} -# api-oraclelinux-7-3001-6-py3: {extends: '.test_instance'} -# api-debian-10-3000-8-py3: {extends: '.test_instance'} -# api-debian-9-3000-8-py3: {extends: '.test_instance'} -# api-ubuntu-1804-3000-8-py3: {extends: '.test_instance'} -# api-ubuntu-1604-3000-8-py3: {extends: '.test_instance'} -# api-centos-8-3000-8-py3: {extends: '.test_instance'} -# api-centos-7-3000-8-py3: {extends: '.test_instance'} -# api-amazonlinux-2-3000-8-py3: {extends: '.test_instance'} -# api-oraclelinux-8-3000-8-py3: {extends: '.test_instance'} -# api-oraclelinux-7-3000-8-py3: {extends: '.test_instance'} -# api-ubuntu-1804-3000-8-py2: {extends: '.test_instance'} -# api-ubuntu-1604-3000-8-py2: {extends: '.test_instance'} +# api-debian-10-3003-0-py3: {extends: '.test_instance'} +# api-debian-9-3003-0-py3: {extends: '.test_instance'} +# api-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} +# api-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} +# api-centos-8-3003-0-py3: {extends: '.test_instance'} +# api-centos-7-3003-0-py3: {extends: '.test_instance'} +# api-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} +# api-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} +# api-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} +# api-debian-10-3002-6-py3: {extends: '.test_instance'} +# api-debian-9-3002-6-py3: {extends: '.test_instance'} +# api-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} +# api-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} +# api-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} +# api-centos-8-3002-6-py3: {extends: '.test_instance'} +# api-centos-7-3002-6-py3: {extends: '.test_instance'} +# api-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} +# api-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} +# api-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} +# api-debian-10-3001-7-py3: {extends: '.test_instance'} +# api-debian-9-3001-7-py3: {extends: '.test_instance'} +# api-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} +# api-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} +# api-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} +# api-centos-8-3001-7-py3: {extends: '.test_instance'} +# api-centos-7-3001-7-py3: {extends: '.test_instance'} +# api-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} +# api-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} +# api-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} +# api-debian-10-3000-9-py3: {extends: '.test_instance'} +# api-debian-9-3000-9-py3: {extends: '.test_instance'} +# api-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} +# api-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} +# api-centos-8-3000-9-py3: {extends: '.test_instance'} +# api-centos-7-3000-9-py3: {extends: '.test_instance'} +# api-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} +# api-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} +# api-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} +# api-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} +# api-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/kitchen.yml b/kitchen.yml index bb42666..d0f50c5 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -73,104 +73,133 @@ platforms: driver: image: saltimages/salt-master-py3:oraclelinux-7 - ## SALT `3002.5` - - name: debian-10-3002-5-py3 + ## SALT `3003.0` + - name: debian-10-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:debian-10 - - name: debian-9-3002-5-py3 + image: saltimages/salt-3003.0-py3:debian-10 + - name: debian-9-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:debian-9 - - name: ubuntu-2004-3002-5-py3 + image: saltimages/salt-3003.0-py3:debian-9 + - name: ubuntu-2004-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-20.04 - - name: ubuntu-1804-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-18.04 + - name: centos-8-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-16.04 - - name: centos-8-3002-5-py3 + image: saltimages/salt-3003.0-py3:centos-8 + - name: centos-7-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:centos-8 - - name: centos-7-3002-5-py3 + image: saltimages/salt-3003.0-py3:centos-7 + - name: amazonlinux-2-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:centos-7 - - name: amazonlinux-2-3002-5-py3 + image: saltimages/salt-3003.0-py3:amazonlinux-2 + - name: oraclelinux-8-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:amazonlinux-2 - - name: oraclelinux-8-3002-5-py3 + image: saltimages/salt-3003.0-py3:oraclelinux-8 + - name: oraclelinux-7-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:oraclelinux-8 - - name: oraclelinux-7-3002-5-py3 + image: saltimages/salt-3003.0-py3:oraclelinux-7 + + ## SALT `3002.6` + - name: debian-10-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-10 + - name: debian-9-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-9 + - name: ubuntu-2004-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-16.04 + - name: centos-8-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:centos-8 + - name: centos-7-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:centos-7 + - name: amazonlinux-2-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:amazonlinux-2 + - name: oraclelinux-8-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:oraclelinux-8 + - name: oraclelinux-7-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:oraclelinux-7 + image: saltimages/salt-3002.6-py3:oraclelinux-7 - ## SALT `3001.6` - - name: debian-10-3001-6-py3 + ## SALT `3001.7` + - name: debian-10-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:debian-10 - - name: debian-9-3001-6-py3 + image: saltimages/salt-3001.7-py3:debian-10 + - name: debian-9-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:debian-9 - - name: ubuntu-2004-3001-6-py3 + image: saltimages/salt-3001.7-py3:debian-9 + - name: ubuntu-2004-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-16.04 - - name: centos-8-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-16.04 + - name: centos-8-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:centos-8 - - name: centos-7-3001-6-py3 + image: saltimages/salt-3001.7-py3:centos-8 + - name: centos-7-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:centos-7 - - name: amazonlinux-2-3001-6-py3 + image: saltimages/salt-3001.7-py3:centos-7 + - name: amazonlinux-2-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:amazonlinux-2 - - name: oraclelinux-8-3001-6-py3 + image: saltimages/salt-3001.7-py3:amazonlinux-2 + - name: oraclelinux-8-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:oraclelinux-8 - - name: oraclelinux-7-3001-6-py3 + image: saltimages/salt-3001.7-py3:oraclelinux-8 + - name: oraclelinux-7-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:oraclelinux-7 + image: saltimages/salt-3001.7-py3:oraclelinux-7 - ## SALT `3000.8` - - name: debian-10-3000-8-py3 + ## SALT `3000.9` + - name: debian-10-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:debian-10 - - name: debian-9-3000-8-py3 + image: saltimages/salt-3000.9-py3:debian-10 + - name: debian-9-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:debian-9 - - name: ubuntu-1804-3000-8-py3 + image: saltimages/salt-3000.9-py3:debian-9 + - name: ubuntu-1804-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py3 + image: saltimages/salt-3000.9-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-16.04 - - name: centos-8-3000-8-py3 + image: saltimages/salt-3000.9-py3:ubuntu-16.04 + - name: centos-8-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:centos-8 - - name: centos-7-3000-8-py3 + image: saltimages/salt-3000.9-py3:centos-8 + - name: centos-7-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:centos-7 - - name: amazonlinux-2-3000-8-py3 + image: saltimages/salt-3000.9-py3:centos-7 + - name: amazonlinux-2-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:amazonlinux-2 - - name: oraclelinux-8-3000-8-py3 + image: saltimages/salt-3000.9-py3:amazonlinux-2 + - name: oraclelinux-8-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:oraclelinux-8 - - name: oraclelinux-7-3000-8-py3 + image: saltimages/salt-3000.9-py3:oraclelinux-8 + - name: oraclelinux-7-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:oraclelinux-7 - - name: ubuntu-1804-3000-8-py2 + image: saltimages/salt-3000.9-py3:oraclelinux-7 + - name: ubuntu-1804-3000-9-py2 driver: - image: saltimages/salt-3000.8-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py2 + image: saltimages/salt-3000.9-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py2 driver: - image: saltimages/salt-3000.8-py2:ubuntu-16.04 + image: saltimages/salt-3000.9-py2:ubuntu-16.04 provisioner: name: salt_solo -- 2.30.2