Bug 394293 - [CBI] launch the tests

2 files changed, 31 insertions, 7 deletions

diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml
index 3beb26d6d..40402b457 100644
--- a/production/testScripts/invokeTestsJSON.xml
+++ b/production/testScripts/invokeTestsJSON.xml
@@ -4,6 +4,15 @@
     and is available at http://www.eclipse.org/legal/epl-v10.html Contributors:
     IBM Corporation - initial API and implementation -->
 
+    <!--
+    this script is invoked by the build, on the build machine,
+    to signify to hudson "the build is done", pass a few parameters,
+    then let Hudson take over.
+
+    wget - -no-verbose -O invokeTestsJSON.xml http://git.eclipse.org/c/platform/eclipse.platform.releng.eclipsebuilder.git/plain/invokeTestsJSON.xml?h=master 2>&1;
+
+    -->
+    
 <project
     name="Hudson-Tests"
     default="runTests"
@@ -36,20 +45,19 @@
         -->
 
         <parallel>
-<!-- 
+
             <antcall target="triggerHudsonTests">
                 <param
                     name="job"
-                    value="ep${eclipseStreamMajor}-unit-win32" />
+                    value="ep${eclipseStreamMajor}-unit-lin64" />
             </antcall>
--->
-
+<!--  TEMP: Linux only, for now, for CBI.
             <antcall target="triggerHudsonTests">
                 <param
                     name="job"
-                    value="ep${eclipseStreamMajor}-unit-lin64" />
+                    value="ep${eclipseStreamMajor}-unit-win32" />
             </antcall>
-<!--
+
             <antcall target="triggerHudsonTests">
                 <param
                     name="job"
@@ -65,7 +73,19 @@
         depends="init">
 
 
-        <!-- Hudson jobs currentl have four required parameters -->
+
+     <!--
+     baseURL used to be "required parameter" for Hudson job, but seemed overly complicated so
+     I compute all this later (based on stream and id) but, I've learned, one disadvantage is this
+     restricts test code locations to "downloads". There might be times we want to do from "build"
+     locations, or similar. Not to mention, other, internal test systems someday.
+
+        <property
+            name="baseURL"
+            value="http://download.eclipse.org/eclipse/downloads/${dropsDirSegment}/${buildId}" />
+     -->
+
+        <!-- Hudson jobs currently have four required parameters -->
         <property
             name="JSON_buildId"
             value="{&quot;name&quot;:&quot;buildId&quot;,&quot;value&quot;:&quot;${buildId}&quot;}" />
@@ -85,6 +105,8 @@
 
 
 
+        <echo message="env.HUDSON_PROTOCOL: ${env.HUDSON_PROTOCOL}" />
+        <echo message="env.HUDSON_HOST: ${env.HUDSON_HOST}" />
 
         <echo message="${json}" />
         <exec executable="curl">
diff --git a/production/testScripts/startTests.sh b/production/testScripts/startTests.sh
index 4d1f8c368..a7fe84f09 100755
--- a/production/testScripts/startTests.sh
+++ b/production/testScripts/startTests.sh
@@ -147,6 +147,8 @@ echo "EBUILDER_HASH: $EBUILDER_HASH"
        echo "DEBUG: builderDropDir: ${builderDropDir}"
     else
         buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType}
+# we don't really use this file for PDE build tests. 
+# if we did, we'd need to fix this up.
         #buildDir=${buildRoot}/build
         #supportDir=${buildDir}/supportDir
         #eclipsebuilder=org.eclipse.releng.eclipsebuilder