diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2016-05-30 11:19:52 +0200 |
|---|---|---|
| committer |   Miroslav Miklus <mmiklus@cisco.com> | 2016-05-31 08:37:47 +0000 |
| commit | 3b4ed04d3bd70f306680aa368c02c5eab078b0df (patch) | |
| tree | 2674fcb82af2add9824f09789dea664bfb735a86 | |
| parent | 48aae07d25125fb7f561054c699e547df7dfa8fb (diff) | |
PATCH: Return pybot exit code in bootstrap-verify-perf
- Return exit code from pybot instead of last command in bootstrap file.
Change-Id: If8430426d7259c832c0ea78d2d165d09f8c4eda7
Signed-off-by: Peter Mikus <pmikus@cisco.com>
| -rwxr-xr-x | bootstrap-verify-perf.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 7f5840ee0d..1f5acd3b2e 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -120,6 +120,7 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -i perftest_long \ tests/ + RETURN_STATUS=$(echo $?) ;; PERFTEST_SHORT ) pybot ${PYBOT_ARGS} \ @@ -127,6 +128,7 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -i perftest_short \ tests/ + RETURN_STATUS=$(echo $?) ;; PERFTEST_LONG_BRIDGE ) pybot ${PYBOT_ARGS} \ @@ -134,6 +136,7 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "performance.Long_Bridge_Domain*" \ tests/ + RETURN_STATUS=$(echo $?) ;; PERFTEST_LONG_IPV4 ) pybot ${PYBOT_ARGS} \ @@ -141,6 +144,7 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "performance.Long_IPv4*" \ tests/ + RETURN_STATUS=$(echo $?) ;; PERFTEST_LONG_IPV6 ) pybot ${PYBOT_ARGS} \ @@ -148,6 +152,7 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "performance.Long_IPv6*" \ tests/ + RETURN_STATUS=$(echo $?) ;; PERFTEST_LONG_XCONNECT ) pybot ${PYBOT_ARGS} \ @@ -155,6 +160,7 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s "performance.Long_Xconnect*" \ tests/ + RETURN_STATUS=$(echo $?) ;; PERFTEST_LONG_XCONNECT_DOT1Q ) pybot ${PYBOT_ARGS} \ @@ -175,6 +181,7 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s performance -i PDR \ tests/ + RETURN_STATUS=$(echo $?) ;; * ) # run full performance test suite and exit on fail @@ -183,9 +190,12 @@ case "$TEST_TAG" in -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ -s performance \ tests/ + RETURN_STATUS=$(echo $?) esac # Pybot output post-processing +echo Post-processing test data... + python ${CUR_DIR}/resources/tools/robot_output_parser.py \ -i ${CUR_DIR}/output.xml \ -o ${CUR_DIR}/output_perf_data.json \ @@ -200,3 +210,6 @@ for i in ${ARCHIVE_ARTIFACTS[@]}; do cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ done +echo Post-processing finished. + +exit ${RETURN_STATUS} |