[I/Y-Build] Clean-up 'Collect Results' job and reuse it for Y-builds

Part of
- #2625

Author: HannesWell

JenkinsJobs/Releng/collectPerfResults.groovy

@@ -15,27 +15,22 @@ job('Releng/collectPerfResults'){
     numToKeep(10)
   }
 
-  jdk('openjdk-jdk17-latest')
-
-  authenticationToken('collectResults')
-
   wrappers { //adds pre/post actions
     timestamps()
     preBuildCleanup()
-    sshAgent('git.eclipse.org-bot-ssh', 'projects-storage.eclipse.org-bot-ssh')
-    withAnt {
-      installation('apache-ant-latest')
-      jdk('openjdk-jdk17-latest')
+    sshAgent('projects-storage.eclipse.org-bot-ssh')
+    timeout {
+      absolute(30)
     }
   }
 
   steps {
-    shell('''
-#!/bin/bash -x
-set -e
+    shell('''#!/bin/bash -xe
+
 buildID=$(echo $buildID|tr -d ' ')
 buildURL=$(echo $buildURL|tr -d ' ')
 triggeringJob=$(echo $triggeringJob|tr -d ' ')
+
 java_home=/opt/public/common/java/openjdk/jdk-17_x64-latest/bin
 
 wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate http://download.eclipse.org/eclipse/downloads/drops4/${buildID}/buildproperties.shsource
@@ -71,9 +66,9 @@ ssh [email protected] rm -rf ${workspace}/eclipse
 #get requisite tools
 ssh [email protected] wget -O ${workspace}/collectTestResults.xml https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/cje-production/scripts/collectTestResults.xml
 ssh [email protected] wget -O ${workspace}/publish.xml https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/cje-production/scripts/publish.xml
+
 cd ${WORKSPACE}
 git clone https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git
-#wget -r -l 3 -np https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles
 cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
 scp -r eclipse [email protected]:${workspace}/eclipse
 cd ${WORKSPACE}
@@ -91,11 +86,10 @@ devworkspace=${workspace}/workspace-antRunner
 
 ssh [email protected]  ${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} \\
-  -Djob=${triggeringJob}
+  -DbuildID=${buildID}
 
-#
 
 #if all 4 dat files are present generate results tables
 #do first so performance.php regenerated
@@ -131,10 +125,4 @@ ssh [email protected]  ${javaCMD} -jar ${launcherJar} -n
 ssh [email protected] rm -rf ${workingDir}/${JOB_BASE_NAME}*
     ''')
   }
-
-  publishers {
-    extendedEmail {
-      recipientList("[email protected]")
-    }
-  }
 }

JenkinsJobs/Releng/collectResults.groovy

@@ -15,26 +15,17 @@ job('Releng/ep-collectResults'){
     numToKeep(10)
   }
 
-  jdk('openjdk-jdk17-latest')
-
-  authenticationToken('collectResults')
-
   wrappers { //adds pre/post actions
     timestamps()
     preBuildCleanup()
-    sshAgent('git.eclipse.org-bot-ssh', 'projects-storage.eclipse.org-bot-ssh')
+    sshAgent('projects-storage.eclipse.org-bot-ssh')
     timeout {
       absolute(30)
     }
-    withAnt {
-      installation('apache-ant-latest')
-      jdk('openjdk-jdk17-latest')
-    }
   }
 
   steps {
-    shell('''
-#!/bin/bash -x
+    shell('''#!/bin/bash -xe
 
 buildID=$(echo $buildID|tr -d ' ')
 buildURL=$(echo $buildURL|tr -d ' ')
@@ -46,7 +37,6 @@ wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate http://down
 cat ${WORKSPACE}/buildproperties.shsource
 source ${WORKSPACE}/buildproperties.shsource
 
-
 epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse
 dropsPath=${epDownloadDir}/downloads/drops4
 buildDir=${dropsPath}/${buildID}
@@ -58,7 +48,6 @@ workspace=${workingDir}/${JOB_BASE_NAME}-${BUILD_NUMBER}
 ssh [email protected] rm -rf ${workingDir}/${JOB_BASE_NAME}*
 
 ssh [email protected] mkdir -p ${workspace}
-ssh [email protected] cd ${workspace}
 
 #get latest Eclipse platform product
 epRelDir=$(ssh [email protected] ls -d --format=single-column ${dropsPath}/R-*|sort|tail -1)
@@ -84,7 +73,6 @@ cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tycho
 scp -r eclipse [email protected]:${workspace}/eclipse
 cd ${WORKSPACE}
 
-
 #triggering ant runner
 baseBuilderDir=${workspace}/basebuilder
 javaCMD=${java_home}/java
@@ -101,8 +89,7 @@ ssh [email protected]  ${javaCMD} -jar ${launcherJar} -n
   -Djob=${triggeringJob} \\
   -DbuildURL=${buildURL} \\
   -DbuildID=${buildID}
-  
-#
+
 devworkspace=${workspace}/workspace-updateTestResults
 
 ssh [email protected]  ${javaCMD} -jar ${launcherJar} -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.ant.core.antRunner -file ${workspace}/publish.xml \\
@@ -113,18 +100,12 @@ ssh [email protected]  ${javaCMD} -jar ${launcherJar} -n
   "-DtestsConfigExpected=${TEST_CONFIGURATIONS_EXPECTED}" \\
   -DEBuilderDir=${workspace}
 
-
-
-
 #Delete Workspace
 ssh [email protected] rm -rf ${workingDir}/${JOB_BASE_NAME}*
     ''')
   }
 
   publishers {
-    extendedEmail {
-      recipientList("[email protected]")
-    }
     downstream('Releng/updateIndex', 'SUCCESS')
   }
 }

JenkinsJobs/YBuilds/Y_unit_tests.groovy

@@ -109,7 +109,7 @@ pipeline {
         // For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903
         archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt'
         junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml'
-        build job: 'YPBuilds/ep-collectYbuildResults', wait: false, parameters: [
+        build job: 'Releng/ep-collectResults', wait: false, parameters: [
           string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"),
           string(name: 'buildURL', value: "${BUILD_URL}"),
           string(name: 'buildID', value: "${params.buildId}")