From e25a9a493c29b97fe4487329b1f7b82379011e66 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:47:10 +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 344083d..2d8d8a8 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'} # redhat8-centos-8-tiamat-py3: {extends: '.test_instance'} # centos-centos-7-tiamat-py3: {extends: '.test_instance'} # amazon-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'} redhat8-centos-8-master-py3: {extends: '.test_instance'} centos-centos-7-master-py3: {extends: '.test_instance'} # fedora-fedora-34-master-py3: {extends: '.test_instance'} # fedora-fedora-33-master-py3: {extends: '.test_instance'} -fedora-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'} amazon-amazonlinux-2-master-py3: {extends: '.test_instance'} @@ -159,7 +156,6 @@ gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # centos-centos-7-3003-0-py3: {extends: '.test_instance'} # fedora-fedora-34-3003-0-py3: {extends: '.test_instance'} # fedora-fedora-33-3003-0-py3: {extends: '.test_instance'} -# fedora-fedora-32-3003-0-py3: {extends: '.test_instance'} # amazon-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} # redhat8-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} # centos-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} @@ -170,12 +166,10 @@ gentoo-gentoo-stage3-systemd-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'} # redhat8-centos-8-3002-6-py3: {extends: '.test_instance'} # centos-centos-7-3002-6-py3: {extends: '.test_instance'} # fedora-fedora-34-3002-6-py3: {extends: '.test_instance'} # fedora-fedora-33-3002-6-py3: {extends: '.test_instance'} -# fedora-fedora-32-3002-6-py3: {extends: '.test_instance'} # amazon-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} # redhat8-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # centos-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} @@ -188,12 +182,10 @@ gentoo-gentoo-stage3-systemd-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'} # redhat8-centos-8-3001-7-py3: {extends: '.test_instance'} # centos-centos-7-3001-7-py3: {extends: '.test_instance'} # fedora-fedora-34-3001-7-py3: {extends: '.test_instance'} # fedora-fedora-33-3001-7-py3: {extends: '.test_instance'} -# fedora-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'} # amazon-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} @@ -205,7 +197,6 @@ gentoo-gentoo-stage3-systemd-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'} # redhat8-centos-8-3000-9-py3: {extends: '.test_instance'} # centos-centos-7-3000-9-py3: {extends: '.test_instance'} # suse-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} @@ -213,7 +204,6 @@ gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # redhat8-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # centos-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'} # arch-arch-base-latest-3000-9-py2: {extends: '.test_instance'} # gentoo-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} # gentoo-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index dbdffad..46a60ae 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=redhat8-centos-8-tiamat-py3 # - env: INSTANCE=centos-centos-7-tiamat-py3 # - env: INSTANCE=amazon-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=redhat8-centos-8-master-py3 - env: INSTANCE=centos-centos-7-master-py3 # - env: INSTANCE=fedora-fedora-34-master-py3 # - env: INSTANCE=fedora-fedora-33-master-py3 - - env: INSTANCE=fedora-fedora-32-master-py3 - env: INSTANCE=suse-opensuse-leap-152-master-py3 - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3 - env: INSTANCE=amazon-amazonlinux-2-master-py3 @@ -119,7 +116,6 @@ jobs: # - env: INSTANCE=centos-centos-7-3003-0-py3 # - env: INSTANCE=fedora-fedora-34-3003-0-py3 # - env: INSTANCE=fedora-fedora-33-3003-0-py3 - # - env: INSTANCE=fedora-fedora-32-3003-0-py3 # - env: INSTANCE=amazon-amazonlinux-2-3003-0-py3 # - env: INSTANCE=redhat8-oraclelinux-8-3003-0-py3 # - env: INSTANCE=centos-oraclelinux-7-3003-0-py3 @@ -130,12 +126,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=redhat8-centos-8-3002-6-py3 # - env: INSTANCE=centos-centos-7-3002-6-py3 # - env: INSTANCE=fedora-fedora-34-3002-6-py3 # - env: INSTANCE=fedora-fedora-33-3002-6-py3 - # - env: INSTANCE=fedora-fedora-32-3002-6-py3 # - env: INSTANCE=amazon-amazonlinux-2-3002-6-py3 # - env: INSTANCE=redhat8-oraclelinux-8-3002-6-py3 # - env: INSTANCE=centos-oraclelinux-7-3002-6-py3 @@ -148,12 +142,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=redhat8-centos-8-3001-7-py3 # - env: INSTANCE=centos-centos-7-3001-7-py3 # - env: INSTANCE=fedora-fedora-34-3001-7-py3 # - env: INSTANCE=fedora-fedora-33-3001-7-py3 - # - env: INSTANCE=fedora-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=amazon-amazonlinux-2-3001-7-py3 @@ -165,7 +157,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=redhat8-centos-8-3000-9-py3 # - env: INSTANCE=centos-centos-7-3000-9-py3 # - env: INSTANCE=suse-opensuse-leap-152-3000-9-py3 @@ -173,7 +164,6 @@ jobs: # - env: INSTANCE=redhat8-oraclelinux-8-3000-9-py3 # - env: INSTANCE=centos-oraclelinux-7-3000-9-py3 # - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=ubuntu-ubuntu-1604-3000-9-py2 # - env: INSTANCE=arch-arch-base-latest-3000-9-py2 # - env: INSTANCE=gentoo-gentoo-stage3-latest-3000-8-py3 # - env: INSTANCE=gentoo-gentoo-stage3-systemd-3000-8-py3 diff --git a/kitchen.yml b/kitchen.yml index fd43b66..2de1db3 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -30,9 +30,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 @@ -70,9 +67,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 @@ -85,9 +79,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 @@ -158,9 +149,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 @@ -203,9 +191,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 @@ -218,9 +203,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 @@ -283,9 +265,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 @@ -298,9 +277,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 @@ -358,9 +334,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 @@ -387,9 +360,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 @@ -462,22 +432,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: dependencies: - name: golang @@ -503,16 +467,12 @@ suites: includes: - fedora-34-master-py3 - fedora-33-master-py3 - - fedora-32-master-py3 - fedora-34-3003-0-py3 - fedora-33-3003-0-py3 - - fedora-32-3003-0-py3 - fedora-34-3002-6-py3 - fedora-33-3002-6-py3 - - fedora-32-3002-6-py3 - fedora-34-3001-7-py3 - fedora-33-3001-7-py3 - - fedora-32-3001-7-py3 provisioner: state_top: base: