diff options
| author | Josh Rosen <joshrosen@databricks.com> | 2015-10-13 15:18:20 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2015-10-13 15:18:20 -0700 |
| commit | d0482f6af33e976db237405b2a978db1b7c2fd5b (patch) | |
| tree | 257f7e75c9ce0a41206e85e32050e7f9f5eacf41 /dev/create-release | |
| parent | ef72673b234579c161b8cbb6cafc851d9eba1bfb (diff) | |
| download | spark-d0482f6af33e976db237405b2a978db1b7c2fd5b.tar.gz spark-d0482f6af33e976db237405b2a978db1b7c2fd5b.tar.bz2 spark-d0482f6af33e976db237405b2a978db1b7c2fd5b.zip | |
[SPARK-10932] [PROJECT INFRA] Port two minor changes to release-build.sh from scripts' old repo
Spark's release packaging scripts used to live in a separate repository. Although these scripts are now part of the Spark repo, there are some minor patches made against the old repos that are missing in Spark's copy of the script. This PR ports those changes.
/cc shivaram, who originally submitted these changes against https://github.com/rxin/spark-utils
Author: Josh Rosen <joshrosen@databricks.com>
Closes #8986 from JoshRosen/port-release-build-fixes-from-rxin-repo.
Diffstat (limited to 'dev/create-release')
| -rwxr-xr-x | dev/create-release/release-build.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index 9dac43ce54..cb79e9eba0 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -70,7 +70,7 @@ GIT_REF=${GIT_REF:-master} # Destination directory parent on remote server REMOTE_PARENT_DIR=${REMOTE_PARENT_DIR:-/home/$ASF_USERNAME/public_html} -SSH="ssh -o StrictHostKeyChecking=no -i $ASF_RSA_KEY" +SSH="ssh -o ConnectTimeout=300 -o StrictHostKeyChecking=no -i $ASF_RSA_KEY" GPG="gpg --no-tty --batch" NEXUS_ROOT=https://repository.apache.org/service/local/staging NEXUS_PROFILE=d63f592e7eac0 # Profile for Spark staging uploads @@ -141,8 +141,12 @@ if [[ "$1" == "package" ]]; then export ZINC_PORT=$ZINC_PORT echo "Creating distribution: $NAME ($FLAGS)" - ./make-distribution.sh --name $NAME --tgz $FLAGS -DzincPort=$ZINC_PORT 2>&1 > \ - ../binary-release-$NAME.log + + # Get maven home set by MVN + MVN_HOME=`$MVN -version 2>&1 | grep 'Maven home' | awk '{print $NF}'` + + ./make-distribution.sh --name $NAME --mvn $MVN_HOME/bin/mvn --tgz $FLAGS \ + -DzincPort=$ZINC_PORT 2>&1 > ../binary-release-$NAME.log cd .. cp spark-$SPARK_VERSION-bin-$NAME/spark-$SPARK_VERSION-bin-$NAME.tgz . |