summaryrefslogtreecommitdiffhomepage
path: root/test/scenario_test/ci-scripts/jenkins-build-script.sh
diff options
context:
space:
mode:
authorISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>2015-07-26 18:23:16 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-07-27 11:26:10 +0900
commit27ba012b41d84d7f4c824934b607ba88e8ccc101 (patch)
treefab234c70a8bc69806c15e95bb8fdfdec64ca6e5 /test/scenario_test/ci-scripts/jenkins-build-script.sh
parent11c3fadfabfeda933126ebc70d22d8d65e4f4037 (diff)
test: parallel execution of bgp_router_test and ibgp_router_test
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Diffstat (limited to 'test/scenario_test/ci-scripts/jenkins-build-script.sh')
-rw-r--r--test/scenario_test/ci-scripts/jenkins-build-script.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/test/scenario_test/ci-scripts/jenkins-build-script.sh b/test/scenario_test/ci-scripts/jenkins-build-script.sh
index 5eb2cb50..dabeb3ba 100644
--- a/test/scenario_test/ci-scripts/jenkins-build-script.sh
+++ b/test/scenario_test/ci-scripts/jenkins-build-script.sh
@@ -41,20 +41,23 @@ sudo -E python route_server_malformed_test.py --gobgp-image $GOBGP_IMAGE --go-pa
RET3=$?
mv nosetests.xml ${WS}/nosetest_malformed.xml
-# bgp router test
-sudo -E python bgp_router_test.py --gobgp-image $GOBGP_IMAGE --go-path $GOROOT/bin -s --with-xunit
-RET4=$?
-mv nosetests.xml ${WS}/nosetest_bgp.xml
-
# route server policy test
sudo -E python route_server_policy_test.py --gobgp-image $GOBGP_IMAGE --go-path $GOROOT/bin -s --with-xunit
-RET5=$?
+RET4=$?
mv nosetests.xml ${WS}/nosetest_policy.xml
# bgp router test
-sudo -E python ibgp_router_test.py --gobgp-image $GOBGP_IMAGE --go-path $GOROOT/bin -s --with-xunit
+sudo -E python bgp_router_test.py --gobgp-image $GOBGP_IMAGE --test-prefix bgp -s -x --with-xunit --xunit-file=${WS}/nosetest_bgp.xml &
+PID5=$!
+
+# ibgp router test
+sudo -E python ibgp_router_test.py --gobgp-image $GOBGP_IMAGE --test-prefix ibgp -s -x --with-xunit --xunit-file=${WS}/nosetest_ibgp.xml &
+PID6=$!
+
+wait $PID5
+RET5=$?
+wait $PID6
RET6=$?
-mv nosetests.xml ${WS}/nosetest_ibgp.xml
if [ $RET1 != 0 ] || [ $RET2 != 0 ] || [ $RET3 != 0 ] || [ $RET4 != 0 ] || [ $RET5 != 0 ] || [ $RET6 != 0 ]; then
exit 1