From 41e457deee888f130df0c41f66814aad85e6d158 Mon Sep 17 00:00:00 2001 From: selias <samelias@cisco.com> Date: Wed, 5 Apr 2017 12:16:25 +0200 Subject: Use hc2vpp/csit_test_branch file to determine CSIT branch Change-Id: I273c5729eba87542c9cb315faebc02546afb0ae1 Signed-off-by: selias <samelias@cisco.com> --- jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'jjb') diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh index 14ce67029..bf6e70c1d 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh @@ -1,13 +1,17 @@ #!/bin/bash set -xeu -o pipefail -# Clone csit and start tests -if [ ${STREAM} == 'master' ]; then - git clone https://gerrit.fd.io/r/csit --branch master +# Get CSIT branch +if [ -f csit-test-branch ]; then + chmod +x csit-test-branch + CSIT_BRANCH=`./csit-test-branch` else - git clone https://gerrit.fd.io/r/csit --branch 'rls'${STREAM} + CSIT_BRANCH='master' fi +# Clone csit +git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH} + # 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 master" -- cgit 1.2.3-korg