diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-02-02 19:04:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-02-02 19:04:41 +0000 |
| commit | 20f0e361049c9bd14130880650069d16b2a85dc1 (patch) | |
| tree | cb0da69d7c476850cf23e95334c5d509b152a4c7 | |
| parent | 60c3b89f151a0a6adc7fd55a1d2584f45e3af9ce (diff) | |
| parent | d52382accae948ea1dbf74254ff6ce5b372bdc02 (diff) | |
Merge "Fix issues in hc2vpp-csit scripts"
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh | 3 | ||||
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh index 6155a46a3..915ca8cf4 100644 --- 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 6e484f98e..3ce834498 100644 --- 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 |