This is an automated email from the ASF dual-hosted git repository. rmetzger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 75cfab442c34a6dc4e1166647e01898e2b5ae2ef Author: Robert Metzger <[email protected]> AuthorDate: Mon May 18 16:47:25 2020 +0200 [FLINK-17375] Rename tools/travis_watchdog.sh -> tools/ci/ci_controller.sh --- .../src/test/java/org/apache/flink/yarn/YarnTestBase.java | 3 +-- tools/azure-pipelines/azure_controller.sh | 2 +- tools/{travis_watchdog.sh => ci/ci_controller.sh} | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java index 031e139..4fbf89a 100644 --- a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java +++ b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnTestBase.java @@ -1050,8 +1050,7 @@ public abstract class YarnTestBase extends TestLogger { // When we are on travis, we copy the temp files of JUnit (containing the MiniYARNCluster log files) // to <flinkRoot>/target/flink-yarn-tests-*. - // The files from there are picked up by the ./tools/travis_watchdog.sh script - // to upload them to Amazon S3. + // The files from there are picked up by the tools/ci/* scripts to upload them. if (isOnTravis()) { File target = new File("../target" + YARN_CONFIGURATION.get(TEST_CLUSTER_NAME_KEY)); if (!target.mkdirs()) { diff --git a/tools/azure-pipelines/azure_controller.sh b/tools/azure-pipelines/azure_controller.sh index 790a214..bbe2faa 100755 --- a/tools/azure-pipelines/azure_controller.sh +++ b/tools/azure-pipelines/azure_controller.sh @@ -184,7 +184,7 @@ elif [ $STAGE != "$STAGE_CLEANUP" ]; then fi - TEST="$STAGE" "./tools/travis_watchdog.sh" 900 + TEST="$STAGE" "./tools/ci/ci_controller.sh" 900 EXIT_CODE=$? elif [ $STAGE == "$STAGE_CLEANUP" ]; then echo "Cleaning up $CACHE_BUILD_DIR" diff --git a/tools/travis_watchdog.sh b/tools/ci/ci_controller.sh similarity index 99% rename from tools/travis_watchdog.sh rename to tools/ci/ci_controller.sh index ed4930b..90ee551 100755 --- a/tools/travis_watchdog.sh +++ b/tools/ci/ci_controller.sh @@ -25,8 +25,8 @@ if [ -z "$HERE" ] ; then exit 1 # fail fi -source "${HERE}/ci/stage.sh" -source "${HERE}/ci/maven-utils.sh" +source "${HERE}/stage.sh" +source "${HERE}/maven-utils.sh" ARTIFACTS_DIR="${HERE}/artifacts" @@ -51,7 +51,7 @@ TRANSFER_UPLOAD_MAX_RETRIES=2 # backoff algorithm should be too long for the last several retries. TRANSFER_UPLOAD_RETRY_DELAY=5 -LOG4J_PROPERTIES=${HERE}/ci/log4j-ci.properties +LOG4J_PROPERTIES=${HERE}/log4j-ci.properties PYTHON_TEST="./flink-python/dev/lint-python.sh" PYTHON_PID="${ARTIFACTS_DIR}/watchdog.python.pid"
