Skip to content

Commit

Permalink
[FLINK-17375] Move azure_controller into azure-pipelines folder
Browse files Browse the repository at this point in the history
  • Loading branch information
rmetzger committed May 26, 2020
1 parent c99bf2a commit 2e4a4e0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tools/azure-pipelines/build-python-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions tools/azure-pipelines/jobs-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.

0 comments on commit 2e4a4e0

Please sign in to comment.