From 275148cd2729b58ca552724fdb0b5c5fe8cb8d7c Mon Sep 17 00:00:00 2001
From: sdawley <sdawley@redhat.com>
Date: Wed, 23 Nov 2022 16:10:39 -0800
Subject: [PATCH] Fix for #668

---
 JenkinsJobs/Releng/collectResults.groovy      |  1 +
 cje-production/scripts/collectTestResults.xml | 12 +++++++++---
 scripts/collectResultsLocal.sh                |  9 ++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/JenkinsJobs/Releng/collectResults.groovy b/JenkinsJobs/Releng/collectResults.groovy
index 9fa77a104f9..58b5a2fde5c 100644
--- 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
index c258870306f..ae2132f0f2f 100644
--- 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
index c379a71df0c..016e5c82655 100755
--- 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,10 +93,11 @@ 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
 
@@ -107,4 +105,5 @@ java -jar ${launcherJar} -nosplash -consolelog -debug -data $devworkspace -appli
   -DpostingDirectory=${postingDirectory} \
   -Djob=${triggeringJob} \
   -DbuildID=${buildID} \
-  -DeclipseStream=${STREAM} 
+  -DeclipseStream=${STREAM} \
+  -DEBuilderDir=${EBUILDERDIR}