diff --git a/Jenkinsfile b/Jenkinsfile index 53a84fc..5de4957 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,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-zesty', 'x86_64-verify-install-ubuntu-artful', ] @@ -24,26 +23,22 @@ 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-zesty', 'armhf-verify-install-ubuntu-artful', ] def s390xverifyTargets = [ 's390x-verify-install-ubuntu-xenial', - 's390x-verify-install-ubuntu-zesty', 's390x-verify-install-ubuntu-artful', ] def aarch64verifyTargets = [ 'aarch64-verify-install-ubuntu-xenial', - 'aarch64-verify-install-ubuntu-zesty', 'aarch64-verify-install-debian-jessie', 'aarch64-verify-install-debian-stretch', ] def ppc64leverifyTargets = [ 'ppc64le-verify-install-ubuntu-xenial', - 'ppc64le-verify-install-ubuntu-zesty', 'ppc64le-verify-install-ubuntu-artful', ] diff --git a/Makefile b/Makefile index d6e4198..2c2acff 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL:=/bin/bash -DISTROS:=centos-7 fedora-25 fedora-26 debian-wheezy debian-jessie debian-stretch debian-buster ubuntu-trusty ubuntu-xenial ubuntu-yakkety ubuntu-zesty ubuntu-artful +DISTROS:=centos-7 fedora-25 fedora-26 debian-wheezy debian-jessie debian-stretch debian-buster ubuntu-trusty ubuntu-xenial ubuntu-yakkety ubuntu-artful VERIFY_INSTALL_DISTROS:=$(addprefix x86_64-verify-install-,$(DISTROS)) CHANNEL_TO_TEST?=test SHELLCHECK_EXCLUSIONS=$(addprefix -e, SC1091 SC1117)