Update hc2vpp-csit-verify prebuild script

[ci-management.git] / jjb / hc2vpp / include-raw-hc2vpp-csit-verify-prebuild.sh

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
index 6e484f9..c08b830 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
@@ -6,11 +6,14 @@ cd ${WORKSPACE}
 
 # Get CSIT branch from which to test from
 # running build-root/scripts/csit-test-branch
-if [ -x csit-test-branch ]; then
-    CSIT_BRANCH=`csit-test-branch`;
+if [ -f csit-test-branch ]; then
+    chmod +x csit-test-branch
+    CSIT_BRANCH=`./csit-test-branch`
+else
+    CSIT_BRANCH='master'
 fi
 
-# Clone csit and start tests
+# Clone csit and download VPP packages
 git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH}
 
 # If the git clone fails, complain clearly and exit
@@ -19,10 +22,12 @@ if [ $? != 0 ]; then
     exit
 fi
 
+cd csit
+
 if [ ${STREAM} == 'master' ]; then
-    ./csit/resources/tools/download_hc_build_pkgs.sh ${STREAM}
+    ./resources/tools/scripts/download_hc_build_pkgs.sh ${STREAM} ${OS}
 else
-    ./csit/resources/tools/download_hc_build_pkgs.sh 'stable.'${STREAM}
+    ./resources/tools/scripts/download_hc_build_pkgs.sh 'stable.'${STREAM} ${OS}
 fi
 
 cd ${current_dir}