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 2014/08/09 14:40:10 UTC

[39/39] git commit: Extended release script, update nightly build script

Extended release script, update nightly build script


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/d83c8108
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/d83c8108
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/d83c8108

Branch: refs/heads/travis_test
Commit: d83c81086462d4109ca32accd7d96d29a596998e
Parents: 3f1e220
Author: Robert Metzger <rm...@apache.org>
Authored: Sat Aug 9 14:32:47 2014 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Sat Aug 9 14:38:17 2014 +0200

----------------------------------------------------------------------
 tools/create_release_files.sh | 39 +++++++++++++++++++++++++++++---------
 tools/deploy_to_maven.sh      | 20 ++++++++++++-------
 2 files changed, 43 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d83c8108/tools/create_release_files.sh
----------------------------------------------------------------------
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
index aa8875d..14bf420 100755
--- a/tools/create_release_files.sh
+++ b/tools/create_release_files.sh
@@ -39,37 +39,50 @@ GIT_PASSWORD=${GIT_PASSWORD:-XXX}
 GPG_PASSPHRASE=${GPG_PASSPHRASE:-XXX}
 GPG_KEY=${GPG_KEY:-XXX}
 GIT_BRANCH=${GIT_BRANCH:-branch-1.0}
+OLD_VERSION=${OLD_VERSION:-0.6-incubating-SNAPSHOT}
 RELEASE_VERSION=${NEW_VERSION}
+NEW_VERSION_HADOOP2=$RELEASE_VERSION"-hadoop2" # this is wrong! 
 USER_NAME=${USER_NAME:-pwendell}
 MVN=${MVN:-mvn}
+sonatype_user=${sonatype_user:-rmetzger}
+sonatype_pw=${sonatype_pw:-XXX}
 
 set -e
 
 # create source package
 
-git clone https://github.com/rmetzger/incubator-flink.git flink
+git clone https://github.com/apache/incubator-flink.git flink
 cd flink
 git checkout -b release-0.6 origin/release-0.6
 rm .gitignore
 rm .travis.yml
 rm deploysettings.xml
 rm CHANGELOG
-rm -rf .git
+#rm -rf .git
+
+#find . -name 'pom.xml' -type f -exec sed -i 's#<version>$OLD_VERSION</version>#<version>$NEW_VERSION</version>#' {} \;
+find . -name 'pom.xml' -type f -exec sed -i 's#<version>'$OLD_VERSION'</version>#<version>'$NEW_VERSION'</version>#' {} \;
+git commit --author="Robert Metzger <rm...@apache.org>" -am "Commit for release $RELEASE_VERSION"
+RELEASE_HASH=`git rev-parse HEAD`
+echo "Echo created release hash $RELEASE_HASH"
+
 cd ..
 
 
+echo "Creating source package"
 cp -r flink flink-$RELEASE_VERSION
-tar cvzf flink-$RELEASE_VERSION.tgz flink-$RELEASE_VERSION
-echo $GPG_PASSPHRASE | gpg --batch --default-key $GPG_KEY --passphrase-fd 0 --armour --output flink-$RELEASE_VERSION.tgz.asc \
-  --detach-sig flink-$RELEASE_VERSION.tgz
-echo $GPG_PASSPHRASE | gpg --batch --default-key $GPG_KEY --passphrase-fd 0 --print-md MD5 flink-$RELEASE_VERSION.tgz > \
-  flink-$RELEASE_VERSION.tgz.md5
-echo $GPG_PASSPHRASE | gpg --batch --default-key $GPG_KEY --passphrase-fd 0 --print-md SHA512 flink-$RELEASE_VERSION.tgz > \
-  flink-$RELEASE_VERSION.tgz.sha
+tar cvzf flink-${RELEASE_VERSION}-src.tgz --exclude .git flink-$RELEASE_VERSION
+echo $GPG_PASSPHRASE | gpg --batch --default-key $GPG_KEY --passphrase-fd 0 --armour --output flink-$RELEASE_VERSION-src.tgz.asc \
+  --detach-sig flink-$RELEASE_VERSION-src.tgz
+echo $GPG_PASSPHRASE | gpg --batch --default-key $GPG_KEY --passphrase-fd 0 --print-md MD5 flink-$RELEASE_VERSION-src.tgz > \
+  flink-$RELEASE_VERSION-src.tgz.md5
+echo $GPG_PASSPHRASE | gpg --batch --default-key $GPG_KEY --passphrase-fd 0 --print-md SHA512 flink-$RELEASE_VERSION-src.tgz > \
+  flink-$RELEASE_VERSION-src.tgz.sha
 rm -rf flink-$RELEASE_VERSION
 
 
 make_binary_release() {
+  echo "Creating binary release name: $NAME, flags: $FLAGS"
   NAME=$1
   FLAGS=$2
   cp -r flink flink-$RELEASE_VERSION-bin-$NAME
@@ -132,3 +145,11 @@ ssh $USER_NAME@people.apache.org \
 scp flink-* \
   $USER_NAME@people.apache.org:/home/$USER_NAME/public_html/$folder/
 
+echo "Deploying to repository.apache.org"
+
+cd flink
+cp ../../deploysettings.xml . 
+$MVN clean deploy -Prelease --settings deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE
+./tools/generate_specific_pom.sh $NEW_VERSION $NEW_VERSION_HADOOP2 pom.xml
+sleep 4
+$MVN clean deploy -Prelease --settings deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/d83c8108/tools/deploy_to_maven.sh
----------------------------------------------------------------------
diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
index 78d1a32..03be4c1 100755
--- a/tools/deploy_to_maven.sh
+++ b/tools/deploy_to_maven.sh
@@ -54,7 +54,7 @@ function getVersion() {
 # this will take a while
 CURRENT_FLINK_VERSION=`getVersion`
 if [[ "$CURRENT_FLINK_VERSION" == *-SNAPSHOT ]]; then
-	CURRENT_FLINK_VERSION_YARN=${CURRENT_FLINK_VERSION/-SNAPSHOT/-hadoop2-SNAPSHOT}
+	CURRENT_FLINK_VERSION_YARN=${CURRENT_FLINK_VERSION/-incubating-SNAPSHOT/-hadoop2-incubating-SNAPSHOT}
 else
 	CURRENT_FLINK_VERSION_YARN="$CURRENT_FLINK_VERSION-hadoop2"
 fi
@@ -106,7 +106,7 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] ; then
 	fi
 
 	#
-	# Deploy binaries to DOPA
+	# Deploy binaries to S3
 	# The TRAVIS_JOB_NUMBER here is kinda hacked. 
 	# Currently, there are Builds 1-6. Build 1 is deploying to maven sonatype
 	# Build 2 has no special meaning, it is the openjdk7, hadoop 1.2.1 build
@@ -121,23 +121,29 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] ; then
 		#./tools/generate_specific_pom.sh $CURRENT_FLINK_VERSION $CURRENT_FLINK_VERSION_YARN pom.xml
 		#mvn -B -DskipTests clean install
 		CURRENT_FLINK_VERSION=$CURRENT_FLINK_VERSION_YARN
-		YARN_ARCHIVE="flink-dist/target/*yarn.tar.gz"
+		YARN_ARCHIVE="flink-dist/target/flink-*-bin/*yarn.tgz"
 	fi
 	if [[ $TRAVIS_JOB_NUMBER == *3 ]] || [[ $TRAVIS_JOB_NUMBER == *6 ]] ; then 
 	#	cd flink-dist
 	#	mvn -B -DskipTests -Pdebian-package package
 	#	cd ..
 		echo "Uploading build to amazon s3. Job Number: $TRAVIS_JOB_NUMBER"
-		mkdir flink
-		cp -r flink-dist/target/flink-dist-*-bin/flink*/* flink/
-		tar -czf flink-$CURRENT_FLINK_VERSION.tgz flink
+		#mkdir flink-$CURRENT_FLINK_VERSION
+		#cp -r flink-dist/target/flink-*-bin/flink*/* flink-$CURRENT_FLINK_VERSION/
+		#tar -czf flink-$CURRENT_FLINK_VERSION-bin.tgz flink-$CURRENT_FLINK_VERSION
 		
 		# upload the two in parallel
 		if [[ $TRAVIS_JOB_NUMBER == *6 ]] ; then
 			# move to current dir
 			mv $YARN_ARCHIVE .
-			travis-artifacts upload --path *yarn.tar.gz --target-path / 
+			travis-artifacts upload --path *yarn.tgz --target-path / 
 		fi
+	
+		mv flink-dist/target/flink-*-bin/flink*/flink-*.tgz .
+		echo "here, we have"
+		ls -lisah flink-dist/target/flink-*-bin/flink*/
+		echo "and really here"
+		ls -lisah
 		travis-artifacts upload --path flink-$CURRENT_FLINK_VERSION.tgz   --target-path / 
 	fi