From df3f782f22df149c2b33fac73ea3904cda0a842e Mon Sep 17 00:00:00 2001 From: Roman Mueller Date: Tue, 16 Oct 2018 12:47:06 +0200 Subject: [PATCH] Remove Ubuntu Artful since it is end of life. Signed-off-by: Roman Mueller --- Jenkinsfile | 4 ---- Makefile | 2 +- install.sh | 10 ---------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 27bb088..2839b02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,6 @@ def verifyTargets = [ 'x86_64-verify-install-debian-buster', 'x86_64-verify-install-ubuntu-trusty', 'x86_64-verify-install-ubuntu-xenial', - 'x86_64-verify-install-ubuntu-artful', ] def armhfverifyTargets = [ @@ -22,12 +21,10 @@ def armhfverifyTargets = [ // TEMPORARY: security.ubuntu.com is returning a 404 for trusty armhf, support may have ended // 'armhf-verify-install-ubuntu-trusty', 'armhf-verify-install-ubuntu-xenial', - 'armhf-verify-install-ubuntu-artful', ] def s390xverifyTargets = [ 's390x-verify-install-ubuntu-xenial', - 's390x-verify-install-ubuntu-artful', ] def aarch64verifyTargets = [ @@ -41,7 +38,6 @@ def aarch64verifyTargets = [ def ppc64leverifyTargets = [ 'ppc64le-verify-install-ubuntu-xenial', - 'ppc64le-verify-install-ubuntu-artful', ] def genVerifyJob(String t, String label) { diff --git a/Makefile b/Makefile index ed57fd0..668d04f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL:=/bin/bash -DISTROS:=centos-7 fedora-26 fedora-27 debian-wheezy debian-jessie debian-stretch debian-buster ubuntu-trusty ubuntu-xenial ubuntu-yakkety ubuntu-artful +DISTROS:=centos-7 fedora-26 fedora-27 debian-wheezy debian-jessie debian-stretch debian-buster ubuntu-trusty ubuntu-xenial ubuntu-yakkety VERIFY_INSTALL_DISTROS:=$(addprefix x86_64-verify-install-,$(DISTROS)) CHANNEL_TO_TEST?=test VERSION?= diff --git a/install.sh b/install.sh index 932b910..5d055c7 100644 --- a/install.sh +++ b/install.sh @@ -50,13 +50,10 @@ x86_64-debian-buster x86_64-ubuntu-trusty x86_64-ubuntu-xenial x86_64-ubuntu-bionic -x86_64-ubuntu-artful s390x-ubuntu-xenial s390x-ubuntu-bionic -s390x-ubuntu-artful ppc64le-ubuntu-xenial ppc64le-ubuntu-bionic -ppc64le-ubuntu-artful aarch64-ubuntu-xenial aarch64-ubuntu-bionic aarch64-debian-jessie @@ -76,7 +73,6 @@ armv7l-debian-buster armv7l-ubuntu-trusty armv7l-ubuntu-xenial armv7l-ubuntu-bionic -armv7l-ubuntu-artful " mirror='' @@ -399,12 +395,6 @@ do_install() { fi fi - # TODO: August 31, 2018 delete from here, - if [ "$lsb_dist" = "ubuntu" ] && [ "$dist_version" = "artful" ]; then - deprecation_notice "$lsb_dist $dist_version" "August 31, 2018" - fi - # TODO: August 31, 2018 delete to here, - if ! command -v gpg > /dev/null; then pre_reqs="$pre_reqs gnupg" fi