Author: nacx Date: Mon Jan 11 09:57:02 2016 New Revision: 11866 Log: Updated release scripts according to the new Apache release tag naming convention
Modified: dev/jclouds/compare_tarball_tag.sh dev/jclouds/prepare_release.sh Modified: dev/jclouds/compare_tarball_tag.sh ============================================================================== --- dev/jclouds/compare_tarball_tag.sh (original) +++ dev/jclouds/compare_tarball_tag.sh Mon Jan 11 09:57:02 2016 @@ -38,7 +38,7 @@ for TARBALL in ${RC_PATH}/*.tar.gz; do FILE=$(basename ${TARBALL}) REPO=${FILE%%-[0-9]*} FOLDER=${REPO}-${VERSION} - TAG=${REPO}-${RC} + TAG=rel/${REPO}-${RC} echo "Comparing ${FILE} to tag ${TAG}..." Modified: dev/jclouds/prepare_release.sh ============================================================================== --- dev/jclouds/prepare_release.sh (original) +++ dev/jclouds/prepare_release.sh Mon Jan 11 09:57:02 2016 @@ -48,7 +48,7 @@ if [[ -e ${BRANCH} ]]; then fi function rc_version { - LAST_RC=`git ls-remote --tags https://git-wip-us.apache.org/repos/asf/jclouds.git jclouds-${RELEASE}-rc* \ + LAST_RC=`git ls-remote --tags https://git-wip-us.apache.org/repos/asf/jclouds.git *jclouds-${RELEASE}-rc* \ |awk '{print $2}' |grep "[0-9]$" |cut -d'/' -f3 |sort -r |head -n 1` if [[ "${LAST_RC}" == "" ]]; then echo "rc1" @@ -96,7 +96,7 @@ for REPO in ${REPOS[@]}; do done for REPO in ${REPOS[@]}; do - TAG=${REPO}-${RELEASE}-${RC} + TAG=rel/${REPO}-${RELEASE}-${RC} cd ${REPO} @@ -137,7 +137,7 @@ done # Deploy the artifacts to the staging repository for REPO in ${REPOS[@]}; do - TAG=${REPO}-${RELEASE}-${RC} + TAG=rel/${REPO}-${RELEASE}-${RC} cd ${REPO} git checkout ${TAG} # We don't run the tests here as we've already executed them in the previous builds @@ -152,7 +152,7 @@ done # Push the tags for REPO in ${REPOS[@]}; do - TAG=${REPO}-${RELEASE}-${RC} + TAG=rel/${REPO}-${RELEASE}-${RC} cd ${REPO} git push origin ${TAG} cd .. @@ -175,7 +175,7 @@ These are the tags to be voted upon: EOF for REPO in ${REPOS[@]}; do - TAG=${REPO}-${RELEASE}-${RC} + TAG=$rel/{REPO}-${RELEASE}-${RC} cd ${REPO}