Fix for eclipse-platform#668

SDawley · Nov 24, 2022 · 275148c · 275148c
1 parent fea7be4
commit 275148c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/JenkinsJobs/Releng/collectResults.groovy b/JenkinsJobs/Releng/collectResults.groovy
@@ -96,6 +96,7 @@ devworkspace=${workspace}/workspace-antRunner
 
 ssh genie.releng@projects-storage.eclipse.org  ${javaCMD} -jar ${launcherJar} -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.ant.core.antRunner -file ${workspace}/collectTestResults.xml \\
   -DpostingDirectory=${dropsPath} \\
+  -Djob=${triggeringJob} \\
   -DbuildURL=${buildURL} \\
   -DbuildID=${buildID} \\
   -DEBUILDER_HASH=${EBUILDER_HASH}

diff --git a/cje-production/scripts/collectTestResults.xml b/cje-production/scripts/collectTestResults.xml
@@ -87,13 +87,19 @@
         to="*" />
     </unzip>
 
-    <!--<retry
+    <!-- This is needed for the summary table on the I-build download page -->
+    <property
+      name="jenkinsResultXML"
+      value="${jenkinsJobURL}/testReport/api/xml?tree=failCount,passCount,skipCount,duration" />
+    <echo message="jenkinsResultXML ${jenkinsResultXML} " />
+
+    <retry
       retrycount="3"
       retrydelay="1000">
       <get
         src="${jenkinsResultXML}"
-        dest="${resultsDir}/${job}-${buildNumber}.xml" />
-    </retry> -->
+        dest="${resultsDir}/${job}.xml" />
+    </retry> 
 
     <delete failonerror="false">
       <fileset dir="${resultsDir}">

diff --git a/scripts/collectResultsLocal.sh b/scripts/collectResultsLocal.sh
@@ -82,9 +82,6 @@ fi
 cd ${workspace}
 git clone https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git
 EBUILDERDIR=${workspace}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
-#cd ${workspace}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder/eclipse
-#scp -r publishingFiles ${workspace}/publishingFiles
-#cd ${workspace}
 
 #triggering ant runner
 baseBuilderDir=${workspace}/basebuilder
@@ -96,15 +93,17 @@ devworkspace=${workspace}/workspace-antRunner
 
 java -jar ${launcherJar} -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.ant.core.antRunner -file ${workspace}/collectTestResults.xml \
   -DpostingDirectory=${postingDirectory} \
+  -Djob=${triggeringJob} \
   -DbuildURL=${buildURL} \
   -DbuildID=${buildID} \
   -DEBUILDER_HASH=${EBUILDER_HASH}
-  -DEBuilderDir=${EBUILDERDIR}
+
 
 devworkspace=${workspace}/workspace-updateTestResults
 
 java -jar ${launcherJar} -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.ant.core.antRunner -file ${workspace}/publish.xml \
   -DpostingDirectory=${postingDirectory} \
   -Djob=${triggeringJob} \
   -DbuildID=${buildID} \
-  -DeclipseStream=${STREAM} 
+  -DeclipseStream=${STREAM} \
+  -DEBuilderDir=${EBUILDERDIR}