From eaf5358b79b9944d78bef240d0d66e1bf8b06991 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 2 Feb 2022 22:59:58 +0000 Subject: [PATCH] ci(kitchen+gitlab): update for new pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/410 --- .gitlab-ci.yml | 10 ---------- .travis.yml | 10 ---------- kitchen.yml | 32 -------------------------------- 3 files changed, 52 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 952ef97..727ac4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,7 +131,6 @@ rubocop: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` # 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'} # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} @@ -139,7 +138,6 @@ rubocop: # default-almalinux-8-tiamat-py3: {extends: '.test_instance'} # default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} -default-centos-8-master-py3: {extends: '.test_instance'} default-centos-7-master-py3: {extends: '.test_instance'} default-amazonlinux-2-master-py3: {extends: '.test_instance'} default-oraclelinux-8-master-py3: {extends: '.test_instance'} @@ -147,7 +145,6 @@ default-oraclelinux-7-master-py3: {extends: '.test_instance'} default-almalinux-8-master-py3: {extends: '.test_instance'} default-rockylinux-8-master-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-amazonlinux-2-3004-0-py3: {extends: '.test_instance'} # default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'} @@ -155,22 +152,15 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'} # default-almalinux-8-3004-0-py3: {extends: '.test_instance'} # default-rockylinux-8-3004-0-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-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'} # default-almalinux-8-3003-3-py3: {extends: '.test_instance'} -# default-centos-8-3002-7-py3: {extends: '.test_instance'} # default-centos-7-3002-7-py3: {extends: '.test_instance'} # 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'} -# default-centos-8-3001-8-py3: {extends: '.test_instance'} -# default-centos-7-3001-8-py3: {extends: '.test_instance'} -# 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'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 34d7cfd..4bb27ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,6 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` # - 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 # - env: INSTANCE=default-oraclelinux-8-tiamat-py3 @@ -92,7 +91,6 @@ jobs: # - env: INSTANCE=default-almalinux-8-tiamat-py3 # - env: INSTANCE=default-rockylinux-8-tiamat-py3 - env: INSTANCE=default-centos-stream8-master-py3 - - env: INSTANCE=default-centos-8-master-py3 - env: INSTANCE=default-centos-7-master-py3 - env: INSTANCE=default-amazonlinux-2-master-py3 - env: INSTANCE=default-oraclelinux-8-master-py3 @@ -100,7 +98,6 @@ jobs: - env: INSTANCE=default-almalinux-8-master-py3 - env: INSTANCE=default-rockylinux-8-master-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-amazonlinux-2-3004-0-py3 # - env: INSTANCE=default-oraclelinux-8-3004-0-py3 @@ -108,22 +105,15 @@ jobs: # - env: INSTANCE=default-almalinux-8-3004-0-py3 # - env: INSTANCE=default-rockylinux-8-3004-0-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-amazonlinux-2-3003-3-py3 # - env: INSTANCE=default-oraclelinux-8-3003-3-py3 # - env: INSTANCE=default-oraclelinux-7-3003-3-py3 # - env: INSTANCE=default-almalinux-8-3003-3-py3 - # - env: INSTANCE=default-centos-8-3002-7-py3 # - env: INSTANCE=default-centos-7-3002-7-py3 # - env: INSTANCE=default-amazonlinux-2-3002-7-py3 # - env: INSTANCE=default-oraclelinux-8-3002-7-py3 # - env: INSTANCE=default-oraclelinux-7-3002-7-py3 - # - env: INSTANCE=default-centos-8-3001-8-py3 - # - env: INSTANCE=default-centos-7-3001-8-py3 - # - env: INSTANCE=default-amazonlinux-2-3001-8-py3 - # - env: INSTANCE=default-oraclelinux-8-3001-8-py3 - # - env: INSTANCE=default-oraclelinux-7-3001-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 93e4885..2f0e566 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -24,9 +24,6 @@ platforms: - 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 - name: centos-7-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-7 @@ -50,9 +47,6 @@ platforms: - 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 - name: centos-7-master-py3 driver: image: saltimages/salt-master-py3:centos-7 @@ -76,9 +70,6 @@ platforms: - 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 @@ -102,9 +93,6 @@ platforms: - 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 - name: centos-7-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:centos-7 @@ -122,9 +110,6 @@ platforms: image: saltimages/salt-3003.3-py3:almalinux-8 ## SALT `3002.7` - - name: centos-8-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:centos-8 - name: centos-7-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:centos-7 @@ -138,23 +123,6 @@ platforms: driver: image: saltimages/salt-3002.7-py3:oraclelinux-7 - ## SALT `3001.8` - - name: centos-8-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:centos-8 - - name: centos-7-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:centos-7 - - name: amazonlinux-2-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:amazonlinux-2 - - name: oraclelinux-8-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:oraclelinux-8 - - name: oraclelinux-7-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:oraclelinux-7 - verifier: # https://www.inspec.io/ name: inspec