Bug 441429 - Make "promote" scripts a little smarter, and simpler
diff --git a/production/sdk/promoteStableRelease/promoteImpl/createDeferredStepsScript.sh b/production/sdk/promoteStableRelease/promoteImpl/createDeferredStepsScript.sh
index 3570768..943f56c 100755
--- a/production/sdk/promoteStableRelease/promoteImpl/createDeferredStepsScript.sh
+++ b/production/sdk/promoteStableRelease/promoteImpl/createDeferredStepsScript.sh
@@ -51,12 +51,12 @@
then
${PROMOTE_IMPL}/runAntRunner.sh ${PROMOTE_IMPL}/addToComposite.xml addToComposite -Drepodir="/home/data/httpd/download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/" -Dcomplocation="${DL_DROP_ID}"
else
- echo "#!/usr/bin/env bash" > deferredCompositeAdd.sh
- echo "export JAVA_CMD=$JAVA_CMD" >> deferredCompositeAdd.sh
- echo "export JAVA_EXEC_DIR=${JAVA_EXEC_DIR}" >> deferredCompositeAdd.sh
- echo "export ECLIPSE_EXE=${ECLIPSE_EXE}" >> deferredCompositeAdd.sh
- echo "${PROMOTE_IMPL}/runAntRunner.sh ${PROMOTE_IMPL}/addToComposite.xml addToComposite -Drepodir=/home/data/httpd/download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/ -Dcomplocation=${DL_DROP_ID}" >> deferredCompositeAdd.sh
- chmod +x deferredCompositeAdd.sh
+ echo "#!/usr/bin/env bash" > ${CL_SITE}/deferredCompositeAdd.sh
+ echo "export JAVA_CMD=$JAVA_CMD" >> ${CL_SITE}/deferredCompositeAdd.sh
+ echo "export JAVA_EXEC_DIR=${JAVA_EXEC_DIR}" >> ${CL_SITE}/deferredCompositeAdd.sh
+ echo "export ECLIPSE_EXE=${ECLIPSE_EXE}" >> ${CL_SITE}/deferredCompositeAdd.sh
+ echo "${PROMOTE_IMPL}/runAntRunner.sh ${PROMOTE_IMPL}/addToComposite.xml addToComposite -Drepodir=/home/data/httpd/download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/ -Dcomplocation=${DL_DROP_ID}" >> ${CL_SITE}/deferredCompositeAdd.sh
+ chmod +x ${CL_SITE}/deferredCompositeAdd.sh
echo "Remember to add to composite, by running deferredCompositeAdd.sh, since HIDE_SITE was ${HIDE_SITE}" >> "${CL_SITE}/checklist.txt"
fi
diff --git a/production/sdk/promoteStableRelease/promoteImpl/tagPromotedBuilds.sh b/production/sdk/promoteStableRelease/promoteImpl/tagPromotedBuilds.sh
index 9f71997..2044669 100755
--- a/production/sdk/promoteStableRelease/promoteImpl/tagPromotedBuilds.sh
+++ b/production/sdk/promoteStableRelease/promoteImpl/tagPromotedBuilds.sh
@@ -16,28 +16,27 @@
# TODO: if another build has taken place (such as a PATCH build) we
# may need to 'pull' aggegator first before we can push our tag
-echo "#!/usr/bin/env bash" > deferredTag.sh
-echo "# navigate to gitcache aggregator" >> deferredTag.sh
-echo "pushd ${BUILD_ROOT}/${AGGR_LOCATION}" >> deferredTag.sh
-echo "" >> deferredTag.sh
-echo "# DROP_ID == BUILD_ID, which should already exist as tag (for all I and M builds)" >> deferredTag.sh
-echo "git tag -a -m \"${NEW_ANNOTATION}\" ${NEW_TAG} ${DROP_ID}" >> deferredTag.sh
-echo "RC=\$?" >> deferredTag.sh
-echo "if [[ \$RC != 0 ]]" >> deferredTag.sh
-echo "then" >> deferredTag.sh
-echo " printf \"\n\t%s\n\" \"ERROR: Failed to tag aggregator old id, ${DROP_ID}, with new tag, ${NEW_TAG} and annotation of ${NEW_ANNOTATION}.\"" >> deferredTag.sh
-echo " popd" >> deferredTag.sh
-echo " exit \$RC" >> deferredTag.sh
-echo "fi" >> deferredTag.sh
-echo "git push origin tag ${NEW_TAG}" >> deferredTag.sh
-echo "RC=\$?" >> deferredTag.sh
-echo "if [[ \$RC != 0 ]]" >> deferredTag.sh
-echo "then" >> deferredTag.sh
-echo " printf \"\n\t%s\n\" \"ERROR: Failed to push new tag, ${NEW_TAG}.\"" >> deferredTag.sh
-echo " popd" >> deferredTag.sh
-echo " exit \$RC" >> deferredTag.sh
-echo "fi" >> deferredTag.sh
-echo "popd" >> deferredTag.sh
-chmod +x deferredTag.sh
+echo "#!/usr/bin/env bash" > ${CL_SITE}/deferredTag.sh
+echo "# navigate to gitcache aggregator" >> ${CL_SITE}/deferredTag.sh
+echo "pushd ${BUILD_ROOT}/${AGGR_LOCATION}" >> ${CL_SITE}/deferredTag.sh
+echo "" >> ${CL_SITE}/deferredTag.sh
+echo "# DROP_ID == BUILD_ID, which should already exist as tag (for all I and M builds)" >> ${CL_SITE}/deferredTag.sh
+echo "git tag -a -m \"${NEW_ANNOTATION}\" ${NEW_TAG} ${DROP_ID}" >> ${CL_SITE}/deferredTag.sh
+echo "RC=\$?" >> ${CL_SITE}/deferredTag.sh
+echo "if [[ \$RC != 0 ]]" >> ${CL_SITE}/deferredTag.sh
+echo "then" >> ${CL_SITE}/deferredTag.sh
+echo " printf \"\n\t%s\n\" \"ERROR: Failed to tag aggregator old id, ${DROP_ID}, with new tag, ${NEW_TAG} and annotation of ${NEW_ANNOTATION}.\"" >> ${CL_SITE}/deferredTag.sh
+echo " popd" >> ${CL_SITE}/deferredTag.sh
+echo " exit \$RC" >> ${CL_SITE}/deferredTag.sh
+echo "fi" >> ${CL_SITE}/deferredTag.sh
+echo "git push origin tag ${NEW_TAG}" >> ${CL_SITE}/deferredTag.sh
+echo "RC=\$?" >> ${CL_SITE}/deferredTag.sh
+echo "if [[ \$RC != 0 ]]" >> ${CL_SITE}/deferredTag.sh
+echo "then" >> ${CL_SITE}/deferredTag.sh
+echo " printf \"\n\t%s\n\" \"ERROR: Failed to push new tag, ${NEW_TAG}.\"" >> ${CL_SITE}/deferredTag.sh
+echo " popd" >> ${CL_SITE}/deferredTag.sh
+echo " exit \$RC" >> ${CL_SITE}/deferredTag.sh
+echo "fi" >> ${CL_SITE}/deferredTag.sh
+echo "popd" >> ${CL_SITE}/deferredTag.sh
+chmod +x ${CL_SITE}/deferredTag.sh
echo "Remember to tag milestones and RCs (but, not Releases) with deferredTag.sh" >> "${CL_SITE}/checklist.txt"
-#TODO: since HIDE_SITE was ${HIDE_SITE}" >> "${CL_SITE}/checklist.txt"
