Repository: spark Updated Branches: refs/heads/branch-2.1 361aa0efc -> 60f78c20c
[SPARK-22129][SPARK-22138] Release script improvements ## What changes were proposed in this pull request? Use the GPG_KEY param, fix lsof to non-hardcoded path, remove version swap since it wasn't really needed. Use EXPORT on JAVA_HOME for downstream scripts as well. ## How was this patch tested? Rolled 2.1.2 RC2 Author: Holden Karau <hol...@us.ibm.com> Closes #19359 from holdenk/SPARK-22129-fix-signing. (cherry picked from commit ecbe416ab5001b32737966c5a2407597a1dafc32) Signed-off-by: Holden Karau <hol...@us.ibm.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/60f78c20 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/60f78c20 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/60f78c20 Branch: refs/heads/branch-2.1 Commit: 60f78c20c6b0300c08c5f5329a559b3d3225fa68 Parents: 361aa0e Author: Holden Karau <hol...@us.ibm.com> Authored: Fri Sep 29 08:04:14 2017 -0700 Committer: Holden Karau <hol...@us.ibm.com> Committed: Fri Sep 29 08:04:38 2017 -0700 ---------------------------------------------------------------------- dev/create-release/release-build.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/60f78c20/dev/create-release/release-build.sh ---------------------------------------------------------------------- diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index fa889d9..ad32c31 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -74,7 +74,7 @@ GIT_REF=${GIT_REF:-master} # Destination directory parent on remote server REMOTE_PARENT_DIR=${REMOTE_PARENT_DIR:-/home/$ASF_USERNAME/public_html} -GPG="gpg --no-tty --batch" +GPG="gpg -u $GPG_KEY --no-tty --batch" NEXUS_ROOT=https://repository.apache.org/service/local/staging NEXUS_PROFILE=d63f592e7eac0 # Profile for Spark staging uploads BASE_DIR=$(pwd) @@ -116,7 +116,7 @@ else echo "Please set JAVA_HOME correctly." exit 1 else - JAVA_HOME="$JAVA_7_HOME" + export JAVA_HOME="$JAVA_7_HOME" fi fi fi @@ -131,7 +131,7 @@ DEST_DIR_NAME="spark-$SPARK_PACKAGE_VERSION" function LFTP { SSH="ssh -o ConnectTimeout=300 -o StrictHostKeyChecking=no -i $ASF_RSA_KEY" COMMANDS=$(cat <<EOF - set net:max-retries 1 && + set net:max-retries 2 && set sftp:connect-program $SSH && connect -u $ASF_USERNAME,p sftp://home.apache.org && $@ @@ -341,7 +341,7 @@ if [[ "$1" == "publish-snapshot" ]]; then -DskipTests $PUBLISH_PROFILES clean deploy # Clean-up Zinc nailgun process - /usr/sbin/lsof -P |grep $ZINC_PORT | grep LISTEN | awk '{ print $2; }' | xargs kill + lsof -P |grep $ZINC_PORT | grep LISTEN | awk '{ print $2; }' | xargs kill rm $tmp_settings cd .. @@ -349,8 +349,6 @@ if [[ "$1" == "publish-snapshot" ]]; then fi if [[ "$1" == "publish-release" ]]; then - SPARK_VERSION=$SPARK_PACKAGE_VERSION - cd spark # Publish Spark to Maven release repo echo "Publishing Spark checkout at '$GIT_REF' ($git_hash)" @@ -381,7 +379,7 @@ if [[ "$1" == "publish-release" ]]; then -DskipTests $PUBLISH_PROFILES clean install # Clean-up Zinc nailgun process - /usr/sbin/lsof -P |grep $ZINC_PORT | grep LISTEN | awk '{ print $2; }' | xargs kill + lsof -P |grep $ZINC_PORT | grep LISTEN | awk '{ print $2; }' | xargs kill ./dev/change-version-to-2.10.sh --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
