Skip to content

Commit

Permalink
[SPARK-22129][SPARK-22138] Release script improvements
Browse files Browse the repository at this point in the history
## 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 <holden@us.ibm.com>

Closes #19359 from holdenk/SPARK-22129-fix-signing.
  • Loading branch information
holdenk committed Sep 29, 2017
1 parent a2516f4 commit ecbe416
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions dev/create-release/release-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -125,7 +125,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
Expand All @@ -140,7 +140,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 &&
$@
Expand Down Expand Up @@ -345,16 +345,14 @@ if [[ "$1" == "publish-snapshot" ]]; then
# -DskipTests $SCALA_2_12_PROFILES $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 ..
exit 0
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)"
Expand Down Expand Up @@ -384,7 +382,7 @@ if [[ "$1" == "publish-release" ]]; then
# -DskipTests $SCALA_2_12_PROFILES §$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-scala-version.sh 2.11

Expand Down

0 comments on commit ecbe416

Please sign in to comment.