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/11 09:24:25 UTC
git commit: Extended release script, update nightly build script
Repository: incubator-flink
Updated Branches:
refs/heads/master 3f1e220cf -> 3779d1828
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/3779d182
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/3779d182
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/3779d182
Branch: refs/heads/master
Commit: 3779d18283ce97a6e9adbb44e27c4d1979f39317
Parents: 3f1e220
Author: Robert Metzger <rm...@apache.org>
Authored: Sat Aug 9 14:32:47 2014 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Mon Aug 11 09:12:35 2014 +0200
----------------------------------------------------------------------
tools/create_release_files.sh | 51 +++++++++++++++++++++++++++-----------
tools/deploy_to_maven.sh | 37 +++++++++++----------------
2 files changed, 51 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/3779d182/tools/create_release_files.sh
----------------------------------------------------------------------
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
index aa8875d..bad1239 100755
--- a/tools/create_release_files.sh
+++ b/tools/create_release_files.sh
@@ -39,37 +39,51 @@ 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}
+RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-rc4}
+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
@@ -126,9 +140,18 @@ make_binary_release "hadoop2" "-Dhadoop.profile=2"
# Copy data
echo "Copying release tarballs"
-folder=flink-$RELEASE_VERSION
-ssh $USER_NAME@people.apache.org \
- mkdir /home/$USER_NAME/public_html/$folder
-scp flink-* \
- $USER_NAME@people.apache.org:/home/$USER_NAME/public_html/$folder/
+folder=flink-$RELEASE_VERSION-$RELEASE_CANDIDATE
+ssh $USER_NAME@people.apache.org mkdir /home/$USER_NAME/public_html/$folder
+scp flink-* $USER_NAME@people.apache.org:/home/$USER_NAME/public_html/$folder/
+echo "copy done"
+
+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
+echo "Done. Don't forget to commit the release version"
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/3779d182/tools/deploy_to_maven.sh
----------------------------------------------------------------------
diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
index 78d1a32..d8a6b48 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
@@ -114,31 +114,22 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] ; then
# Please be sure not to use Build 1 as it will always be the yarn build.
#
- YARN_ARCHIVE=""
- if [[ $TRAVIS_JOB_NUMBER == *6 ]] ; then
- #generate yarn poms & build for yarn.
- # it is not required to generate poms for this build.
- #./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"
- fi
- if [[ $TRAVIS_JOB_NUMBER == *3 ]] || [[ $TRAVIS_JOB_NUMBER == *6 ]] ; then
- # cd flink-dist
- # mvn -B -DskipTests -Pdebian-package package
- # cd ..
+
+ if [[ $TRAVIS_JOB_NUMBER == *3 ]] || [[ $TRAVIS_JOB_NUMBER == *6 ]] ; then
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
-
- # upload the two in parallel
+ # job nr 6 is YARN
if [[ $TRAVIS_JOB_NUMBER == *6 ]] ; then
# move to current dir
- mv $YARN_ARCHIVE .
- travis-artifacts upload --path *yarn.tar.gz --target-path /
+ mkdir flink-$CURRENT_FLINK_VERSION-bin-yarn
+ cp -r flink-dist/target/flink-*-bin/flink-yarn*/* flink-$CURRENT_FLINK_VERSION-bin-yarn/
+ tar -czf flink-$CURRENT_FLINK_VERSION-bin-yarn.tgz flink-$CURRENT_FLINK_VERSION-bin-yarn
+ travis-artifacts upload --path flink-$CURRENT_FLINK_VERSION-bin-yarn.tgz --target-path /
fi
- travis-artifacts upload --path flink-$CURRENT_FLINK_VERSION.tgz --target-path /
+
+ mkdir flink-$CURRENT_FLINK_VERSION-bin
+ cp -r flink-dist/target/flink-*-bin/flink-$CURRENT_FLINK_VERSION*/* flink-$CURRENT_FLINK_VERSION-bin/
+ tar -czf flink-$CURRENT_FLINK_VERSION-bin.tgz flink-$CURRENT_FLINK_VERSION-bin
+ travis-artifacts upload --path flink-$CURRENT_FLINK_VERSION-bin.tgz --target-path /
fi
fi # pull request check