Skip to content

Commit

Permalink
Update collect results job to use java17 with ant and new job structu…
Browse files Browse the repository at this point in the history
…re (#647)

* Update to collect results job to use java 17 with ant

* Update the results paths to use new test job structure

* correcting mistake in the condition statement

If performance test old path needs to be used. and for others new path
to be used
  • Loading branch information
sravanlakkimsetti committed Oct 26, 2022
1 parent 5d3edf0 commit 3602e91
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion JenkinsJobs/Releng/collectResults.groovy
Expand Up @@ -31,7 +31,7 @@ job('Releng/ep-collectResults'){
}
withAnt {
installation('apache-ant-latest')
jdk('Default')
jdk('openjdk-jdk17-latest')
}
}

Expand Down
15 changes: 10 additions & 5 deletions cje-production/scripts/collectTestResults.xml
Expand Up @@ -228,11 +228,16 @@
<!-- attempt to create incase hasn't been created yet -->
<mkdir dir="${resultsDir}" />

<property
name="hudsonResultRootJobURL"
value="${env.HUDSON_PROTOCOL}://${hudsonHost}:${env.HUDSON_PORT}/${hudsonPathSegment}/job/${job}/${buildNumber}" />


<condition
property="hudsonResultRootJobURL"
value="${env.HUDSON_PROTOCOL}://${hudsonHost}:${env.HUDSON_PORT}/${hudsonPathSegment}/job/${job}/${buildNumber}"
else="${env.HUDSON_PROTOCOL}://${hudsonHost}:${env.HUDSON_PORT}/${hudsonPathSegment}/job/AutomatedTests/job/${job}/${buildNumber}">
<contains
string="${job}"
substring="-perf-"
casesensitive="yes" />
</condition>

<property
name="hudsonResultRootURL"
value="${hudsonResultRootJobURL}/artifact/*zip*" />
Expand Down

0 comments on commit 3602e91

Please sign in to comment.