From 92bf5ce764dafa82fcdc2ad3c625d194979c76d9 Mon Sep 17 00:00:00 2001
From: zentol <chesnay@apache.org>
Date: Mon, 16 Jul 2018 15:16:19 +0200
Subject: [PATCH] [FLINK-9748][release] Use dedicated directory for release
 artifacts

---
 .gitignore                               |  1 +
 pom.xml                                  |  2 ++
 tools/releasing/create_binary_release.sh | 15 ++++++++++-----
 tools/releasing/create_source_release.sh | 21 +++++++++++++--------
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8fc9fce6fb2d7..1fde2d9e4a14f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ out/
 *.iws
 tools/flink
 tools/flink-*
+tools/releasing/release
diff --git a/pom.xml b/pom.xml
index 1f35cd44892ce..874f72a78c908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1150,6 +1150,8 @@ under the License.
 						<!-- Tools: watchdog -->
 						<exclude>tools/artifacts/**</exclude>
 						<exclude>tools/flink*/**</exclude>
+						<!-- artifacts created during release process -->
+						<exclude>tools/releasing/release/**</exclude>
 						<!-- manually installed version on travis -->
 						<exclude>apache-maven-3.2.5/**</exclude>
 						<!-- PyCharm -->
diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index 374c785a22580..7a4497a8f0beb 100755
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -44,6 +44,12 @@ else
     SHASUM="sha512sum"
 fi
 
+cd ..
+
+FLINK_DIR=`pwd`
+RELEASE_DIR=${RELEASE_DIR}/tools/releasing/release
+mkdir -p ${RELEASE_DIR}
+
 ###########################
 
 # build maven package, create Flink distribution, generate signature
@@ -65,18 +71,17 @@ make_binary_release() {
   cd flink-dist/target/flink-*-bin/
   tar czf "${dir_name}.tgz" flink-*
 
-  cp flink-*.tgz ../../../
-  cd ../../../
+  cp flink-*.tgz ${RELEASE_DIR}
+  cd ${RELEASE_DIR}
 
   # Sign sha the tgz
   if [ "$SKIP_GPG" == "false" ] ; then
     gpg --armor --detach-sig "${dir_name}.tgz"
   fi
   $SHASUM "${dir_name}.tgz" > "${dir_name}.tgz.sha512"
-}
-
-cd ..
 
+  cd ${FLINK_DIR}
+}
 
 if [ "$SCALA_VERSION" == "none" ] && [ "$HADOOP_VERSION" == "none" ]; then
   make_binary_release "" "-DwithoutHadoop" "2.11"
diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh
index dca72819cb84f..0cc32feed130b 100755
--- a/tools/releasing/create_source_release.sh
+++ b/tools/releasing/create_source_release.sh
@@ -45,11 +45,17 @@ fi
 
 cd ..
 
+FLINK_DIR=`pwd`
+RELEASE_DIR=${FLINK_DIR}/tools/releasing/release
+CLONE_DIR=${RELEASE_DIR}/flink-tmp-clone
+
 echo "Creating source package"
 
+mkdir -p ${RELEASE_DIR}
+
 # create a temporary git clone to ensure that we have a pristine source release
-git clone . flink-tmp-clone
-cd flink-tmp-clone
+git clone ${FLINK_DIR} ${CLONE_DIR}
+cd ${CLONE_DIR}
 
 rsync -a \
   --exclude ".git" --exclude ".gitignore" --exclude ".gitattributes" --exclude ".travis.yml" \
@@ -58,10 +64,9 @@ rsync -a \
   --exclude "docs/content" --exclude ".rubydeps" \
   . flink-$RELEASE_VERSION
 
-tar czf flink-${RELEASE_VERSION}-src.tgz flink-$RELEASE_VERSION
-gpg --armor --detach-sig flink-$RELEASE_VERSION-src.tgz
-$SHASUM flink-$RELEASE_VERSION-src.tgz > flink-$RELEASE_VERSION-src.tgz.sha512
+tar czf ${RELEASE_DIR}/flink-${RELEASE_VERSION}-src.tgz flink-$RELEASE_VERSION
+gpg --armor --detach-sig ${RELEASE_DIR}/flink-$RELEASE_VERSION-src.tgz
+$SHASUM ${RELEASE_DIR}/flink-$RELEASE_VERSION-src.tgz > ${RELEASE_DIR}/flink-$RELEASE_VERSION-src.tgz.sha512
 
-mv flink-$RELEASE_VERSION-src.* ../
-cd ..
-rm -rf flink-tmp-clone
+cd ${CURR_DIR}
+rm -rf ${CLONE_DIR}