From cdfc86f670da56bbd712cb05c10541a1ca23e52a Mon Sep 17 00:00:00 2001 From: gongzhongqiang <764629910@qq.com> Date: Wed, 7 Sep 2022 09:54:15 +0800 Subject: [PATCH] [build] Polish CI scripts and remove useless code (#1540) This closes #1540. --- tools/ci/test_controller.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/ci/test_controller.sh b/tools/ci/test_controller.sh index cd1ad0550..436f0a472 100755 --- a/tools/ci/test_controller.sh +++ b/tools/ci/test_controller.sh @@ -47,7 +47,7 @@ if [ ! -d "$DEBUG_FILES_OUTPUT_DIR" ] ; then fi if [ -z "$STAGE" ] ; then - echo "ERROR: Environment variable 'STAGE' is not set but expected by test_controller.sh. THe variable refers to the stage being executed." + echo "ERROR: Environment variable 'STAGE' is not set but expected by test_controller.sh. The variable refers to the stage being executed." exit 1 fi @@ -78,7 +78,7 @@ source "${HERE}/watchdog.sh" LOG4J_PROPERTIES=${HERE}/log4j.properties MVN_LOGGING_OPTIONS="-Dlog.dir=${DEBUG_FILES_OUTPUT_DIR} -Dlog4j.configurationFile=file://$LOG4J_PROPERTIES" -MVN_COMMON_OPTIONS="-Dfast -Pskip-webui-build $MVN_LOGGING_OPTIONS" +MVN_COMMON_OPTIONS="-Dfast $MVN_LOGGING_OPTIONS" MVN_COMPILE_OPTIONS="-DskipTests" MVN_COMPILE_MODULES=$(get_compile_modules_for_stage ${STAGE}) @@ -98,10 +98,9 @@ fi # Step 2: Run tests # ============================================================================= -MVN_TEST_OPTIONS="-Dflink.tests.with-openssl" MVN_TEST_MODULES=$(get_test_modules_for_stage ${STAGE}) -run_with_watchdog "run_mvn $MVN_COMMON_OPTIONS $MVN_TEST_OPTIONS $PROFILE $MVN_TEST_MODULES verify" $CALLBACK_ON_TIMEOUT +run_with_watchdog "run_mvn $MVN_COMMON_OPTIONS $PROFILE $MVN_TEST_MODULES verify" $CALLBACK_ON_TIMEOUT EXIT_CODE=$? # =============================================================================