x
/
fuel-plugin-vmware-dvs
Code Issues Proposed changes

Merge "Minor fix in system_tests.sh"

This commit is contained in:
Jenkins 2015-12-14 15:22:30 +00:00 committed by Gerrit Code Review
parent 4bd8c54102 492ffa2461
commit 133ab3cb4b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin_test/fuel-qa

@ -1 +1 @@
Subproject commit 631b19054da865726856b11b02c994be2fecceae
Subproject commit 202126f27c9ac907a6a26d0886397c208c042071

4
plugin_test/utils/jenkins/system_tests.sh
View File

@ -469,6 +469,7 @@ RunTest() {
OPTS="${OPTS} ${TEST_OPTIONS}"
fi
clean_old_bridges
# run python test set to create environments, deploy and test product
if [ "${DRY_RUN}" = "yes" ]; then
echo export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
@ -499,10 +500,11 @@ RunTest() {
sleep 10
# Configre vcenter nodes and interfaces
clean_old_bridges
setup_net $ENV_NAME
clean_iptables
revert_ws "$WORKSTATION_NODES" || { echo "killing $SYSTEST_PID and its childs" && pkill --parent $SYSTEST_PID && kill $SYSTEST_PID && exit 1; }
#fixme should use only one clean_iptables call
clean_iptables
echo waiting for system tests to finish
wait $SYSTEST_PID