From 3935693b589ead4b4a479a10c5a0216ab5b39f7f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:50:02 +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 | 12 ------------ .travis.yml | 12 ------------ kitchen.yml | 30 ------------------------------ 3 files changed, 54 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2aeecbd..33340da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,6 @@ rubocop: # default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} -# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} # default-centos-8-tiamat-py3: {extends: '.test_instance'} # default-centos-7-tiamat-py3: {extends: '.test_instance'} # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -141,8 +140,6 @@ vimrc-debian-9-master-py3: {extends: '.test_instance'} vimrc-ubuntu-2004-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-master-py3: {extends: '.test_instance'} vimrc-ubuntu-1804-master-py3: {extends: '.test_instance'} -# default-ubuntu-1604-master-py3: {extends: '.test_instance'} -vimrc-ubuntu-1604-master-py3: {extends: '.test_instance'} # default-centos-8-master-py3: {extends: '.test_instance'} vimrc-centos-8-master-py3: {extends: '.test_instance'} # default-centos-7-master-py3: {extends: '.test_instance'} @@ -151,8 +148,6 @@ vimrc-centos-7-master-py3: {extends: '.test_instance'} vimrc-fedora-34-master-py3: {extends: '.test_instance'} # default-fedora-33-master-py3: {extends: '.test_instance'} vimrc-fedora-33-master-py3: {extends: '.test_instance'} -# default-fedora-32-master-py3: {extends: '.test_instance'} -vimrc-fedora-32-master-py3: {extends: '.test_instance'} # default-opensuse-leap-152-master-py3: {extends: '.test_instance'} vimrc-opensuse-leap-152-master-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} @@ -177,7 +172,6 @@ vimrc-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-centos-7-3003-0-py3: {extends: '.test_instance'} # default-fedora-34-3003-0-py3: {extends: '.test_instance'} # default-fedora-33-3003-0-py3: {extends: '.test_instance'} -# default-fedora-32-3003-0-py3: {extends: '.test_instance'} # default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} @@ -188,12 +182,10 @@ vimrc-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-debian-9-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} # default-centos-8-3002-6-py3: {extends: '.test_instance'} # default-centos-7-3002-6-py3: {extends: '.test_instance'} # default-fedora-34-3002-6-py3: {extends: '.test_instance'} # default-fedora-33-3002-6-py3: {extends: '.test_instance'} -# default-fedora-32-3002-6-py3: {extends: '.test_instance'} # default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} @@ -206,12 +198,10 @@ vimrc-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-debian-9-3001-7-py3: {extends: '.test_instance'} # default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} # default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} # default-centos-8-3001-7-py3: {extends: '.test_instance'} # default-centos-7-3001-7-py3: {extends: '.test_instance'} # default-fedora-34-3001-7-py3: {extends: '.test_instance'} # default-fedora-33-3001-7-py3: {extends: '.test_instance'} -# default-fedora-32-3001-7-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} # default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} @@ -223,7 +213,6 @@ vimrc-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-debian-10-3000-9-py3: {extends: '.test_instance'} # default-debian-9-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} # default-centos-8-3000-9-py3: {extends: '.test_instance'} # default-centos-7-3000-9-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} @@ -231,7 +220,6 @@ vimrc-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} -# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} # default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} # default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index abb8d2e..c23cffd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,6 @@ jobs: # - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 - # - env: INSTANCE=default-ubuntu-1604-tiamat-py3 # - env: INSTANCE=default-centos-8-tiamat-py3 # - env: INSTANCE=default-centos-7-tiamat-py3 # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 @@ -101,8 +100,6 @@ jobs: - env: INSTANCE=vimrc-ubuntu-2004-master-py3 # - env: INSTANCE=default-ubuntu-1804-master-py3 - env: INSTANCE=vimrc-ubuntu-1804-master-py3 - # - env: INSTANCE=default-ubuntu-1604-master-py3 - - env: INSTANCE=vimrc-ubuntu-1604-master-py3 # - env: INSTANCE=default-centos-8-master-py3 - env: INSTANCE=vimrc-centos-8-master-py3 # - env: INSTANCE=default-centos-7-master-py3 @@ -111,8 +108,6 @@ jobs: - env: INSTANCE=vimrc-fedora-34-master-py3 # - env: INSTANCE=default-fedora-33-master-py3 - env: INSTANCE=vimrc-fedora-33-master-py3 - # - env: INSTANCE=default-fedora-32-master-py3 - - env: INSTANCE=vimrc-fedora-32-master-py3 # - env: INSTANCE=default-opensuse-leap-152-master-py3 - env: INSTANCE=vimrc-opensuse-leap-152-master-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 @@ -137,7 +132,6 @@ jobs: # - env: INSTANCE=default-centos-7-3003-0-py3 # - env: INSTANCE=default-fedora-34-3003-0-py3 # - env: INSTANCE=default-fedora-33-3003-0-py3 - # - env: INSTANCE=default-fedora-32-3003-0-py3 # - env: INSTANCE=default-amazonlinux-2-3003-0-py3 # - env: INSTANCE=default-oraclelinux-8-3003-0-py3 # - env: INSTANCE=default-oraclelinux-7-3003-0-py3 @@ -148,12 +142,10 @@ jobs: # - env: INSTANCE=default-debian-9-3002-6-py3 # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 # - env: INSTANCE=default-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=default-ubuntu-1604-3002-6-py3 # - env: INSTANCE=default-centos-8-3002-6-py3 # - env: INSTANCE=default-centos-7-3002-6-py3 # - env: INSTANCE=default-fedora-34-3002-6-py3 # - env: INSTANCE=default-fedora-33-3002-6-py3 - # - env: INSTANCE=default-fedora-32-3002-6-py3 # - env: INSTANCE=default-amazonlinux-2-3002-6-py3 # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 @@ -166,12 +158,10 @@ jobs: # - env: INSTANCE=default-debian-9-3001-7-py3 # - env: INSTANCE=default-ubuntu-2004-3001-7-py3 # - env: INSTANCE=default-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=default-ubuntu-1604-3001-7-py3 # - env: INSTANCE=default-centos-8-3001-7-py3 # - env: INSTANCE=default-centos-7-3001-7-py3 # - env: INSTANCE=default-fedora-34-3001-7-py3 # - env: INSTANCE=default-fedora-33-3001-7-py3 - # - env: INSTANCE=default-fedora-32-3001-7-py3 # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 @@ -183,7 +173,6 @@ jobs: # - env: INSTANCE=default-debian-10-3000-9-py3 # - env: INSTANCE=default-debian-9-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=default-ubuntu-1604-3000-9-py3 # - env: INSTANCE=default-centos-8-3000-9-py3 # - env: INSTANCE=default-centos-7-3000-9-py3 # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 @@ -191,7 +180,6 @@ jobs: # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=default-ubuntu-1604-3000-9-py2 # - env: INSTANCE=default-arch-base-latest-3000-9-py2 # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 diff --git a/kitchen.yml b/kitchen.yml index fcb246e..5247ff2 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