From 7b9c26c3f2aad643b8887b65d1b0ff6e8bc7d3bb Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Mon, 6 Aug 2018 17:22:13 +0200
Subject: hc2vpp-csit-verify: use vpp packages based on vpp-version

The hc2vpp-csit-verify allows to run HC CSIT tests per hc2vpp patch.
The job should not use most recent vpp artifacts
for respective branch ('RELEASE'),
but version specified in the vpp-version file.

The vpp-version file is used by hc2vpp-integration job
to produce honeycomb package.

Change-Id: If2811a01256e8217de50d220082dbc204443b54a
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 resources/tools/scripts/download_hc_build_pkgs.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'resources')

diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh
index 15c3d5c9da..48ef1eb4b0 100755
--- a/resources/tools/scripts/download_hc_build_pkgs.sh
+++ b/resources/tools/scripts/download_hc_build_pkgs.sh
@@ -18,9 +18,7 @@ set -ex
 STREAM=$1
 OS=$2
 
-# Download the latest VPP and VPP plugin .deb packages
 URL="https://nexus.fd.io/service/local/artifact/maven/content"
-VER="RELEASE"
 VPP_GROUP="io.fd.vpp"
 # TODO(CSIT-994): reenable NSH
 # NSH_GROUP="io.fd.nsh_sfc"
@@ -39,6 +37,16 @@ fi
 
 REPO="fd.io.${STREAM}.${OS}"
 
+# Use vpp packages based on vpp-version file from hc2vpp project
+VER=`../vpp-version`
+if [ "${VER}" != 'RELEASE' ]; then
+    if [ "${OS}" == "centos7" ]; then
+        VER="${VER}.x86_64"
+    else
+        VER="${VER}_amd64"
+    fi
+fi
+
 for ART in ${VPP_ARTIFACTS}; do
     for PAC in ${PACKAGE}; do
         curl "${URL}?r=${REPO}&g=${VPP_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit
-- 
cgit 1.2.3-korg