address comment

mbalassi · Jul 15, 2019 · deac25d · deac25d
1 parent c8339a6
commit deac25d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -160,45 +160,41 @@ jobs:
  - if: type = cron
  stage: compile
  script: ./tools/travis_controller.sh compile
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: compile - scala 2.12
  - if: type = cron
  stage: test
  script: ./tools/travis_controller.sh core
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: core - scala 2.12
  - if: type = cron
  script: ./tools/travis_controller.sh libraries
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: libraries - scala 2.12
  - if: type = cron
  script: ./tools/travis_controller.sh blink_planner
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: blink_planner - scala 2.12
  - if: type = cron
  script: ./tools/travis_controller.sh connectors
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: connectors - scala 2.12
  - if: type = cron
  script: ./tools/travis_controller.sh kafka/gelly
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: kafka/gelly - scala 2.12
  - if: type = cron
  script: ./tools/travis_controller.sh tests
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: tests - scala 2.12
  - if: type = cron
  script: ./tools/travis_controller.sh misc
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: misc - scala 2.12
- - if: type = cron
- script: ./tools/travis_controller.sh connector_hive_1_2_1
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
- name: connector_hive_1_2_1 - scala 2.12
  - if: type = cron
  stage: cleanup
  script: ./tools/travis_controller.sh cleanup
- env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+ env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12 -Phive-1.2.1"
  name: cleanup - scala 2.12
  # JDK9 profile
  - if: type = cron

diff --git a/tools/travis/stage.sh b/tools/travis/stage.sh
@@ -25,7 +25,6 @@ STAGE_BLINK_PLANNER="blink_planner"
 STAGE_CONNECTORS="connectors"
 STAGE_KAFKA_GELLY="kafka/gelly"
 STAGE_TESTS="tests"
-STAGE_CONNECTOR_HIVE_1_2_1="connector_hive_1_2_1"
 STAGE_MISC="misc"
 STAGE_CLEANUP="cleanup"
 
@@ -130,9 +129,6 @@ MODULES_CONNECTORS_JDK9_EXCLUSIONS="\
 MODULES_TESTS="\
 flink-tests"
 
-MODULES_CONNECTOR_HIVE="\
-flink-connectors/flink-connector-hive"
-
 if [[ ${PROFILE} == *"include-kinesis"* ]]; then
  MODULES_CONNECTORS="$MODULES_CONNECTORS,flink-connectors/flink-connector-kinesis"
 fi
@@ -169,9 +165,6 @@ function get_compile_modules_for_stage() {
  (${STAGE_TESTS})
  echo "-pl $MODULES_TESTS -am"
  ;;
- (${STAGE_CONNECTOR_HIVE_1_2_1})
- echo "-pl $MODULES_CONNECTOR_HIVE -am -Phive-1.2.1"
- ;;
  (${STAGE_MISC})
  # compile everything; using the -am switch does not work with negated module lists!
  # the negation takes precedence, thus not all required modules would be built
@@ -220,10 +213,6 @@ function get_test_modules_for_stage() {
  (${STAGE_TESTS})
  echo "-pl $modules_tests"
  ;;
- (${STAGE_CONNECTOR_HIVE_1_2_1})
- # We want to re-compile flink-connector-hive against Hive-1.2.1. Add clean here so that only flink-connector-hive is re-compiled.
- echo "-pl $MODULES_CONNECTOR_HIVE -Phive-1.2.1 clean"
- ;;
  (${STAGE_MISC})
  echo "-pl $modules_misc"
  ;;