Revert "[hotfix][travis] Run pre-commit e2e tests in compile stage"

This reverts commit 2f7d473.
spotify · Jun 14, 2019 · 22305ef · 22305ef
1 parent b63c0f1
commit 22305ef
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/tools/travis_controller.sh b/tools/travis_controller.sh
@@ -126,26 +126,6 @@ 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_watchdog.sh b/tools/travis_watchdog.sh
@@ -280,5 +280,30 @@ 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