Skip to content

Commit 29641b0

Browse files
committed
[Build] Fix collection of the first test results
Check if results for other test configurations have been published yet and if the corresponding directory already exists on the storage server. Additionally use the eclipse-platform instead of the eclipse-SDK product. The former is smaller, but sufficient for the executed tasks. Fixes - #3386
1 parent 9627868 commit 29641b0

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

JenkinsJobs/Releng/collectTestResults.jenkinsfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pipeline {
33
skipDefaultCheckout()
44
timestamps()
55
timeout(time: 30, unit: 'MINUTES')
6-
buildDiscarder(logRotator(numToKeepStr:'5'))
6+
buildDiscarder(logRotator(numToKeepStr:'15'))
77
disableConcurrentBuilds()
88
}
99
agent {
@@ -51,7 +51,12 @@ pipeline {
5151
mkdir -p "${testResultsDir}"
5252

5353
# Fetch previously collected test results and already generated files (that would otherwise be re-generated)
54-
rsync -avzh --exclude="*_${triggeringJob}_*" [email protected]:${EP_ECLIPSE_DROPS}/${buildID}/testresults/xml ${buildDirectory}/testresults
54+
allTestResultsXMLDirectory="${EP_ECLIPSE_DROPS}/${buildID}/testresults/xml"
55+
if ssh [email protected] "[ -d '${allTestResultsXMLDirectory}' ]"; then
56+
rsync -avzh --exclude="*_${triggeringJob}_*" [email protected]:${allTestResultsXMLDirectory} ${buildDirectory}/testresults
57+
else
58+
echo 'Test results of other configurations not yet published.'
59+
fi
5560

5661
# ==========================================
5762
# Collect results and overview from test-job
@@ -94,7 +99,7 @@ def installLatestEclipse(){
9499
return [n, (v.startsWith('"') && v.endsWith('"') ? v.substring(1, v.length() - 1) : v)]
95100
}
96101
}
97-
def eclipseURL = "https://download.eclipse.org/eclipse/downloads/drops4/${props.PREVIOUS_RELEASE_ID}/eclipse-SDK-${props.PREVIOUS_RELEASE_VER}-linux-gtk-x86_64.tar.gz"
102+
def eclipseURL = "https://download.eclipse.org/eclipse/downloads/drops4/${props.PREVIOUS_RELEASE_ID}/eclipse-platform-${props.PREVIOUS_RELEASE_VER}-linux-gtk-x86_64.tar.gz"
98103
return install('eclipse', eclipseURL) + '/eclipse --launcher.suppressErrors -nosplash -consolelog'
99104
}
100105

0 commit comments

Comments
 (0)