Get CSIT branch from build-root/scripts/csit-test-branch

If build-root/scripts/csit-test-branch exists, run
it to get the CSIT branch from which to run CSIT
tests.  Otherwise, default to csit-verified.

Related to patches vpp patches:
https://gerrit.fd.io/r/#/c/1343/ (master branch)
https://gerrit.fd.io/r/#/c/1345/ (stable/1606 branch)

Change-Id: I1146c322c1948076ead4639263f9b25e965009f2
Signed-off-by: Ed Warnicke <[email protected]>

diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh
index 93be0ad..33eef0f 100644 (file)
--- a/jjb/vpp/include-raw-vpp-csit-functional.sh
+++ b/jjb/vpp/include-raw-vpp-csit-functional.sh
@@ -1,8 +1,21 @@
 #!/bin/bash
 set -xeu -o pipefail
 
+# Get CSIT branch from which to test from
+# running build-root/scripts/csit-test-branch
+if [ -x build-root/scripts/csit-test-branch ]; then
+    CSIT_BRANCH=`build-root/scripts/csit-test-branch`;
+fi
+
 # Clone csit and start tests
-git clone https://gerrit.fd.io/r/csit --branch csit-verified
+git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH:-csit-verified}
+
+# If the git clone fails, complain clearly and exit
+if [ $? != 0 ]; then
+    echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH:-csit-verified}"
+    echo "No such branch ${CSIT_BRANCH:-csit-verified} in https://gerrit.fd.io/r/csit"
+    exit
+fi
 
 cp build-root/*.deb csit/
 cd csit

diff --git a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
index f24692d..a314260 100644 (file)
--- a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
+++ b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
@@ -3,9 +3,22 @@ set -xeu -o pipefail
 
 export TEST_TAG="PERFTEST_${TYPE^^}"
 
+# Get CSIT branch from which to test from
+# running build-root/scripts/csit-test-branch
+if [ -x build-root/scripts/csit-test-branch ]; then
+    CSIT_BRANCH=`build-root/scripts/csit-test-branch`;
+fi
+
 # Clone csit and start tests
 git clone --depth 1 https://gerrit.fd.io/r/csit --branch csit-verified
 
+# If the git clone fails, complain clearly and exit
+if [ $? != 0 ]; then
+    echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH:-csit-verified}"
+    echo "No such branch ${CSIT_BRANCH:-csit-verified} in https://gerrit.fd.io/r/csit"
+    exit
+fi
+
 cp build-root/*.deb csit/
 cd csit
 # execute csit bootstrap script if it exists