Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Correction in script for building longbow docs"
[ci-management.git]
/
jjb
/
hc2vpp
/
include-raw-hc2vpp-csit-integration.sh
diff --git
a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
index
14ce670
..
e4bbd3f
100644
(file)
--- a/
jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
+++ b/
jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
@@
-1,16
+1,20
@@
#!/bin/bash
set -xeu -o pipefail
#!/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
else
- git clone https://gerrit.fd.io/r/csit --branch 'rls'${STREAM}
+ CSIT_BRANCH='master'
fi
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
# 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
"
+ echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch
${CSIT_BRANCH}
"
exit
fi
exit
fi