From 8029a2f5930e53dacf18043dc3476462b2171c0e Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 24 Oct 2017 10:08:36 -0700 Subject: [PATCH] Add temporary Ubuntu Artful support Adds temporary support for Ubuntu Artful while we wait to get packages up, after we do get packages up we should delete the lines denoted Signed-off-by: Eli Uriegas --- Jenkinsfile | 1 + Makefile | 4 ++-- install.sh | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5745c96..bc7003f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,7 @@ def verifyTargets = [ 'x86_64-verify-install-ubuntu-trusty', 'x86_64-verify-install-ubuntu-xenial', 'x86_64-verify-install-ubuntu-zesty', + 'x86_64-verify-install-ubuntu-artful', ] def armhfverifyTargets = [ diff --git a/Makefile b/Makefile index 7e1a492..ab41599 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 ubuntu-trusty ubuntu-xenial ubuntu-yakkety ubuntu-zesty +DISTROS:=centos-7 fedora-25 fedora-26 debian-wheezy debian-jessie debian-stretch ubuntu-trusty ubuntu-xenial ubuntu-yakkety ubuntu-zesty ubuntu-artful VERIFY_INSTALL_DISTROS:=$(addprefix x86_64-verify-install-,$(DISTROS)) CHANNEL_TO_TEST?=test SHELLCHECK_EXCLUSIONS=$(addprefix -e, SC1091 SC1117) @@ -85,4 +85,4 @@ ppc64le-verify-install-%: -v $(CURDIR):/v \ -w /v \ ppc64le/$(subst -,:,$*) \ - /v/verify-docker-install | tee $@ \ No newline at end of file + /v/verify-docker-install | tee $@ diff --git a/install.sh b/install.sh index a98d64f..b51f4de 100644 --- a/install.sh +++ b/install.sh @@ -41,10 +41,13 @@ x86_64-debian-stretch x86_64-ubuntu-trusty x86_64-ubuntu-xenial x86_64-ubuntu-zesty +x86_64-ubuntu-artful s390x-ubuntu-xenial s390x-ubuntu-zesty +s390x-ubuntu-artful ppc64le-ubuntu-xenial ppc64le-ubuntu-zesty +ppc64le-ubuntu-artful aarch64-ubuntu-xenial armv6l-raspbian-jessie armv7l-raspbian-jessie @@ -55,6 +58,7 @@ armv7l-debian-stretch armv7l-ubuntu-trusty armv7l-ubuntu-xenial armv7l-ubuntu-zesty +armv7l-ubuntu-artful " mirror='' @@ -352,6 +356,13 @@ do_install() { else pre_reqs="$pre_reqs software-properties-common" fi + + # TODO: DELETE HERE + if [ "$lsb_dist" = "ubuntu" ] && [ "$dist_version" = "artful" ]; then + dist_version="zesty" + fi + # TODO: DELETE HERE + if ! command -v gpg > /dev/null; then pre_reqs="$pre_reqs gnupg" fi