Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-488 TLDK jbb validation jobs need cmake installed
[csit.git]
/
bootstrap-vpp-verify-weekly.sh
diff --git
a/bootstrap-vpp-verify-weekly.sh
b/bootstrap-vpp-verify-weekly.sh
index
94688ed
..
9e86e6e
100644
(file)
--- a/
bootstrap-vpp-verify-weekly.sh
+++ b/
bootstrap-vpp-verify-weekly.sh
@@
-29,6
+29,9
@@
VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
+VIRL_TOPOLOGY=double-ring-nested.xenial
+VIRL_RELEASE=csit-ubuntu-16.04.1_2016-12-19_1.6
+
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
function ssh_do() {
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
function ssh_do() {
@@
-156,9
+159,9
@@
function stop_virl_simulation {
VIRL_SID=$(ssh ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER} \
VIRL_SID=$(ssh ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER} \
- "start-testcase -c
double-ring-nested
${VPP_DEBS_FULL[@]}")
+ "start-testcase -c
${VIRL_TOPOLOGY} -r ${VIRL_RELEASE}
${VPP_DEBS_FULL[@]}")
retval=$?
retval=$?
-if [
"$?"
-ne "0" ]; then
+if [
${retval}
-ne "0" ]; then
echo "VIRL simulation start failed"
exit ${retval}
fi
echo "VIRL simulation start failed"
exit ${retval}
fi
@@
-180,7
+183,7
@@
scp ${SSH_OPTIONS} \
topologies/enabled/topology.yaml
retval=$?
topologies/enabled/topology.yaml
retval=$?
-if [
"$?"
-ne "0" ]; then
+if [
${retval}
-ne "0" ]; then
echo "Failed to copy topology file from VIRL simulation"
exit ${retval}
fi
echo "Failed to copy topology file from VIRL simulation"
exit ${retval}
fi