[Build] Further refine test result collection to consider reruns

Delete the test results of previous runs of the same test configurations
for the same build, i.e. if a test was run again.

Author: HannesWell

JenkinsJobs/Releng/collectTestResults.jenkinsfile

@@ -50,26 +50,28 @@ pipeline {
 						testResultsDir="${buildDirectory}/testresults"
 						mkdir -p "${testResultsDir}"
 
-						# Fetch previously collected test results and already generated files (that would otherwise be re-generated)
-						allTestResultsXMLDirectory="${EP_ECLIPSE_DROPS}/${buildID}/testresults/xml"
-						if ssh [email protected] "[ -d '${allTestResultsXMLDirectory}' ]"; then
-							rsync -avzh --exclude="*_${triggeringJob}_*" [email protected]:${allTestResultsXMLDirectory} ${buildDirectory}/testresults
-						else
-							echo 'Test results of other configurations not yet published.'
-						fi
-						
 						# ==========================================
 						# Collect results and overview from test-job
 						pushd "${testResultsDir}"
 
 						curl -L -o "${triggeringJob}.xml" "${buildURL}/testReport/api/xml?tree=failCount,passCount,skipCount,duration"
 						curl -L -o results.zip "${buildURL}/artifact/workarea/${buildID}/eclipse-testing/results/*zip*/results.zip"
 						unzip results.zip
-						# copy them to the expected location (from the subfolder of the zip) (mv can't merge directories) and remove all download artifacts. 
-						cp -r results/* .
+						# copy them to the expected location (from the subfolder of the zip) and remove all download artifacts.
+						mv results/* .
 						rm -rf results results.zip
 						popd
 
+						# Fetch previously collected test results and already generated files (that would otherwise be re-generated)
+						allTestResultsDirectory="${EP_ECLIPSE_DROPS}/${buildID}/testresults"
+						if ssh [email protected] "[ -d '${allTestResultsDirectory}' ]"; then
+							# First delete result files from a previous run of the same configuration (in case that test configuration was run again).
+							ssh [email protected] rm -rfv ${allTestResultsDirectory}/${triggeringJob}* ${allTestResultsDirectory}/*/*${triggeringJob}*
+							rsync -avzh [email protected]:${allTestResultsDirectory}/xml ${buildDirectory}/testresults
+						else
+							echo 'Test results of other configurations not yet published.'
+						fi
+						
 						#triggering ant runner
 						devworkspace=${WORKSPACE}/workspace-updateTestResults