From b10f529cb57c51c1e08e8e5410b5568528b7e7f2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:43:53 +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 | 22 ---------------------- .travis.yml | 22 ---------------------- kitchen.yml | 30 ------------------------------ 3 files changed, 74 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86c34bd..77f504f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,6 @@ rubocop: # adopt-debian-9-tiamat-py3: {extends: '.test_instance'} # adopt-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # adopt-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} -# adopt-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} # adopt-centos-8-tiamat-py3: {extends: '.test_instance'} # adopt-centos-7-tiamat-py3: {extends: '.test_instance'} # adopt-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -161,13 +160,6 @@ haikuvm-ubuntu-1804-master-py3: {extends: '.test_instance'} intellij-ubuntu-1804-master-py3: {extends: '.test_instance'} # oracle-ubuntu-1804-master-py3: {extends: '.test_instance'} zulu-ubuntu-1804-master-py3: {extends: '.test_instance'} -adopt-ubuntu-1604-master-py3: {extends: '.test_instance'} -amazon-ubuntu-1604-master-py3: {extends: '.test_instance'} -graalvm-ubuntu-1604-master-py3: {extends: '.test_instance'} -haikuvm-ubuntu-1604-master-py3: {extends: '.test_instance'} -intellij-ubuntu-1604-master-py3: {extends: '.test_instance'} -# oracle-ubuntu-1604-master-py3: {extends: '.test_instance'} -zulu-ubuntu-1604-master-py3: {extends: '.test_instance'} # adopt-centos-8-master-py3: {extends: '.test_instance'} # amazon-centos-8-master-py3: {extends: '.test_instance'} # graalvm-centos-8-master-py3: {extends: '.test_instance'} @@ -196,13 +188,6 @@ zulu-ubuntu-1604-master-py3: {extends: '.test_instance'} # intellij-fedora-33-master-py3: {extends: '.test_instance'} # oracle-fedora-33-master-py3: {extends: '.test_instance'} # zulu-fedora-33-master-py3: {extends: '.test_instance'} -# adopt-fedora-32-master-py3: {extends: '.test_instance'} -# amazon-fedora-32-master-py3: {extends: '.test_instance'} -# graalvm-fedora-32-master-py3: {extends: '.test_instance'} -# haikuvm-fedora-32-master-py3: {extends: '.test_instance'} -# intellij-fedora-32-master-py3: {extends: '.test_instance'} -# oracle-fedora-32-master-py3: {extends: '.test_instance'} -# zulu-fedora-32-master-py3: {extends: '.test_instance'} # adopt-opensuse-leap-152-master-py3: {extends: '.test_instance'} # amazon-opensuse-leap-152-master-py3: {extends: '.test_instance'} # graalvm-opensuse-leap-152-master-py3: {extends: '.test_instance'} @@ -267,7 +252,6 @@ zulu-ubuntu-1604-master-py3: {extends: '.test_instance'} # adopt-centos-7-3003-0-py3: {extends: '.test_instance'} # adopt-fedora-34-3003-0-py3: {extends: '.test_instance'} # adopt-fedora-33-3003-0-py3: {extends: '.test_instance'} -# adopt-fedora-32-3003-0-py3: {extends: '.test_instance'} # adopt-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} # adopt-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} # adopt-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} @@ -278,12 +262,10 @@ zulu-ubuntu-1604-master-py3: {extends: '.test_instance'} # adopt-debian-9-3002-6-py3: {extends: '.test_instance'} # adopt-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} # adopt-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# adopt-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} # adopt-centos-8-3002-6-py3: {extends: '.test_instance'} # adopt-centos-7-3002-6-py3: {extends: '.test_instance'} # adopt-fedora-34-3002-6-py3: {extends: '.test_instance'} # adopt-fedora-33-3002-6-py3: {extends: '.test_instance'} -# adopt-fedora-32-3002-6-py3: {extends: '.test_instance'} # adopt-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} # adopt-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # adopt-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} @@ -296,12 +278,10 @@ zulu-ubuntu-1604-master-py3: {extends: '.test_instance'} # adopt-debian-9-3001-7-py3: {extends: '.test_instance'} # adopt-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} # adopt-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# adopt-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} # adopt-centos-8-3001-7-py3: {extends: '.test_instance'} # adopt-centos-7-3001-7-py3: {extends: '.test_instance'} # adopt-fedora-34-3001-7-py3: {extends: '.test_instance'} # adopt-fedora-33-3001-7-py3: {extends: '.test_instance'} -# adopt-fedora-32-3001-7-py3: {extends: '.test_instance'} # adopt-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} # adopt-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} # adopt-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} @@ -313,7 +293,6 @@ zulu-ubuntu-1604-master-py3: {extends: '.test_instance'} # adopt-debian-10-3000-9-py3: {extends: '.test_instance'} # adopt-debian-9-3000-9-py3: {extends: '.test_instance'} # adopt-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# adopt-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} # adopt-centos-8-3000-9-py3: {extends: '.test_instance'} # adopt-centos-7-3000-9-py3: {extends: '.test_instance'} # adopt-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} @@ -321,7 +300,6 @@ zulu-ubuntu-1604-master-py3: {extends: '.test_instance'} # adopt-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # adopt-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} # adopt-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} -# adopt-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} # adopt-arch-base-latest-3000-9-py2: {extends: '.test_instance'} # adopt-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} # adopt-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index d4cab3d..eef5cc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,6 @@ jobs: # - env: INSTANCE=adopt-debian-9-tiamat-py3 # - env: INSTANCE=adopt-ubuntu-2004-tiamat-py3 # - env: INSTANCE=adopt-ubuntu-1804-tiamat-py3 - # - env: INSTANCE=adopt-ubuntu-1604-tiamat-py3 # - env: INSTANCE=adopt-centos-8-tiamat-py3 # - env: INSTANCE=adopt-centos-7-tiamat-py3 # - env: INSTANCE=adopt-amazonlinux-2-tiamat-py3 @@ -121,13 +120,6 @@ jobs: - env: INSTANCE=intellij-ubuntu-1804-master-py3 # - env: INSTANCE=oracle-ubuntu-1804-master-py3 - env: INSTANCE=zulu-ubuntu-1804-master-py3 - - env: INSTANCE=adopt-ubuntu-1604-master-py3 - - env: INSTANCE=amazon-ubuntu-1604-master-py3 - - env: INSTANCE=graalvm-ubuntu-1604-master-py3 - - env: INSTANCE=haikuvm-ubuntu-1604-master-py3 - - env: INSTANCE=intellij-ubuntu-1604-master-py3 - # - env: INSTANCE=oracle-ubuntu-1604-master-py3 - - env: INSTANCE=zulu-ubuntu-1604-master-py3 # - env: INSTANCE=adopt-centos-8-master-py3 # - env: INSTANCE=amazon-centos-8-master-py3 # - env: INSTANCE=graalvm-centos-8-master-py3 @@ -156,13 +148,6 @@ jobs: # - env: INSTANCE=intellij-fedora-33-master-py3 # - env: INSTANCE=oracle-fedora-33-master-py3 # - env: INSTANCE=zulu-fedora-33-master-py3 - # - env: INSTANCE=adopt-fedora-32-master-py3 - # - env: INSTANCE=amazon-fedora-32-master-py3 - # - env: INSTANCE=graalvm-fedora-32-master-py3 - # - env: INSTANCE=haikuvm-fedora-32-master-py3 - # - env: INSTANCE=intellij-fedora-32-master-py3 - # - env: INSTANCE=oracle-fedora-32-master-py3 - # - env: INSTANCE=zulu-fedora-32-master-py3 # - env: INSTANCE=adopt-opensuse-leap-152-master-py3 # - env: INSTANCE=amazon-opensuse-leap-152-master-py3 # - env: INSTANCE=graalvm-opensuse-leap-152-master-py3 @@ -227,7 +212,6 @@ jobs: # - env: INSTANCE=adopt-centos-7-3003-0-py3 # - env: INSTANCE=adopt-fedora-34-3003-0-py3 # - env: INSTANCE=adopt-fedora-33-3003-0-py3 - # - env: INSTANCE=adopt-fedora-32-3003-0-py3 # - env: INSTANCE=adopt-amazonlinux-2-3003-0-py3 # - env: INSTANCE=adopt-oraclelinux-8-3003-0-py3 # - env: INSTANCE=adopt-oraclelinux-7-3003-0-py3 @@ -238,12 +222,10 @@ jobs: # - env: INSTANCE=adopt-debian-9-3002-6-py3 # - env: INSTANCE=adopt-ubuntu-2004-3002-6-py3 # - env: INSTANCE=adopt-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=adopt-ubuntu-1604-3002-6-py3 # - env: INSTANCE=adopt-centos-8-3002-6-py3 # - env: INSTANCE=adopt-centos-7-3002-6-py3 # - env: INSTANCE=adopt-fedora-34-3002-6-py3 # - env: INSTANCE=adopt-fedora-33-3002-6-py3 - # - env: INSTANCE=adopt-fedora-32-3002-6-py3 # - env: INSTANCE=adopt-amazonlinux-2-3002-6-py3 # - env: INSTANCE=adopt-oraclelinux-8-3002-6-py3 # - env: INSTANCE=adopt-oraclelinux-7-3002-6-py3 @@ -256,12 +238,10 @@ jobs: # - env: INSTANCE=adopt-debian-9-3001-7-py3 # - env: INSTANCE=adopt-ubuntu-2004-3001-7-py3 # - env: INSTANCE=adopt-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=adopt-ubuntu-1604-3001-7-py3 # - env: INSTANCE=adopt-centos-8-3001-7-py3 # - env: INSTANCE=adopt-centos-7-3001-7-py3 # - env: INSTANCE=adopt-fedora-34-3001-7-py3 # - env: INSTANCE=adopt-fedora-33-3001-7-py3 - # - env: INSTANCE=adopt-fedora-32-3001-7-py3 # - env: INSTANCE=adopt-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=adopt-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=adopt-amazonlinux-2-3001-7-py3 @@ -273,7 +253,6 @@ jobs: # - env: INSTANCE=adopt-debian-10-3000-9-py3 # - env: INSTANCE=adopt-debian-9-3000-9-py3 # - env: INSTANCE=adopt-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=adopt-ubuntu-1604-3000-9-py3 # - env: INSTANCE=adopt-centos-8-3000-9-py3 # - env: INSTANCE=adopt-centos-7-3000-9-py3 # - env: INSTANCE=adopt-opensuse-leap-152-3000-9-py3 @@ -281,7 +260,6 @@ jobs: # - env: INSTANCE=adopt-oraclelinux-8-3000-9-py3 # - env: INSTANCE=adopt-oraclelinux-7-3000-9-py3 # - env: INSTANCE=adopt-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=adopt-ubuntu-1604-3000-9-py2 # - env: INSTANCE=adopt-arch-base-latest-3000-9-py2 # - env: INSTANCE=adopt-gentoo-stage3-latest-3000-8-py3 # - env: INSTANCE=adopt-gentoo-stage3-systemd-3000-8-py3 diff --git a/kitchen.yml b/kitchen.yml index 2c35839..8be97de 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