From 0615c75ffc2debaca35b3901d1a9a2a17a74aee8 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:42:36 +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 --- .github/workflows/kitchen.yml | 32 ++++++++++---------- .travis.yml | 32 ++++++++++---------- kitchen.yml | 56 ----------------------------------- 3 files changed, 32 insertions(+), 88 deletions(-) diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 7320c7a5..c04e3512 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -21,7 +21,6 @@ jobs: # - archive-debian-9-tiamat-py3 # - archive-ubuntu-2004-tiamat-py3 # - archive-ubuntu-1804-tiamat-py3 - # - archive-ubuntu-1604-tiamat-py3 # - archive-centos-8-tiamat-py3 # - archive-centos-7-tiamat-py3 # - archive-amazonlinux-2-tiamat-py3 @@ -29,74 +28,82 @@ jobs: # - archive-oraclelinux-7-tiamat-py3 # - archive-debian-10-master-py3 # - package-debian-10-master-py3 + # - repo-debian-10-master-py3 # - clean-debian-10-master-py3 - debian-10-master-py3 # - archive-debian-9-master-py3 # - package-debian-9-master-py3 + # - repo-debian-9-master-py3 # - clean-debian-9-master-py3 - debian-9-master-py3 # - archive-ubuntu-2004-master-py3 # - package-ubuntu-2004-master-py3 + # - repo-ubuntu-2004-master-py3 # - clean-ubuntu-2004-master-py3 - ubuntu-2004-master-py3 # - archive-ubuntu-1804-master-py3 # - package-ubuntu-1804-master-py3 + # - repo-ubuntu-1804-master-py3 # - clean-ubuntu-1804-master-py3 - ubuntu-1804-master-py3 - # - archive-ubuntu-1604-master-py3 - # - package-ubuntu-1604-master-py3 - # - clean-ubuntu-1604-master-py3 - - ubuntu-1604-master-py3 # - archive-centos-8-master-py3 # - package-centos-8-master-py3 + # - repo-centos-8-master-py3 # - clean-centos-8-master-py3 - centos-8-master-py3 # - archive-centos-7-master-py3 # - package-centos-7-master-py3 + # - repo-centos-7-master-py3 # - clean-centos-7-master-py3 - centos-7-master-py3 # - archive-fedora-34-master-py3 # - package-fedora-34-master-py3 + # - repo-fedora-34-master-py3 # - clean-fedora-34-master-py3 - fedora-34-master-py3 # - archive-fedora-33-master-py3 # - package-fedora-33-master-py3 + # - repo-fedora-33-master-py3 # - clean-fedora-33-master-py3 - fedora-33-master-py3 - # - archive-fedora-32-master-py3 - # - package-fedora-32-master-py3 - # - clean-fedora-32-master-py3 - - fedora-32-master-py3 # - archive-opensuse-leap-152-master-py3 # - package-opensuse-leap-152-master-py3 + # - repo-opensuse-leap-152-master-py3 # - clean-opensuse-leap-152-master-py3 - opensuse-leap-152-master-py3 # - archive-opensuse-tmbl-latest-master-py3 # - package-opensuse-tmbl-latest-master-py3 + # - repo-opensuse-tmbl-latest-master-py3 - clean-opensuse-tmbl-latest-master-py3 # - opensuse-tmbl-latest-master-py3 - archive-amazonlinux-2-master-py3 # - package-amazonlinux-2-master-py3 + # - repo-amazonlinux-2-master-py3 # - clean-amazonlinux-2-master-py3 # - amazonlinux-2-master-py3 - archive-oraclelinux-8-master-py3 # - package-oraclelinux-8-master-py3 + # - repo-oraclelinux-8-master-py3 # - clean-oraclelinux-8-master-py3 # - oraclelinux-8-master-py3 - archive-oraclelinux-7-master-py3 # - package-oraclelinux-7-master-py3 + # - repo-oraclelinux-7-master-py3 # - clean-oraclelinux-7-master-py3 # - oraclelinux-7-master-py3 # - archive-arch-base-latest-master-py3 # - package-arch-base-latest-master-py3 + # - repo-arch-base-latest-master-py3 # - clean-arch-base-latest-master-py3 - arch-base-latest-master-py3 # - archive-gentoo-stage3-latest-master-py3 # - package-gentoo-stage3-latest-master-py3 + # - repo-gentoo-stage3-latest-master-py3 # - clean-gentoo-stage3-latest-master-py3 # - gentoo-stage3-latest-master-py3 - archive-gentoo-stage3-systemd-master-py3 # - package-gentoo-stage3-systemd-master-py3 + # - repo-gentoo-stage3-systemd-master-py3 # - clean-gentoo-stage3-systemd-master-py3 # - gentoo-stage3-systemd-master-py3 # - archive-debian-10-3003-0-py3 @@ -107,7 +114,6 @@ jobs: # - archive-centos-7-3003-0-py3 # - archive-fedora-34-3003-0-py3 # - archive-fedora-33-3003-0-py3 - # - archive-fedora-32-3003-0-py3 # - archive-amazonlinux-2-3003-0-py3 # - archive-oraclelinux-8-3003-0-py3 # - archive-oraclelinux-7-3003-0-py3 @@ -118,12 +124,10 @@ jobs: # - archive-debian-9-3002-6-py3 # - archive-ubuntu-2004-3002-6-py3 # - archive-ubuntu-1804-3002-6-py3 - # - archive-ubuntu-1604-3002-6-py3 # - archive-centos-8-3002-6-py3 # - archive-centos-7-3002-6-py3 # - archive-fedora-34-3002-6-py3 # - archive-fedora-33-3002-6-py3 - # - archive-fedora-32-3002-6-py3 # - archive-amazonlinux-2-3002-6-py3 # - archive-oraclelinux-8-3002-6-py3 # - archive-oraclelinux-7-3002-6-py3 @@ -136,12 +140,10 @@ jobs: # - archive-debian-9-3001-7-py3 # - archive-ubuntu-2004-3001-7-py3 # - archive-ubuntu-1804-3001-7-py3 - # - archive-ubuntu-1604-3001-7-py3 # - archive-centos-8-3001-7-py3 # - archive-centos-7-3001-7-py3 # - archive-fedora-34-3001-7-py3 # - archive-fedora-33-3001-7-py3 - # - archive-fedora-32-3001-7-py3 # - archive-opensuse-leap-152-3001-7-py3 # - archive-opensuse-tmbl-latest-3001-7-py3 # - archive-amazonlinux-2-3001-7-py3 @@ -153,7 +155,6 @@ jobs: # - archive-debian-10-3000-9-py3 # - archive-debian-9-3000-9-py3 # - archive-ubuntu-1804-3000-9-py3 - # - archive-ubuntu-1604-3000-9-py3 # - archive-centos-8-3000-9-py3 # - archive-centos-7-3000-9-py3 # - archive-opensuse-leap-152-3000-9-py3 @@ -161,7 +162,6 @@ jobs: # - archive-oraclelinux-8-3000-9-py3 # - archive-oraclelinux-7-3000-9-py3 # - archive-ubuntu-1804-3000-9-py2 - # - archive-ubuntu-1604-3000-9-py2 # - archive-arch-base-latest-3000-9-py2 # - archive-gentoo-stage3-latest-3000-8-py3 # - archive-gentoo-stage3-systemd-3000-8-py3 diff --git a/.travis.yml b/.travis.yml index 27dd681c..fdc584ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,6 @@ jobs: # - env: INSTANCE=archive-debian-9-tiamat-py3 # - env: INSTANCE=archive-ubuntu-2004-tiamat-py3 # - env: INSTANCE=archive-ubuntu-1804-tiamat-py3 - # - env: INSTANCE=archive-ubuntu-1604-tiamat-py3 # - env: INSTANCE=archive-centos-8-tiamat-py3 # - env: INSTANCE=archive-centos-7-tiamat-py3 # - env: INSTANCE=archive-amazonlinux-2-tiamat-py3 @@ -103,74 +102,82 @@ jobs: # - env: INSTANCE=archive-oraclelinux-7-tiamat-py3 # - env: INSTANCE=archive-debian-10-master-py3 # - env: INSTANCE=package-debian-10-master-py3 + # - env: INSTANCE=repo-debian-10-master-py3 # - env: INSTANCE=clean-debian-10-master-py3 - env: INSTANCE=debian-10-master-py3 # - env: INSTANCE=archive-debian-9-master-py3 # - env: INSTANCE=package-debian-9-master-py3 + # - env: INSTANCE=repo-debian-9-master-py3 # - env: INSTANCE=clean-debian-9-master-py3 - env: INSTANCE=debian-9-master-py3 # - env: INSTANCE=archive-ubuntu-2004-master-py3 # - env: INSTANCE=package-ubuntu-2004-master-py3 + # - env: INSTANCE=repo-ubuntu-2004-master-py3 # - env: INSTANCE=clean-ubuntu-2004-master-py3 - env: INSTANCE=ubuntu-2004-master-py3 # - env: INSTANCE=archive-ubuntu-1804-master-py3 # - env: INSTANCE=package-ubuntu-1804-master-py3 + # - env: INSTANCE=repo-ubuntu-1804-master-py3 # - env: INSTANCE=clean-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 - # - env: INSTANCE=archive-ubuntu-1604-master-py3 - # - env: INSTANCE=package-ubuntu-1604-master-py3 - # - env: INSTANCE=clean-ubuntu-1604-master-py3 - - env: INSTANCE=ubuntu-1604-master-py3 # - env: INSTANCE=archive-centos-8-master-py3 # - env: INSTANCE=package-centos-8-master-py3 + # - env: INSTANCE=repo-centos-8-master-py3 # - env: INSTANCE=clean-centos-8-master-py3 - env: INSTANCE=centos-8-master-py3 # - env: INSTANCE=archive-centos-7-master-py3 # - env: INSTANCE=package-centos-7-master-py3 + # - env: INSTANCE=repo-centos-7-master-py3 # - env: INSTANCE=clean-centos-7-master-py3 - env: INSTANCE=centos-7-master-py3 # - env: INSTANCE=archive-fedora-34-master-py3 # - env: INSTANCE=package-fedora-34-master-py3 + # - env: INSTANCE=repo-fedora-34-master-py3 # - env: INSTANCE=clean-fedora-34-master-py3 - env: INSTANCE=fedora-34-master-py3 # - env: INSTANCE=archive-fedora-33-master-py3 # - env: INSTANCE=package-fedora-33-master-py3 + # - env: INSTANCE=repo-fedora-33-master-py3 # - env: INSTANCE=clean-fedora-33-master-py3 - env: INSTANCE=fedora-33-master-py3 - # - env: INSTANCE=archive-fedora-32-master-py3 - # - env: INSTANCE=package-fedora-32-master-py3 - # - env: INSTANCE=clean-fedora-32-master-py3 - - env: INSTANCE=fedora-32-master-py3 # - env: INSTANCE=archive-opensuse-leap-152-master-py3 # - env: INSTANCE=package-opensuse-leap-152-master-py3 + # - env: INSTANCE=repo-opensuse-leap-152-master-py3 # - env: INSTANCE=clean-opensuse-leap-152-master-py3 - env: INSTANCE=opensuse-leap-152-master-py3 # - env: INSTANCE=archive-opensuse-tmbl-latest-master-py3 # - env: INSTANCE=package-opensuse-tmbl-latest-master-py3 + # - env: INSTANCE=repo-opensuse-tmbl-latest-master-py3 - env: INSTANCE=clean-opensuse-tmbl-latest-master-py3 # - env: INSTANCE=opensuse-tmbl-latest-master-py3 - env: INSTANCE=archive-amazonlinux-2-master-py3 # - env: INSTANCE=package-amazonlinux-2-master-py3 + # - env: INSTANCE=repo-amazonlinux-2-master-py3 # - env: INSTANCE=clean-amazonlinux-2-master-py3 # - env: INSTANCE=amazonlinux-2-master-py3 - env: INSTANCE=archive-oraclelinux-8-master-py3 # - env: INSTANCE=package-oraclelinux-8-master-py3 + # - env: INSTANCE=repo-oraclelinux-8-master-py3 # - env: INSTANCE=clean-oraclelinux-8-master-py3 # - env: INSTANCE=oraclelinux-8-master-py3 - env: INSTANCE=archive-oraclelinux-7-master-py3 # - env: INSTANCE=package-oraclelinux-7-master-py3 + # - env: INSTANCE=repo-oraclelinux-7-master-py3 # - env: INSTANCE=clean-oraclelinux-7-master-py3 # - env: INSTANCE=oraclelinux-7-master-py3 # - env: INSTANCE=archive-arch-base-latest-master-py3 # - env: INSTANCE=package-arch-base-latest-master-py3 + # - env: INSTANCE=repo-arch-base-latest-master-py3 # - env: INSTANCE=clean-arch-base-latest-master-py3 - env: INSTANCE=arch-base-latest-master-py3 # - env: INSTANCE=archive-gentoo-stage3-latest-master-py3 # - env: INSTANCE=package-gentoo-stage3-latest-master-py3 + # - env: INSTANCE=repo-gentoo-stage3-latest-master-py3 # - env: INSTANCE=clean-gentoo-stage3-latest-master-py3 # - env: INSTANCE=gentoo-stage3-latest-master-py3 - env: INSTANCE=archive-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=package-gentoo-stage3-systemd-master-py3 + # - env: INSTANCE=repo-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=clean-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=gentoo-stage3-systemd-master-py3 # - env: INSTANCE=archive-debian-10-3003-0-py3 @@ -181,7 +188,6 @@ jobs: # - env: INSTANCE=archive-centos-7-3003-0-py3 # - env: INSTANCE=archive-fedora-34-3003-0-py3 # - env: INSTANCE=archive-fedora-33-3003-0-py3 - # - env: INSTANCE=archive-fedora-32-3003-0-py3 # - env: INSTANCE=archive-amazonlinux-2-3003-0-py3 # - env: INSTANCE=archive-oraclelinux-8-3003-0-py3 # - env: INSTANCE=archive-oraclelinux-7-3003-0-py3 @@ -192,12 +198,10 @@ jobs: # - env: INSTANCE=archive-debian-9-3002-6-py3 # - env: INSTANCE=archive-ubuntu-2004-3002-6-py3 # - env: INSTANCE=archive-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=archive-ubuntu-1604-3002-6-py3 # - env: INSTANCE=archive-centos-8-3002-6-py3 # - env: INSTANCE=archive-centos-7-3002-6-py3 # - env: INSTANCE=archive-fedora-34-3002-6-py3 # - env: INSTANCE=archive-fedora-33-3002-6-py3 - # - env: INSTANCE=archive-fedora-32-3002-6-py3 # - env: INSTANCE=archive-amazonlinux-2-3002-6-py3 # - env: INSTANCE=archive-oraclelinux-8-3002-6-py3 # - env: INSTANCE=archive-oraclelinux-7-3002-6-py3 @@ -210,12 +214,10 @@ jobs: # - env: INSTANCE=archive-debian-9-3001-7-py3 # - env: INSTANCE=archive-ubuntu-2004-3001-7-py3 # - env: INSTANCE=archive-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=archive-ubuntu-1604-3001-7-py3 # - env: INSTANCE=archive-centos-8-3001-7-py3 # - env: INSTANCE=archive-centos-7-3001-7-py3 # - env: INSTANCE=archive-fedora-34-3001-7-py3 # - env: INSTANCE=archive-fedora-33-3001-7-py3 - # - env: INSTANCE=archive-fedora-32-3001-7-py3 # - env: INSTANCE=archive-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=archive-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=archive-amazonlinux-2-3001-7-py3 @@ -227,7 +229,6 @@ jobs: # - env: INSTANCE=archive-debian-10-3000-9-py3 # - env: INSTANCE=archive-debian-9-3000-9-py3 # - env: INSTANCE=archive-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=archive-ubuntu-1604-3000-9-py3 # - env: INSTANCE=archive-centos-8-3000-9-py3 # - env: INSTANCE=archive-centos-7-3000-9-py3 # - env: INSTANCE=archive-opensuse-leap-152-3000-9-py3 @@ -235,7 +236,6 @@ jobs: # - env: INSTANCE=archive-oraclelinux-8-3000-9-py3 # - env: INSTANCE=archive-oraclelinux-7-3000-9-py3 # - env: INSTANCE=archive-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=archive-ubuntu-1604-3000-9-py2 # - env: INSTANCE=archive-arch-base-latest-3000-9-py2 # - env: INSTANCE=archive-gentoo-stage3-latest-3000-8-py3 # - env: INSTANCE=archive-gentoo-stage3-systemd-3000-8-py3 diff --git a/kitchen.yml b/kitchen.yml index 21217215..a5edb255 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -34,12 +34,6 @@ platforms: provision_command: - apt-get update - apt-get -qq -y install conntrack - - name: ubuntu-1604-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:ubuntu-16.04 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -91,12 +85,6 @@ platforms: provision_command: - apt-get update - apt-get -qq -y install conntrack - - name: ubuntu-1604-master-py3 - driver: - image: saltimages/salt-master-py3:ubuntu-16.04 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -117,11 +105,6 @@ platforms: image: saltimages/salt-master-py3:fedora-33 provision_command: - dnf install conntrack-tools -y - - name: fedora-32-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-32 - provision_command: - - dnf install conntrack-tools -y - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -221,11 +204,6 @@ platforms: image: saltimages/salt-3003.0-py3:fedora-33 provision_command: - dnf install conntrack-tools -y - - name: fedora-32-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:fedora-32 - provision_command: - - dnf install conntrack-tools -y - name: amazonlinux-2-3003-0-py3 driver: image: saltimages/salt-3003.0-py3:amazonlinux-2 @@ -285,12 +263,6 @@ platforms: provision_command: - apt-get update - apt-get -qq -y install conntrack - - name: ubuntu-1604-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:ubuntu-16.04 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - name: centos-8-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:centos-8 @@ -311,11 +283,6 @@ platforms: image: saltimages/salt-3002.6-py3:fedora-33 provision_command: - dnf install conntrack-tools -y - - name: fedora-32-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:fedora-32 - provision_command: - - dnf install conntrack-tools -y - name: amazonlinux-2-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:amazonlinux-2 @@ -399,12 +366,6 @@ platforms: provision_command: - apt-get update - apt-get -qq -y install conntrack - - name: ubuntu-1604-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:ubuntu-16.04 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - name: centos-8-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:centos-8 @@ -425,11 +386,6 @@ platforms: image: saltimages/salt-3001.7-py3:fedora-33 provision_command: - dnf install conntrack-tools -y - - name: fedora-32-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:fedora-32 - provision_command: - - dnf install conntrack-tools -y - name: opensuse-leap-152-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 @@ -505,12 +461,6 @@ platforms: provision_command: - apt-get update - apt-get -qq -y install conntrack - - name: ubuntu-1604-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:ubuntu-16.04 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - name: centos-8-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:centos-8 @@ -552,12 +502,6 @@ platforms: provision_command: - apt-get update - apt-get -qq -y install conntrack - - name: ubuntu-1604-3000-9-py2 - driver: - image: saltimages/salt-3000.9-py2:ubuntu-16.04 - provision_command: - - apt-get update - - apt-get -qq -y install conntrack - name: arch-base-latest-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:arch-base-latest