IMPALA-3630: forward end-to-end test arguments to custom cluster tests The breakpad custom cluster tests expect to run in exhaustive only, but the option to do that isn't passed appropriately. That means they aren't being run at all in Jenkins.
Fix the problem by setting a common set of arguments in run-all-tests.sh and passing them along as needed. Change-Id: I57f9ab6235f99e6a4d5fb50b87ceba3584b6b6d2 Reviewed-on: http://gerrit.cloudera.org:8080/3307 Reviewed-by: Silvius Rus <[email protected]> Reviewed-by: Michael Brown <[email protected]> Tested-by: Michael Brown <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/abd6ad30 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/abd6ad30 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/abd6ad30 Branch: refs/heads/master Commit: abd6ad3020bd782221277d5bf1583577327639a4 Parents: c1093ed Author: Michael Brown <[email protected]> Authored: Thu May 26 18:23:27 2016 -0700 Committer: Tim Armstrong <[email protected]> Committed: Thu Jun 9 17:31:00 2016 -0700 ---------------------------------------------------------------------- bin/run-all-tests.sh | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/abd6ad30/bin/run-all-tests.sh ---------------------------------------------------------------------- diff --git a/bin/run-all-tests.sh b/bin/run-all-tests.sh index ef7a121..0a10c6a 100755 --- a/bin/run-all-tests.sh +++ b/bin/run-all-tests.sh @@ -83,6 +83,16 @@ do esac done +# The EXPLORATION_STRATEGY parameter should only apply to the +# functional-query workload because the larger datasets (ex. tpch) are +# not generated in all table formats. +COMMON_PYTEST_ARGS="--maxfail=${MAX_PYTEST_FAILURES} --exploration_strategy=core"` + `" --workload_exploration_strategy=functional-query:$EXPLORATION_STRATEGY" +if [[ "${TARGET_FILESYSTEM}" == "local" ]]; then + # Only one impalad is supported when running against local filesystem. + COMMON_PYTEST_ARGS+=" --impalad=localhost:21000" +fi + # For logging when using run-step. LOG_DIR=${IMPALA_EE_TEST_LOGS_DIR} @@ -145,20 +155,10 @@ do fi if [[ "$EE_TEST" == true ]]; then - # Run end-to-end tests. The EXPLORATION_STRATEGY parameter should only apply to the - # functional-query workload because the larger datasets (ex. tpch) are not generated - # in all table formats. + # Run end-to-end tests. # KERBEROS TODO - this will need to deal with ${KERB_ARGS} - LOCAL_FS_ARGS="" - if [[ "$TARGET_FILESYSTEM" == "local" ]]; then - # Only one impalad is supported when running against local filesystem. - LOCAL_FS_ARGS="--impalad=localhost:21000" - fi - if ! ${IMPALA_HOME}/tests/run-tests.py --maxfail=${MAX_PYTEST_FAILURES} \ - --exploration_strategy=core \ - --workload_exploration_strategy=functional-query:$EXPLORATION_STRATEGY \ - ${LOCAL_FS_ARGS} \ - ${EE_TEST_FILES}; then #${KERB_ARGS}; + if ! ${IMPALA_HOME}/tests/run-tests.py ${COMMON_PYTEST_ARGS} ${EE_TEST_FILES}; then + #${KERB_ARGS}; TEST_RET_CODE=1 fi fi @@ -189,8 +189,7 @@ do # Run the custom-cluster tests after all other tests, since they will restart the # cluster repeatedly and lose state. # TODO: Consider moving in to run-tests.py. - if ! ${IMPALA_HOME}/tests/run-custom-cluster-tests.sh \ - --maxfail=${MAX_PYTEST_FAILURES}; then + if ! ${IMPALA_HOME}/tests/run-custom-cluster-tests.sh ${COMMON_PYTEST_ARGS}; then TEST_RET_CODE=1 fi export IMPALA_MAX_LOG_FILES=${IMPALA_MAX_LOG_FILES_SAVE}
