Get dacapo-h2 metric and store in a file#6339
Conversation
karianna
left a comment
There was a problem hiding this comment.
2 nitpicks then over to one of the test team reviewers
llxia
left a comment
There was a problem hiding this comment.
This PR contains 55 commits. Please rebase the branch to remove other people's commits. Thanks
Reset to current upstream, added relevant changes for this issue. Fixes: adoptium#6327 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
|
Updated to a single commit |
buildenv/jenkins/JenkinsfileBase
Outdated
| } | ||
| } | ||
|
|
||
| checkDacapoH2Metric() |
There was a problem hiding this comment.
This should be wrapped around
if (env.BUILD_LIST.startsWith('perf')) {
...
}
|
Please run a Grinder with your changes. And use the git keyword to relate to the issue. See https://github.com/adoptium/aqa-tests/blob/master/Contributing.md for details. Thanks |
|
As expected, the h2 metric is found and archived when h2 passes, otherwise the console indicates that it is not found and does not archive. Some tests failed/hanged but I don't think that's me, as all I did was use a logMatcher after all the tests were run? This is also using the old dacapo jar. |
buildenv/jenkins/JenkinsfileBase
Outdated
| def archiveDacapoH2Metric(runtime) { | ||
| def fileName = "${env.JOB_NAME}_${env.BUILD_NUMBER}.log" | ||
| def jsonData = [ | ||
| "Benchmark": "dacapo-h2", |
There was a problem hiding this comment.
My bad. Please keep Benchmark in a lowercase -> benchmark
|
Just for the record, https://ci.adoptium.net/job/Grinder/13469/console json file: https://ci.adoptium.net/job/Grinder/13469/artifact/Grinder_13469.log/*view*/ Thanks @MattyWeee123 . Looks good :) |
buildenv/jenkins/JenkinsfileBase
Outdated
|
|
||
| return this | ||
| def checkDacapoH2Metric() { | ||
| def regex = ".*=====\\sDaCapo.*?h2\\sPASSED\\sin\\s(\\d*\\.?\\d*)\\smsec\\s=====\\s*\$" |
There was a problem hiding this comment.
nitpicking: Please use the same indentation as the rest of the file. I think tab is used (not space)
Use java regex to parse the dacapo runtime log, reformat it into a JSON style metric log, and archive it in Jenkins.
Fixes: #6327