From 4891bf6e77b90e6ec1a80160f48f86869aa46b88 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:47:17 +0100 Subject: [PATCH] ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/331 --- .gitlab-ci.yml | 10 ---------- .travis.yml | 10 ---------- kitchen.yml | 40 ---------------------------------------- 3 files changed, 60 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1e4db6..73b66a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,6 @@ rubocop: # debian-debian-9-tiamat-py3: {extends: '.test_instance'} # ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} # redhat-centos-8-tiamat-py3: {extends: '.test_instance'} # redhat-centos-7-tiamat-py3: {extends: '.test_instance'} # redhat-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -137,12 +136,10 @@ debian-debian-10-master-py3: {extends: '.test_instance'} debian-debian-9-master-py3: {extends: '.test_instance'} ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'} ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'} -ubuntu-ubuntu-1604-master-py3: {extends: '.test_instance'} redhat-centos-8-master-py3: {extends: '.test_instance'} redhat-centos-7-master-py3: {extends: '.test_instance'} redhat-fedora-34-master-py3: {extends: '.test_instance'} redhat-fedora-33-master-py3: {extends: '.test_instance'} -redhat-fedora-32-master-py3: {extends: '.test_instance'} suse-opensuse-leap-152-master-py3: {extends: '.test_instance'} suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} redhat-amazonlinux-2-master-py3: {extends: '.test_instance'} @@ -156,7 +153,6 @@ redhat-oraclelinux-7-master-py3: {extends: '.test_instance'} # redhat-centos-7-3003-0-py3: {extends: '.test_instance'} # redhat-fedora-34-3003-0-py3: {extends: '.test_instance'} # redhat-fedora-33-3003-0-py3: {extends: '.test_instance'} -# redhat-fedora-32-3003-0-py3: {extends: '.test_instance'} # redhat-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} # redhat-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} # redhat-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} @@ -164,12 +160,10 @@ redhat-oraclelinux-7-master-py3: {extends: '.test_instance'} # debian-debian-9-3002-6-py3: {extends: '.test_instance'} # ubuntu-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} # ubuntu-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} # redhat-centos-8-3002-6-py3: {extends: '.test_instance'} # redhat-centos-7-3002-6-py3: {extends: '.test_instance'} # redhat-fedora-34-3002-6-py3: {extends: '.test_instance'} # redhat-fedora-33-3002-6-py3: {extends: '.test_instance'} -# redhat-fedora-32-3002-6-py3: {extends: '.test_instance'} # redhat-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} # redhat-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # redhat-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} @@ -179,12 +173,10 @@ redhat-oraclelinux-7-master-py3: {extends: '.test_instance'} # debian-debian-9-3001-7-py3: {extends: '.test_instance'} # ubuntu-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} # ubuntu-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} # redhat-centos-8-3001-7-py3: {extends: '.test_instance'} # redhat-centos-7-3001-7-py3: {extends: '.test_instance'} # redhat-fedora-34-3001-7-py3: {extends: '.test_instance'} # redhat-fedora-33-3001-7-py3: {extends: '.test_instance'} -# redhat-fedora-32-3001-7-py3: {extends: '.test_instance'} # suse-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} # suse-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} # redhat-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} @@ -193,7 +185,6 @@ redhat-oraclelinux-7-master-py3: {extends: '.test_instance'} # debian-debian-10-3000-9-py3: {extends: '.test_instance'} # debian-debian-9-3000-9-py3: {extends: '.test_instance'} # ubuntu-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} # redhat-centos-8-3000-9-py3: {extends: '.test_instance'} # redhat-centos-7-3000-9-py3: {extends: '.test_instance'} # suse-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} @@ -201,7 +192,6 @@ redhat-oraclelinux-7-master-py3: {extends: '.test_instance'} # redhat-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # redhat-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} # ubuntu-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} -# ubuntu-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 4a5ba63..5dcfec6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,6 @@ jobs: # - env: INSTANCE=debian-debian-9-tiamat-py3 # - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3 # - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3 - # - env: INSTANCE=ubuntu-ubuntu-1604-tiamat-py3 # - env: INSTANCE=redhat-centos-8-tiamat-py3 # - env: INSTANCE=redhat-centos-7-tiamat-py3 # - env: INSTANCE=redhat-amazonlinux-2-tiamat-py3 @@ -97,12 +96,10 @@ jobs: - env: INSTANCE=debian-debian-9-master-py3 - env: INSTANCE=ubuntu-ubuntu-2004-master-py3 - env: INSTANCE=ubuntu-ubuntu-1804-master-py3 - - env: INSTANCE=ubuntu-ubuntu-1604-master-py3 - env: INSTANCE=redhat-centos-8-master-py3 - env: INSTANCE=redhat-centos-7-master-py3 - env: INSTANCE=redhat-fedora-34-master-py3 - env: INSTANCE=redhat-fedora-33-master-py3 - - env: INSTANCE=redhat-fedora-32-master-py3 - env: INSTANCE=suse-opensuse-leap-152-master-py3 - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3 - env: INSTANCE=redhat-amazonlinux-2-master-py3 @@ -116,7 +113,6 @@ jobs: # - env: INSTANCE=redhat-centos-7-3003-0-py3 # - env: INSTANCE=redhat-fedora-34-3003-0-py3 # - env: INSTANCE=redhat-fedora-33-3003-0-py3 - # - env: INSTANCE=redhat-fedora-32-3003-0-py3 # - env: INSTANCE=redhat-amazonlinux-2-3003-0-py3 # - env: INSTANCE=redhat-oraclelinux-8-3003-0-py3 # - env: INSTANCE=redhat-oraclelinux-7-3003-0-py3 @@ -124,12 +120,10 @@ jobs: # - env: INSTANCE=debian-debian-9-3002-6-py3 # - env: INSTANCE=ubuntu-ubuntu-2004-3002-6-py3 # - env: INSTANCE=ubuntu-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=ubuntu-ubuntu-1604-3002-6-py3 # - env: INSTANCE=redhat-centos-8-3002-6-py3 # - env: INSTANCE=redhat-centos-7-3002-6-py3 # - env: INSTANCE=redhat-fedora-34-3002-6-py3 # - env: INSTANCE=redhat-fedora-33-3002-6-py3 - # - env: INSTANCE=redhat-fedora-32-3002-6-py3 # - env: INSTANCE=redhat-amazonlinux-2-3002-6-py3 # - env: INSTANCE=redhat-oraclelinux-8-3002-6-py3 # - env: INSTANCE=redhat-oraclelinux-7-3002-6-py3 @@ -139,12 +133,10 @@ jobs: # - env: INSTANCE=debian-debian-9-3001-7-py3 # - env: INSTANCE=ubuntu-ubuntu-2004-3001-7-py3 # - env: INSTANCE=ubuntu-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=ubuntu-ubuntu-1604-3001-7-py3 # - env: INSTANCE=redhat-centos-8-3001-7-py3 # - env: INSTANCE=redhat-centos-7-3001-7-py3 # - env: INSTANCE=redhat-fedora-34-3001-7-py3 # - env: INSTANCE=redhat-fedora-33-3001-7-py3 - # - env: INSTANCE=redhat-fedora-32-3001-7-py3 # - env: INSTANCE=suse-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=suse-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=redhat-amazonlinux-2-3001-7-py3 @@ -153,7 +145,6 @@ jobs: # - env: INSTANCE=debian-debian-10-3000-9-py3 # - env: INSTANCE=debian-debian-9-3000-9-py3 # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=ubuntu-ubuntu-1604-3000-9-py3 # - env: INSTANCE=redhat-centos-8-3000-9-py3 # - env: INSTANCE=redhat-centos-7-3000-9-py3 # - env: INSTANCE=suse-opensuse-leap-152-3000-9-py3 @@ -161,7 +152,6 @@ jobs: # - env: INSTANCE=redhat-oraclelinux-8-3000-9-py3 # - env: INSTANCE=redhat-oraclelinux-7-3000-9-py3 # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=ubuntu-ubuntu-1604-3000-9-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 05f2f1b..9731cf2 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -22,9 +22,6 @@ platforms: - name: ubuntu-1804-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-18.04 - - name: ubuntu-1604-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:ubuntu-16.04 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -54,9 +51,6 @@ platforms: - name: ubuntu-1804-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-18.04 - - name: ubuntu-1604-master-py3 - driver: - image: saltimages/salt-master-py3:ubuntu-16.04 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -69,9 +63,6 @@ platforms: - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 - - name: fedora-32-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-32 - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -134,9 +125,6 @@ platforms: - name: fedora-33-3003-0-py3 driver: image: saltimages/salt-3003.0-py3:fedora-33 - - name: fedora-32-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:fedora-32 - name: amazonlinux-2-3003-0-py3 driver: image: saltimages/salt-3003.0-py3:amazonlinux-2 @@ -171,9 +159,6 @@ platforms: - 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 @@ -186,9 +171,6 @@ platforms: - name: fedora-33-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:fedora-33 - - name: fedora-32-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:fedora-32 - name: amazonlinux-2-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:amazonlinux-2 @@ -243,9 +225,6 @@ platforms: - name: ubuntu-1804-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:ubuntu-16.04 - name: centos-8-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:centos-8 @@ -258,9 +237,6 @@ platforms: - name: fedora-33-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:fedora-33 - - name: fedora-32-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:fedora-32 - name: opensuse-leap-152-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 @@ -310,9 +286,6 @@ platforms: - name: ubuntu-1804-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:ubuntu-16.04 - name: centos-8-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:centos-8 @@ -339,9 +312,6 @@ platforms: - name: ubuntu-1804-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-9-py2 - driver: - image: saltimages/salt-3000.9-py2:ubuntu-16.04 - name: arch-base-latest-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:arch-base-latest @@ -414,22 +384,16 @@ suites: includes: - ubuntu-2004-tiamat-py3 - ubuntu-1804-tiamat-py3 - - ubuntu-1604-tiamat-py3 - ubuntu-2004-master-py3 - ubuntu-1804-master-py3 - - ubuntu-1604-master-py3 - ubuntu-2004-3003-0-py3 - ubuntu-1804-3003-0-py3 - ubuntu-2004-3002-6-py3 - ubuntu-1804-3002-6-py3 - - ubuntu-1604-3002-6-py3 - ubuntu-2004-3001-7-py3 - ubuntu-1804-3001-7-py3 - - ubuntu-1604-3001-7-py3 - ubuntu-1804-3000-9-py3 - - ubuntu-1604-3000-9-py3 - ubuntu-1804-3000-9-py2 - - ubuntu-1604-3000-9-py2 provisioner: state_top: base: @@ -464,7 +428,6 @@ suites: - centos-7-master-py3 - fedora-34-master-py3 - fedora-33-master-py3 - - fedora-32-master-py3 - amazonlinux-2-master-py3 - oraclelinux-8-master-py3 - oraclelinux-7-master-py3 @@ -472,7 +435,6 @@ suites: - centos-7-3003-0-py3 - fedora-34-3003-0-py3 - fedora-33-3003-0-py3 - - fedora-32-3003-0-py3 - amazonlinux-2-3003-0-py3 - oraclelinux-8-3003-0-py3 - oraclelinux-7-3003-0-py3 @@ -480,7 +442,6 @@ suites: - centos-7-3002-6-py3 - fedora-34-3002-6-py3 - fedora-33-3002-6-py3 - - fedora-32-3002-6-py3 - amazonlinux-2-3002-6-py3 - oraclelinux-8-3002-6-py3 - oraclelinux-7-3002-6-py3 @@ -488,7 +449,6 @@ suites: - centos-7-3001-7-py3 - fedora-34-3001-7-py3 - fedora-33-3001-7-py3 - - fedora-32-3001-7-py3 - amazonlinux-2-3001-7-py3 - oraclelinux-8-3001-7-py3 - oraclelinux-7-3001-7-py3