[FLINK-17375] Rename tools/travis_watchdog.sh -> tools/ci/ci_controll…

…er.sh
xiaolongsy2008 · May 26, 2020 · 75cfab4 · 75cfab4
1 parent 4b602a7
commit 75cfab4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -1050,8 +1050,7 @@ public static void teardown() throws Exception {
 
 		// 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
@@ -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 → tools/ci/ci_controller.sh b/tools/travis_watchdog.sh → 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"