Update CollectResults and tests to use new parameters.

eclipse-platform · Nov 15, 2022 · 38e97e5 · 38e97e5
1 parent 3867026
commit 38e97e5
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/JenkinsJobs/AutomatedTests/ep426I_unit_cen64_gtk3_java11.groovy b/JenkinsJobs/AutomatedTests/ep426I_unit_cen64_gtk3_java11.groovy
@@ -149,7 +149,7 @@ spec:
                   junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml'
               }
               archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt'
-              build job: 'Releng/ep-collectResults', parameters: [string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), string(name: 'triggeringBuildNumber', value: "${BUILD_NUMBER}"), string(name: 'buildId', value: "${params.buildId}")], wait: false
+              build job: 'Releng/ep-collectResults', parameters: [string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), string(name: 'buildURL', value: "${BUILD_URL}"), string(name: 'buildID', value: "${params.buildId}")], wait: false
           }
       }
   }

diff --git a/JenkinsJobs/AutomatedTests/ep426I_unit_cen64_gtk3_java17.groovy b/JenkinsJobs/AutomatedTests/ep426I_unit_cen64_gtk3_java17.groovy
@@ -148,7 +148,7 @@ spec:
               }
               archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt'
               junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml'
-              build job: 'Releng/ep-collectResults', parameters: [string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), string(name: 'triggeringBuildNumber', value: "${BUILD_NUMBER}"), string(name: 'buildId', value: "${params.buildId}")], wait: false
+              build job: 'Releng/ep-collectResults', parameters: [string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), string(name: 'buildURL', value: "${BUILD_URL}"), string(name: 'buildID', value: "${params.buildId}")], wait: false
           }
       }
   }

diff --git a/JenkinsJobs/AutomatedTests/ep426I_unit_cen64_gtk3_java19.groovy b/JenkinsJobs/AutomatedTests/ep426I_unit_cen64_gtk3_java19.groovy
@@ -148,7 +148,7 @@ spec:
               }
               archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt'
               junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml'
-              build job: 'Releng/ep-collectResults', parameters: [string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), string(name: 'triggeringBuildNumber', value: "${BUILD_NUMBER}"), string(name: 'buildId', value: "${params.buildId}")], wait: false
+              build job: 'Releng/ep-collectResults', parameters: [string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), string(name: 'buildURL', value: "${BUILD_URL}"), string(name: 'buildID', value: "${params.buildId}")], wait: false
           }
       }
   }

diff --git a/JenkinsJobs/AutomatedTests/ep426I_unit_mac64_java17.groovy b/JenkinsJobs/AutomatedTests/ep426I_unit_mac64_java17.groovy
@@ -144,8 +144,8 @@ echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n"
         condition('UNSTABLE_OR_BETTER')
         parameters {
           predefinedProp('triggeringJob', '$JOB_BASE_NAME')
-          predefinedProp('triggeringBuildNumber', '$BUILD_NUMBER')
-          predefinedProp('buildId', '$buildId')
+          predefinedProp('buildURL', '$BUILD_URL')
+          predefinedProp('buildID', '$buildId')
         }
       }
     }

diff --git a/JenkinsJobs/AutomatedTests/ep426I_unit_macM1_java17.groovy b/JenkinsJobs/AutomatedTests/ep426I_unit_macM1_java17.groovy
@@ -144,8 +144,8 @@ echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n"
         condition('UNSTABLE_OR_BETTER')
         parameters {
           predefinedProp('triggeringJob', '$JOB_BASE_NAME')
-          predefinedProp('triggeringBuildNumber', '$BUILD_NUMBER')
-          predefinedProp('buildId', '$buildId')
+          predefinedProp('buildURL', '$BUILD_URL')
+          predefinedProp('buildID', '$buildId')
         }
       }
     }

diff --git a/JenkinsJobs/AutomatedTests/ep426I_unit_win32_java11.groovy b/JenkinsJobs/AutomatedTests/ep426I_unit_win32_java11.groovy
@@ -133,8 +133,8 @@ ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%\\tmp -Djvm="C:\\\\openjdk\\\
         condition('ALWAYS')
         parameters {
           predefinedProp('triggeringJob', '$JOB_BASE_NAME')
-          predefinedProp('triggeringBuildNumber', '$BUILD_NUMBER')
-          predefinedProp('buildId', '$buildId')
+          predefinedProp('buildURL', '$BUILD_URL')
+          predefinedProp('buildID', '$buildId')
         }
       }
     }

diff --git a/JenkinsJobs/Releng/collectResults.groovy b/JenkinsJobs/Releng/collectResults.groovy
@@ -4,8 +4,8 @@ job('Releng/ep-collectResults'){
 
   parameters {
     stringParam('triggeringJob', null, 'Name of the job to collect results from: i.e. \'ep425I-unit-cen64-gtk3-java11\'.')
-    stringParam('triggeringBuildNumber', null, 'Build number of the triggering job.')
-    stringParam('buildId', null, 'ID of the I-build being tested.')
+    stringParam('buildURL', null, 'Build URL of the triggering job.')
+    stringParam('buildID', null, 'ID of the I-build being tested.')
   }
 
   label('centos-8')
@@ -36,18 +36,18 @@ job('Releng/ep-collectResults'){
     shell('''
 #!/bin/bash -x
 
-buildId=$(echo $buildId|tr -d ' ')
-triggeringBuildNumber=$(echo $triggeringBuildNumber|tr -d ' ')
+buildID=$(echo $buildID|tr -d ' ')
+buildURL=$(echo $buildURL|tr -d ' ')
 triggeringJob=$(echo $triggeringJob|tr -d ' ')
 
-wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate http://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
+wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate http://download.eclipse.org/eclipse/downloads/drops4/${buildID}/buildproperties.shsource
 cat ${WORKSPACE}/buildproperties.shsource
 source ${WORKSPACE}/buildproperties.shsource
 
 
 epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse
 dropsPath=${epDownloadDir}/downloads/drops4
-buildDir=${dropsPath}/${buildId}
+buildDir=${dropsPath}/${buildID}
 
 workingDir=${epDownloadDir}/workingDir
 
@@ -95,21 +95,21 @@ source ./buildproperties.shsource
 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 \\
-  -Djob=${triggeringJob} \\
-  -DbuildNumber=${triggeringBuildNumber} \\
-  -DbuildId=${buildId} \\
-  -DeclipseStream=${STREAM} \\
+  -DpostingDirectory=${dropsPath} \\
+  -DbuildURL=${buildURL} \\
+  -DbuildID=${buildID} \\
   -DEBUILDER_HASH=${EBUILDER_HASH}
   
 #
 devworkspace=${workspace}/workspace-updateTestResults
 
 ssh genie.releng@projects-storage.eclipse.org  ${javaCMD} -jar ${launcherJar} -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.ant.core.antRunner -file ${workspace}/genTestIndexes.xml \\
+  -DpostingDirectory=${dropsPath} \\
   -Djob=${triggeringJob} \\
-  -DbuildId=${buildId} \\
-  -DeclipseStream=${STREAM} \\
-  -Dbasebuilder=$baseBuilderDir \\
-  -Dworkspace=${workspace}
+  -DbuildID=${buildID} \\
+  -DeclipseStream=${STREAM} 
+
+
 
 
 #Delete Workspace