Merge "Fix issues in hc2vpp-csit scripts"

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
index 6155a46..915ca8c 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
@@ -5,7 +5,8 @@ set -xeu -o pipefail
 if [ ${STREAM} == 'master' ]; then
     git clone https://gerrit.fd.io/r/csit --branch master
 else
-        git clone https://gerrit.fd.io/r/csit --branch 'rls'${STREAM}
+    git clone https://gerrit.fd.io/r/csit --branch 'rls'${STREAM}
+fi
 
 # If the git clone fails, complain clearly and exit
 if [ $? != 0 ]; then

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
index 6e484f9..3ce8344 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
@@ -6,8 +6,9 @@ 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`
 fi
 
 # Clone csit and start tests