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-331: Enable LISP test
[csit.git]
/
bootstrap-vpp-verify-weekly.sh
diff --git
a/bootstrap-vpp-verify-weekly.sh
b/bootstrap-vpp-verify-weekly.sh
index
b4a3e8f
..
6af904b
100644
(file)
--- a/
bootstrap-vpp-verify-weekly.sh
+++ b/
bootstrap-vpp-verify-weekly.sh
@@
-134,7
+134,7
@@
done
echo "Updated file names: " ${VPP_DEBS_FULL[@]}
# Copy the files to VIRL host
echo "Updated file names: " ${VPP_DEBS_FULL[@]}
# Copy the files to VIRL host
-scp
-i ${VIRL_PKEY} -o StrictHostKeyChecking=no
*.deb \
+scp
${SSH_OPTIONS}
*.deb \
${VIRL_USERNAME}@${VIRL_SERVER}:${VIRL_DIR_LOC}/
result=$?
${VIRL_USERNAME}@${VIRL_SERVER}:${VIRL_DIR_LOC}/
result=$?
@@
-148,13
+148,13
@@
fi
echo "Starting simulation on VIRL server"
function stop_virl_simulation {
echo "Starting simulation on VIRL server"
function stop_virl_simulation {
- ssh
-i priv_key -o StrictHostKeyChecking=no
${VIRL_USERNAME}@${VIRL_SERVER}\
- "
/home/jenkins-in/testcase-infra/bin/
stop-testcase ${VIRL_SID}"
+ ssh
${SSH_OPTIONS}
${VIRL_USERNAME}@${VIRL_SERVER}\
+ "stop-testcase ${VIRL_SID}"
}
}
-VIRL_SID=$(ssh
-i priv_key -o StrictHostKeyChecking=no
\
+VIRL_SID=$(ssh
${SSH_OPTIONS}
\
${VIRL_USERNAME}@${VIRL_SERVER} \
${VIRL_USERNAME}@${VIRL_SERVER} \
- "
/home/jenkins-in/testcase-infra/bin/
start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}")
+ "start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}")
retval=$?
if [ "$?" -ne "0" ]; then
echo "VIRL simulation start failed"
retval=$?
if [ "$?" -ne "0" ]; then
echo "VIRL simulation start failed"
@@
-173,7
+173,7
@@
echo ${VIRL_SID}
ssh_do ${VIRL_USERNAME}@${VIRL_SERVER} cat /scratch/${VIRL_SID}/topology.yaml
# Download the topology file from virl session
ssh_do ${VIRL_USERNAME}@${VIRL_SERVER} cat /scratch/${VIRL_SID}/topology.yaml
# Download the topology file from virl session
-scp
-i ${VIRL_PKEY} -o StrictHostKeyChecking=no
\
+scp
${SSH_OPTIONS}
\
${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/topology.yaml \
topologies/enabled/topology.yaml
${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/topology.yaml \
topologies/enabled/topology.yaml
@@
-254,7
+254,9
@@
fi
echo Post-processing test data...
# Rebot output post-processing
echo Post-processing test data...
# Rebot output post-processing
-rebot --output output.xml ./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml
+rebot --noncritical EXPECTED_FAILING \
+ --output output.xml \
+ ./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml
# Remove unnecessary log files
rm -f ./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml
# Remove unnecessary log files
rm -f ./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml