[flink] 02/07: [FLINK-17375] Move azure_controller into azure-pipelines folder

[rm...@apache.org]

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 2e4a4e0818e956a926891472d1d593eb1199fb9b
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Mon May 18 16:09:52 2020 +0200

    [FLINK-17375] Move azure_controller into azure-pipelines folder
---
 tools/{ => azure-pipelines}/azure_controller.sh | 12 ++++++------
 tools/azure-pipelines/build-python-wheels.yml   |  2 +-
 tools/azure-pipelines/jobs-template.yml         |  6 +++---
 tools/{ => ci}/verify_scala_suffixes.sh         |  0
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/azure_controller.sh b/tools/azure-pipelines/azure_controller.sh
similarity index 96%
rename from tools/azure_controller.sh
rename to tools/azure-pipelines/azure_controller.sh
index 6c0a74c..790a214 100755
--- a/tools/azure_controller.sh
+++ b/tools/azure-pipelines/azure_controller.sh
@@ -20,14 +20,14 @@
 HERE="`dirname \"$0\"`"             # relative
 HERE="`( cd \"$HERE\" && pwd )`"    # absolutized and normalized
 if [ -z "$HERE" ] ; then
-    # error; for some reason, the path is not accessible
-    # to the script (e.g. permissions re-evaled after suid)
     exit 1  # fail
 fi
+CI_DIR="$HERE/../ci"
 
-source "${HERE}/ci/stage.sh"
-source "${HERE}/ci/shade.sh"
-source "${HERE}/ci/maven-utils.sh"
+# source required ci scripts
+source "${CI_DIR}/stage.sh"
+source "${CI_DIR}/shade.sh"
+source "${CI_DIR}/maven-utils.sh"
 
 echo $M2_HOME
 echo $PATH
@@ -75,7 +75,7 @@ if [ $STAGE == "$STAGE_COMPILE" ]; then
         echo "Checking scala suffixes\n"
         echo "==============================================================================\n"
 
-        ./tools/verify_scala_suffixes.sh "${PROFILE}"
+        ./tools/ci/verify_scala_suffixes.sh "${PROFILE}"
         EXIT_CODE=$?
     else
         echo "\n==============================================================================\n"
diff --git a/tools/azure-pipelines/build-python-wheels.yml b/tools/azure-pipelines/build-python-wheels.yml
index a7dd375..f4bc620 100644
--- a/tools/azure-pipelines/build-python-wheels.yml
+++ b/tools/azure-pipelines/build-python-wheels.yml
@@ -22,7 +22,7 @@ jobs:
       clean: all
     steps:
       # Compile
-      - script: STAGE=compile ${{parameters.environment}} ./tools/azure_controller.sh compile
+      - script: STAGE=compile ${{parameters.environment}} ./tools/azure-pipelines/azure_controller.sh compile
         displayName: Build
 
       - script: |
diff --git a/tools/azure-pipelines/jobs-template.yml b/tools/azure-pipelines/jobs-template.yml
index 0efb1a2..fbe5bd8 100644
--- a/tools/azure-pipelines/jobs-template.yml
+++ b/tools/azure-pipelines/jobs-template.yml
@@ -64,7 +64,7 @@ jobs:
     displayName: "Set to jdk11"
     condition: eq('${{parameters.jdk}}', 'jdk11')
   # Compile
-  - script: STAGE=compile ${{parameters.environment}} ./tools/azure_controller.sh compile
+  - script: STAGE=compile ${{parameters.environment}} ./tools/azure-pipelines/azure_controller.sh compile
     displayName: Build
 
   # upload artifacts for next stage
@@ -129,7 +129,7 @@ jobs:
   - script: sudo sysctl -w kernel.core_pattern=core.%p
     displayName: Set coredump pattern
   # Test
-  - script: STAGE=test ${{parameters.environment}} ./tools/azure_controller.sh $(module)
+  - script: STAGE=test ${{parameters.environment}} ./tools/azure-pipelines/azure_controller.sh $(module)
     displayName: Test - $(module)
     env:
       IT_CASE_S3_BUCKET: $(SECRET_S3_BUCKET)
@@ -178,7 +178,7 @@ jobs:
     - script: ./tools/azure-pipelines/free_disk_space.sh
       displayName: Free up disk space
     - script: sudo apt-get install -y bc
-    - script: ${{parameters.environment}} STAGE=compile ./tools/azure_controller.sh compile
+    - script: ${{parameters.environment}} STAGE=compile ./tools/azure-pipelines/azure_controller.sh compile
       displayName: Build Flink
     # TODO remove pre-commit tests script by adding the tests to the nightly script
 #    - script: FLINK_DIR=build-target ./flink-end-to-end-tests/run-pre-commit-tests.sh
diff --git a/tools/verify_scala_suffixes.sh b/tools/ci/verify_scala_suffixes.sh
similarity index 100%
rename from tools/verify_scala_suffixes.sh
rename to tools/ci/verify_scala_suffixes.sh