This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 2f7d473 [hotfix][travis] Run pre-commit e2e tests in compile stage
2f7d473 is described below
commit 2f7d47300cb51bc3eff13feb9386d4ce7ce50ce8
Author: Chesnay Schepler <[email protected]>
AuthorDate: Sat Apr 27 20:13:24 2019 +0200
[hotfix][travis] Run pre-commit e2e tests in compile stage
---
tools/travis_controller.sh | 20 ++++++++++++++++++++
tools/travis_mvn_watchdog.sh | 25 -------------------------
2 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/tools/travis_controller.sh b/tools/travis_controller.sh
index d7ec3a5..ff3d44c 100755
--- a/tools/travis_controller.sh
+++ b/tools/travis_controller.sh
@@ -126,6 +126,26 @@ if [ $STAGE == "$STAGE_COMPILE" ]; then
echo
"=============================================================================="
fi
+ if [[ ${PROFILE} == *"jdk9"* ]]; then
+ printf
"\n\n==============================================================================\n"
+ printf "Skipping end-to-end tests since they fail on Java 9.\n"
+ printf
"==============================================================================\n"
+ else
+ if [ $EXIT_CODE == 0 ]; then
+ printf
"\n\n==============================================================================\n"
+ printf "Running end-to-end tests\n"
+ printf
"==============================================================================\n"
+
+ FLINK_DIR=build-target
flink-end-to-end-tests/run-pre-commit-tests.sh
+
+ EXIT_CODE=$?
+ else
+ printf
"\n==============================================================================\n"
+ printf "Previous build failure detected, skipping end-to-end
tests.\n"
+ printf
"==============================================================================\n"
+ fi
+ fi
+
if [ $EXIT_CODE == 0 ]; then
echo "Creating cache build directory $CACHE_FLINK_DIR"
mkdir -p "$CACHE_FLINK_DIR"
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index 6d9d7d0..e5deda7 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -259,30 +259,5 @@ upload_artifacts_s3
# we are going back to
cd ../../
-# only run end-to-end tests in misc because we only have flink-dist here
-if [[ ${PROFILE} == *"jdk9"* ]]; then
- printf
"\n\n==============================================================================\n"
- printf "Skipping end-to-end tests since they fail on Java 9.\n"
- printf
"==============================================================================\n"
-else
- case $TEST in
- (misc)
- if [ $EXIT_CODE == 0 ]; then
- printf
"\n\n==============================================================================\n"
- printf "Running end-to-end tests\n"
- printf
"==============================================================================\n"
-
- FLINK_DIR=build-target
flink-end-to-end-tests/run-pre-commit-tests.sh
-
- EXIT_CODE=$?
- else
- printf
"\n==============================================================================\n"
- printf "Previous build failure detected, skipping end-to-end
tests.\n"
- printf
"==============================================================================\n"
- fi
- ;;
- esac
-fi
-
# Exit code for Travis build success/failure
exit $EXIT_CODE
