You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2015/09/24 14:00:14 UTC
flink git commit: wip: fix snapshot deployment for hadoop1,
parallelize hadoop2 deployment
Repository: flink
Updated Branches:
refs/heads/travis_test 9ca5fecf1 -> 3828a8435
wip: fix snapshot deployment for hadoop1, parallelize hadoop2 deployment
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3828a843
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3828a843
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3828a843
Branch: refs/heads/travis_test
Commit: 3828a84351007944415889125e8da68d77246588
Parents: 9ca5fec
Author: Robert Metzger <rm...@apache.org>
Authored: Thu Sep 24 13:59:45 2015 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Thu Sep 24 13:59:45 2015 +0200
----------------------------------------------------------------------
flink-staging/flink-gelly-scala/pom.xml | 2 +-
.../flink-language-binding/flink-python/pom.xml | 2 +-
tools/deploy_to_maven.sh | 25 +++++++++++++++-----
3 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3828a843/flink-staging/flink-gelly-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-staging/flink-gelly-scala/pom.xml b/flink-staging/flink-gelly-scala/pom.xml
index 18c0516..a1f0da7 100644
--- a/flink-staging/flink-gelly-scala/pom.xml
+++ b/flink-staging/flink-gelly-scala/pom.xml
@@ -21,8 +21,8 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>flink-staging</artifactId>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-staging</artifactId>
<version>0.10-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/3828a843/flink-staging/flink-language-binding/flink-python/pom.xml
----------------------------------------------------------------------
diff --git a/flink-staging/flink-language-binding/flink-python/pom.xml b/flink-staging/flink-language-binding/flink-python/pom.xml
index 2a11e35..8730916 100644
--- a/flink-staging/flink-language-binding/flink-python/pom.xml
+++ b/flink-staging/flink-language-binding/flink-python/pom.xml
@@ -21,8 +21,8 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>flink-language-binding-parent</artifactId>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-language-binding-parent</artifactId>
<version>0.10-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flink/blob/3828a843/tools/deploy_to_maven.sh
----------------------------------------------------------------------
diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
index ece8558..30cca9a 100755
--- a/tools/deploy_to_maven.sh
+++ b/tools/deploy_to_maven.sh
@@ -94,13 +94,26 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_REPO_SLUG == "apache/flin
fi
if [[ $TRAVIS_JOB_NUMBER == *2 ]] && [[ $CURRENT_FLINK_VERSION == *SNAPSHOT* ]] ; then
+ # the time to build and upload flink twice (scala 2.10 and scala 2.11) takes
+ # too much time. That's why we are going to do it in parallel
+ # Note that the parallel execution will cause the output to be interleaved
+ pwd
+ ls
+ mkdir ../flink2
+ ls ../
+ cp -r . ../flink2
+ cd ../flink2
+ pwd
+ ls
# deploy hadoop v2 (yarn)
- echo "deploy standard version (hadoop2)"
- mvn -B -DskipTests -Pdocs-and-source -Drat.skip=true -Drat.ignoreErrors=true clean deploy --settings deploysettings.xml;
-
- deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2"
-
- echo "deploy hadoop2 version (standard) for scala 2.11"
+ echo "deploy standard version (hadoop2) for scala 2.10 from flink2 directory"
+ # do the hadoop2 scala 2.10 in the background
+ (mvn -B -DskipTests -Pdocs-and-source -Drat.skip=true -Drat.ignoreErrors=true clean deploy --settings deploysettings.xml; deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2" ) &
+
+ # switch back to the regular flink directory
+ cd ../flink
+ pwd
+ echo "deploy hadoop2 version (standard) for scala 2.11 from flink directory"
./tools/change-scala-version.sh 2.11
mvn -B -DskipTests -Pdocs-and-source -Drat.skip=true -Drat.ignoreErrors=true clean deploy --settings deploysettings.xml;