Bug 531437 - Move test executions to releng hipp

Change-Id: Id331265d1b02e61a28623c41edc177ee1b6b5234
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

3 files changed, 10 insertions, 24 deletions

diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml
index 9891066ab..0b02cf8b6 100644
--- a/production/sdk/collectTestResults.xml
+++ b/production/sdk/collectTestResults.xml
@@ -95,29 +95,15 @@
     <condition
       property="env.HUDSON_ROOT_URI"
       value="shared">
-      <and>
-        <contains
-          string="${job}"
-          substring="46M"
-          casesensitive="yes" />
-        <contains
-          string="${job}"
-          substring="gtk2"
-          casesensitive="yes" />
-      </and>
-    </condition>
-
-  	<condition
-      property="env.HUDSON_ROOT_URI"
-      value="platform">
       <contains
         string="${job}"
-        substring="gtk"
+        substring="win32"
         casesensitive="yes" />
     </condition>
+
     <property
       name="env.HUDSON_ROOT_URI"
-      value="shared" />
+      value="releng" />
 
     <!-- we set these "env" variables here not to effect the
       environment, but that because we need some value for them,
@@ -140,7 +126,7 @@
     <condition
       property="hudsonHost"
       value="${env.HUDSON_HOST}"
-      else="hudson.eclipse.org">
+      else="ci.eclipse.org">
       <isset property="env.HUDSON_HOST" />
     </condition>
 
diff --git a/production/sdk/promotion/syncUpdateUtils.shsource b/production/sdk/promotion/syncUpdateUtils.shsource
index 2aec83e7c..de2892cbc 100644
--- a/production/sdk/promotion/syncUpdateUtils.shsource
+++ b/production/sdk/promotion/syncUpdateUtils.shsource
@@ -18,12 +18,12 @@ fi
 # and are also defined in various Ant scripts.
 # For production, use value for shared instance
 HUDSON_PROTOCOL=${HUDSON_PROTOCOL:-"https"}
-HUDSON_HOST=${HUDSON_HOST:-"hudson.eclipse.org"}
+HUDSON_HOST=${HUDSON_HOST:-"ci.eclipse.org"}
 # is standard port for "eclipse", but can not leave blank, since we use ':' in some URLs
 HUDSON_PORT=${HUDSON_PORT:-"443"}
-HUDSON_ROOT_URI=${HUDSON_ROOT_URI:-"shared"}
+HUDSON_ROOT_URI=${HUDSON_ROOT_URI:-"releng"}
 # For production, use the special performance machine at eclipse
-HUDSON_PERF_HOST=${HUDSON_PERF_HOST:-"hudson.eclipse.org"}
+HUDSON_PERF_HOST=${HUDSON_PERF_HOST:-"ci.eclipse.org"}
 HUDSON_PERF_PORT=${HUDSON_PERF_PORT:-"443"}
 HUDSON_PERF_PROTOCOL=${HUDSON_PERF_PROTOCOL:-"https"}
 LINUX_PERF_SEGMENT=${LINUX_PERF_SEGMENT:-"perftests"}
diff --git a/production/sdk/promotion/updateDropLocation.sh b/production/sdk/promotion/updateDropLocation.sh
index d76043a41..765c0b864 100755
--- a/production/sdk/promotion/updateDropLocation.sh
+++ b/production/sdk/promotion/updateDropLocation.sh
@@ -258,11 +258,11 @@ function sendTestResultsMail ()
     
     platform=$(echo ${JOB_NAME}|cut -b 12-16)
     case "$platform" in
-        "cen64")
-            HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/platform/view/Unit Tests"
+        "win32")
+            HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/shared/view/Eclipse and Equinox"
             ;;
         *)
-            HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/${HUDSON_ROOT_URI}/view/Eclipse and Equinox"
+            HUDSON_URL="${HUDSON_PROTOCOL}://${HUDSON_HOST}:${HUDSON_PORT}/${HUDSON_ROOT_URI}/view/Automated tests"
             ;;
     esac