[Releng] Update promote scripts for HIPP/Mars builds

3 files changed, 13 insertions, 12 deletions

diff --git a/releng/toolkit/server/build-after.sh b/releng/toolkit/server/build-after.sh
index 81e915ebbab..4bca2da1bc3 100644
--- a/releng/toolkit/server/build-after.sh
+++ b/releng/toolkit/server/build-after.sh
@@ -23,9 +23,9 @@
 ##
 
 p2UpdateSiteDir=${WORKSPACE}/releng/main/target/repository
-updateSite={$WORKSPACE}/repository
+updateSite=${WORKSPACE}/repository
 
-if [ -n "$BUILD_ALIAS"]; then
+if [ -n "$BUILD_ALIAS" ]; then
   buildType=S
 else
   buildType=N
diff --git a/releng/toolkit/server/manualPromote-mars.sh b/releng/toolkit/server/manualPromote-mars.sh
index 982751d56b1..59696d9a4d4 100644
--- a/releng/toolkit/server/manualPromote-mars.sh
+++ b/releng/toolkit/server/manualPromote-mars.sh
@@ -40,19 +40,19 @@ version=""
 updateSite=""
 sure=""
 
-echo "mainBuildNumber (the number of the \"papyrus-trunk-nightly\" Hudson build from which to publish the main Papyrus plug-ins): "
+echo "mainBuildNumber (the number of the \"Papyrus-Master\" Hudson build from which to publish the main Papyrus plug-ins): "
 while [[ ! "$mainBuildNumber" =~ ^[0-9]+$ || "$mainBuildNumber" < 1 ]]; do
 	echo -n "? "
 	read mainBuildNumber
 done
 
-echo "extrasBuildNumber (the number of the \"papyrus-trunk-extra-nightly\" Hudson build from which to publish the extra Papyrus plug-ins, or 0 to not publish): "
+echo "extrasBuildNumber (the number of the \"Papyrus-Master-Extra\" Hudson build from which to publish the extra Papyrus plug-ins, or 0 to not publish): "
 while [[ ! "$extrasBuildNumber" =~ ^[0-9]+$ || "$extrasBuildNumber" < 0 ]]; do
 	echo -n "? "
 	read extrasBuildNumber
 done
 
-echo "testsBuildNumber (the number of the \"papyrus-trunk-nightly-tests\" Hudson build from which to publish the test results, or 0 to not publish): "
+echo "testsBuildNumber (the number of the \"Papyrus-Master-Tests\" Hudson build from which to publish the test results, or 0 to not publish): "
 while [[ ! "$testsBuildNumber" =~ ^[0-9]+$ || "$testsBuildNumber" < 0 ]]; do
 	echo -n "? "
 	read testsBuildNumber
@@ -102,10 +102,10 @@ workingDir=$(mktemp -d)
 cd "$workingDir"
 
 # ============================== PUBLISH MAIN ==============================
-nfsURL="/shared/jobs/papyrus-trunk-nightly/builds/$mainBuildNumber/archive/"
-hudsonURL="https://hudson.eclipse.org/hudson/job/papyrus-trunk-nightly/$mainBuildNumber/artifact/"
+nfsURL="" ## Not supported for HIPP builds. Leave the variable since the promote functions are still shared with the Shared Hudson Instance builds
+hudsonURL="https://hudson.eclipse.org/papyrus/job/Papyrus-Master/$mainBuildNumber/artifact/"
 zipName="Papyrus-Main.zip"
-updateZipPrefix="Papyrus-Update-incubation"
+updateZipPrefix="Papyrus-Update"
 getZip "$zipName" "$nfsURL" "$hudsonURL"
 
 mkdir -p "$updateSiteDir"
@@ -152,8 +152,8 @@ $ADD_DOWNLOAD_STATS "$updateSiteDir/main" "main"
 
 # ============================== PUBLISH EXTRAS ==============================
 if [[ "$extrasBuildNumber" != "0" ]]; then
-	nfsURL="/shared/jobs/papyrus-trunk-extra-nightly/builds/$extrasBuildNumber/archive/"
-	hudsonURL="https://hudson.eclipse.org/hudson/job/papyrus-trunk-extra-nightly/$extrasBuildNumber/artifact/"
+	nfsURL="" ## Not supported for HIPP builds. Leave the variable since the promote functions are still shared with the Shared Hudson Instance builds
+	hudsonURL="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Extra/$extrasBuildNumber/artifact/"
 	zipName="Papyrus-Extra.zip"
 	updateZipName="Papyrus-Extra-Update.zip"
 	getZip "$zipName" "$nfsURL" "$hudsonURL"
@@ -166,8 +166,8 @@ fi
 
 # ============================== PUBLISH TESTS ==============================
 if [[ "$testsBuildNumber" != "0" ]]; then
-	nfsURL="/shared/jobs/papyrus-trunk-nightly-tests/builds/$testsBuildNumber/archive/"
-	hudsonURL="https://hudson.eclipse.org/hudson/job/papyrus-trunk-nightly-tests/$testsBuildNumber/artifact/"
+	nfsURL="" ## Not supported for HIPP builds. Leave the variable since the promote functions are still shared with the Shared Hudson Instance builds
+	hudsonURL="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Tests/$testsBuildNumber/artifact/"
 	zipName="Papyrus-TestResults.zip"
 	getZip "$zipName" "$nfsURL" "$hudsonURL"
 	# unzips under a "testresults" folder under the main build's folder 
diff --git a/releng/toolkit/server/promoteFunctions.sh b/releng/toolkit/server/promoteFunctions.sh
index d59bad9846f..dd56a74f0e3 100644
--- a/releng/toolkit/server/promoteFunctions.sh
+++ b/releng/toolkit/server/promoteFunctions.sh
@@ -50,6 +50,7 @@ function getZip() {
 
 	# try with NFS access first, and if that fails, use the Hudson REST API
 	# see http://wiki.hudson-ci.org/display/HUDSON/Remote+access+API
+	# Note: for HIPP builds, NFS access isn't supported
 	cp "$_nfsBaseDir/${_zipName}" . || wget --no-check-certificate "$_hudsonBaseURL/${_zipName}"
 	if [ ! -f "$_zipName" ]; then echo "ERROR: $_zipName (from Hudson) not found"; exit -2; fi
 	echo "[$DATE] Testing zip integrity"