From: Marek Gradzki <mgradzki@cisco.com>
Date: Wed, 25 Jul 2018 14:41:10 +0000 (+0200)
Subject: HC Tests: remove trusty from download_hc_*.sh scripts
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=81d535320fa4ac385b3385881785cbebef73e2eb

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 <mgradzki@cisco.com>
---

diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh
index 6261e2b7d6..15c3d5c9da 100755
--- a/resources/tools/scripts/download_hc_build_pkgs.sh
+++ b/resources/tools/scripts/download_hc_build_pkgs.sh
@@ -25,22 +25,16 @@ VPP_GROUP="io.fd.vpp"
 # TODO(CSIT-994): reenable NSH
 # 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 a7b76a9635..caa92c555e 100755
--- a/resources/tools/scripts/download_hc_pkgs.sh
+++ b/resources/tools/scripts/download_hc_pkgs.sh
@@ -26,22 +26,16 @@ HC_ARTIFACTS="honeycomb"
 # TODO(CSIT-994): reenable NSH
 # NSH_GROUP="io.fd.nsh_sfc"
 # 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}"