You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/07/15 10:22:14 UTC

[flink] branch master updated (4979f33 -> deac25d)

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.


    from 4979f33  [FLINK-13154][docs] Fix broken links
     new 3298f0c  [FLINK-12995][hive] Add Hive-1.2.1 build to Travis
     new 7f6695c  don't need a separate stage
     new ce9b84e  move clean to get_test_modules_for_stage
     new a38cdc1  move to cron job
     new c8339a6  address comments
     new deac25d  address comment

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


[flink] 02/06: don't need a separate stage

Posted by ch...@apache.org.
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

commit 7f6695c85e16369ea912270e0020019e67d27b5f
Author: Rui Li <li...@apache.org>
AuthorDate: Thu Jun 27 19:04:52 2019 +0800

    don't need a separate stage
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 78392ae..0b33ff2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,7 +65,6 @@ notifications:
 stages:
   - name: compile
   - name: test
-  - name: connector_hive_1
   - name: E2E
     if: type = cron
   - name: cleanup
@@ -113,7 +112,6 @@ jobs:
       env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.11"
       name: misc
     - if: type in (pull_request, push)
-      stage: connector_hive_1
       script: ./tools/travis_controller.sh connector_hive_1
       env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.11"
       name: connector_hive_1


[flink] 04/06: move to cron job

Posted by ch...@apache.org.
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

commit a38cdc135497f58cfd0fe2429fc42e514558bc54
Author: Rui Li <li...@apache.org>
AuthorDate: Tue Jul 9 14:31:25 2019 +0800

    move to cron job
---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b33ff2..8ccf73d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,10 +112,6 @@ jobs:
       env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.11"
       name: misc
     - if: type in (pull_request, push)
-      script: ./tools/travis_controller.sh connector_hive_1
-      env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.11"
-      name: connector_hive_1
-    - if: type in (pull_request, push)
       stage: cleanup
       script: ./tools/travis_controller.sh cleanup
       env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.11"
@@ -196,6 +192,10 @@ jobs:
       env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
       name: misc - scala 2.12
     - if: type = cron
+      script: ./tools/travis_controller.sh connector_hive_1
+      env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
+      name: connector_hive_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"


[flink] 05/06: address comments

Posted by ch...@apache.org.
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

commit c8339a64eef5a67cfd2789b9b21fb4929f64f13d
Author: Rui Li <li...@apache.org>
AuthorDate: Wed Jul 10 11:23:02 2019 +0800

    address comments
---
 .travis.yml           | 4 ++--
 tools/travis/stage.sh | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ccf73d..3126896 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -192,9 +192,9 @@ jobs:
       env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.12"
       name: misc - scala 2.12
     - if: type = cron
-      script: ./tools/travis_controller.sh connector_hive_1
+      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 - scala 2.12
+      name: connector_hive_1_2_1 - scala 2.12
     - if: type = cron
       stage: cleanup
       script: ./tools/travis_controller.sh cleanup
diff --git a/tools/travis/stage.sh b/tools/travis/stage.sh
index 4c4e2bc..d473aa1 100644
--- a/tools/travis/stage.sh
+++ b/tools/travis/stage.sh
@@ -25,7 +25,7 @@ STAGE_BLINK_PLANNER="blink_planner"
 STAGE_CONNECTORS="connectors"
 STAGE_KAFKA_GELLY="kafka/gelly"
 STAGE_TESTS="tests"
-STAGE_CONNECTOR_HIVE_1="connector_hive_1"
+STAGE_CONNECTOR_HIVE_1_2_1="connector_hive_1_2_1"
 STAGE_MISC="misc"
 STAGE_CLEANUP="cleanup"
 
@@ -169,7 +169,7 @@ function get_compile_modules_for_stage() {
         (${STAGE_TESTS})
             echo "-pl $MODULES_TESTS -am"
         ;;
-        (${STAGE_CONNECTOR_HIVE_1})
+        (${STAGE_CONNECTOR_HIVE_1_2_1})
             echo "-pl $MODULES_CONNECTOR_HIVE -am -Phive-1.2.1"
         ;;
         (${STAGE_MISC})
@@ -220,7 +220,8 @@ function get_test_modules_for_stage() {
         (${STAGE_TESTS})
             echo "-pl $modules_tests"
         ;;
-        (${STAGE_CONNECTOR_HIVE_1})
+        (${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})


[flink] 01/06: [FLINK-12995][hive] Add Hive-1.2.1 build to Travis

Posted by ch...@apache.org.
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

commit 3298f0cbffb7b357a005b3543f5a81e62af4d996
Author: Rui Li <li...@apache.org>
AuthorDate: Thu Jun 27 17:02:52 2019 +0800

    [FLINK-12995][hive] Add Hive-1.2.1 build to Travis
---
 .travis.yml           |  6 ++++++
 tools/travis/stage.sh | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 03bbbb9..78392ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,6 +65,7 @@ notifications:
 stages:
   - name: compile
   - name: test
+  - name: connector_hive_1
   - name: E2E
     if: type = cron
   - name: cleanup
@@ -112,6 +113,11 @@ jobs:
       env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.11"
       name: misc
     - if: type in (pull_request, push)
+      stage: connector_hive_1
+      script: ./tools/travis_controller.sh connector_hive_1
+      env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.11"
+      name: connector_hive_1
+    - if: type in (pull_request, push)
       stage: cleanup
       script: ./tools/travis_controller.sh cleanup
       env: PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis -Dinclude_hadoop_aws -Dscala-2.11"
diff --git a/tools/travis/stage.sh b/tools/travis/stage.sh
index 7bd7a97..922430e 100644
--- a/tools/travis/stage.sh
+++ b/tools/travis/stage.sh
@@ -25,6 +25,7 @@ STAGE_BLINK_PLANNER="blink_planner"
 STAGE_CONNECTORS="connectors"
 STAGE_KAFKA_GELLY="kafka/gelly"
 STAGE_TESTS="tests"
+STAGE_CONNECTOR_HIVE_1="connector_hive_1"
 STAGE_MISC="misc"
 STAGE_CLEANUP="cleanup"
 
@@ -129,6 +130,9 @@ 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
@@ -165,6 +169,9 @@ function get_compile_modules_for_stage() {
         (${STAGE_TESTS})
             echo "-pl $MODULES_TESTS -am"
         ;;
+        (${STAGE_CONNECTOR_HIVE_1})
+            echo "-pl $MODULES_CONNECTOR_HIVE -am -Phive-1.2.1 clean"
+        ;;
         (${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
@@ -213,6 +220,9 @@ function get_test_modules_for_stage() {
         (${STAGE_TESTS})
             echo "-pl $modules_tests"
         ;;
+        (${STAGE_CONNECTOR_HIVE_1})
+            echo "-pl $MODULES_CONNECTOR_HIVE -Phive-1.2.1"
+        ;;
         (${STAGE_MISC})
             echo "-pl $modules_misc"
         ;;


[flink] 03/06: move clean to get_test_modules_for_stage

Posted by ch...@apache.org.
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

commit ce9b84ef8f522d6bcbf99f232aac42983067d667
Author: Rui Li <li...@apache.org>
AuthorDate: Wed Jul 3 17:46:33 2019 +0800

    move clean to get_test_modules_for_stage
---
 tools/travis/stage.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/travis/stage.sh b/tools/travis/stage.sh
index 922430e..4c4e2bc 100644
--- a/tools/travis/stage.sh
+++ b/tools/travis/stage.sh
@@ -170,7 +170,7 @@ function get_compile_modules_for_stage() {
             echo "-pl $MODULES_TESTS -am"
         ;;
         (${STAGE_CONNECTOR_HIVE_1})
-            echo "-pl $MODULES_CONNECTOR_HIVE -am -Phive-1.2.1 clean"
+            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!
@@ -221,7 +221,7 @@ function get_test_modules_for_stage() {
             echo "-pl $modules_tests"
         ;;
         (${STAGE_CONNECTOR_HIVE_1})
-            echo "-pl $MODULES_CONNECTOR_HIVE -Phive-1.2.1"
+            echo "-pl $MODULES_CONNECTOR_HIVE -Phive-1.2.1 clean"
         ;;
         (${STAGE_MISC})
             echo "-pl $modules_misc"


[flink] 06/06: address comment

Posted by ch...@apache.org.
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

commit deac25d6e34d8ab799be2267681770567469ce7d
Author: Rui Li <li...@apache.org>
AuthorDate: Fri Jul 12 12:19:10 2019 +0800

    address comment
---
 .travis.yml           | 22 +++++++++-------------
 tools/travis/stage.sh | 11 -----------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3126896..f114152 100644
--- 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
index d473aa1..7bd7a97 100644
--- 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"
         ;;