Skip to content

Commit

Permalink
[hotfix][travis] Fix caching of misc job
Browse files Browse the repository at this point in the history
Adding the e2e-pre-commit profile activation only to the misc profile broke the caching
  • Loading branch information
zentol committed Feb 7, 2020
1 parent 8a95253 commit 9911e52
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
name: tests - legacy_scheduler
- if: type in (pull_request, push)
script: ./tools/travis_controller.sh misc
env: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11 -Pe2e-pre-commit"
env: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11"
name: misc
- if: type in (pull_request, push)
stage: cleanup
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
name: tests - hadoop 2.4.1
- if: type = cron
script: ./tools/travis_controller.sh misc
env: PROFILE="-Dhadoop.version=2.4.1 -Pskip-hive-tests -Pe2e-pre-commit"
env: PROFILE="-Dhadoop.version=2.4.1 -Pskip-hive-tests"
name: misc - hadoop 2.4.1
- if: type = cron
stage: cleanup
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
name: tests - scala 2.12
- if: type = cron
script: ./tools/travis_controller.sh misc
env: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1 -Pe2e-pre-commit"
env: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
name: misc - scala 2.12
- if: type = cron
stage: cleanup
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
- if: type = cron
jdk: "openjdk11"
script: ./tools/travis_controller.sh misc
env: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11 -Djdk11 -Pe2e-pre-commit"
env: PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws -Dscala-2.11 -Djdk11"
name: misc
- if: type = cron
jdk: "openjdk11"
Expand Down
3 changes: 2 additions & 1 deletion tools/travis_watchdog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ e2e_modules=$(find flink-end-to-end-tests -mindepth 2 -maxdepth 5 -name 'pom.xml

MVN_COMPILE="mvn $MVN_COMMON_OPTIONS $MVN_COMPILE_OPTIONS $PROFILE $MVN_COMPILE_MODULES install"
MVN_TEST="mvn $MVN_COMMON_OPTIONS $MVN_TEST_OPTIONS $PROFILE $MVN_TEST_MODULES verify"
MVN_E2E="mvn $MVN_COMMON_OPTIONS $MVN_TEST_OPTIONS $PROFILE -pl ${e2e_modules},flink-dist verify"
# don't move the e2e-pre-commit profile activation into the misc entry in .travis.yml, since it breaks caching
MVN_E2E="mvn $MVN_COMMON_OPTIONS $MVN_TEST_OPTIONS $PROFILE -Pe2e-pre-commit -pl ${e2e_modules},flink-dist verify"

MVN_PID="${ARTIFACTS_DIR}/watchdog.mvn.pid"
MVN_EXIT="${ARTIFACTS_DIR}/watchdog.mvn.exit"
Expand Down

0 comments on commit 9911e52

Please sign in to comment.