From 90b01a421ed49f69aa4d9b39a6d2a78518823158 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 25 Jul 2018 16:41:10 +0200 Subject: [PATCH] HC Tests: remove trusty from download_hc_*.sh scripts Ubuntu 14.04 packages are not being published since 1710. Change-Id: I1372fe0eb4eab3c6c3e0f3a7ee435104f3c6f0fb Signed-off-by: Marek Gradzki --- resources/tools/scripts/download_hc_build_pkgs.sh | 10 ++-------- resources/tools/scripts/download_hc_pkgs.sh | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh index b0aedd9b58..fddeae42f7 100755 --- a/resources/tools/scripts/download_hc_build_pkgs.sh +++ b/resources/tools/scripts/download_hc_build_pkgs.sh @@ -24,22 +24,16 @@ VER="RELEASE" VPP_GROUP="io.fd.vpp" NSH_GROUP="io.fd.nsh_sfc" NSH_ARTIFACTS="vpp-nsh-plugin" +VPP_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java" -if [ "${OS}" == "ubuntu1404" ]; then - OS="ubuntu.trusty.main" - PACKAGE="deb deb.md5" - CLASS="deb" - VPP_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java" -elif [ "${OS}" == "ubuntu1604" ]; then +if [ "${OS}" == "ubuntu1604" ]; then OS="ubuntu.xenial.main" PACKAGE="deb deb.md5" CLASS="deb" - VPP_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java" elif [ "${OS}" == "centos7" ]; then OS="centos7" PACKAGE="rpm rpm.md5" CLASS="" - VPP_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java" fi REPO="fd.io.${STREAM}.${OS}" diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh index ffdfcb8391..06d805dc7c 100755 --- a/resources/tools/scripts/download_hc_pkgs.sh +++ b/resources/tools/scripts/download_hc_pkgs.sh @@ -25,22 +25,16 @@ HC_GROUP="io.fd.hc2vpp" NSH_GROUP="io.fd.nsh_sfc" HC_ARTIFACTS="honeycomb" NSH_ARTIFACTS="vpp-nsh-plugin" +VPP_ARTIFACTS="vpp vpp-lib vpp-plugins" -if [ "${OS}" == "ubuntu1404" ]; then - OS="ubuntu.trusty.main" - PACKAGE="deb deb.md5" - CLASS="deb" - VPP_ARTIFACTS="vpp vpp-lib vpp-plugins" -elif [ "${OS}" == "ubuntu1604" ]; then +if [ "${OS}" == "ubuntu1604" ]; then OS="ubuntu.xenial.main" PACKAGE="deb deb.md5" CLASS="deb" - VPP_ARTIFACTS="vpp vpp-lib vpp-plugins" elif [ "${OS}" == "centos7" ]; then OS="centos7" PACKAGE="rpm rpm.md5" CLASS="" - VPP_ARTIFACTS="vpp vpp-lib vpp-plugins" fi REPO="fd.io.${STREAM}.${OS}" -- 2.16.6