Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildenv/jenkins/perfPipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def perfConfigJson = []
node("ci.role.test&&hw.arch.x86&&sw.os.linux") {
checkout scm
dir (env.WORKSPACE) {
def filePath = "./jenkins/config/"
def filePath = "./aqa-tests/perf/config/${params.JDK_IMPL}/"
filePath = filePath + "perfConfig.json"
echo "Read JSON from file ${filePath}..."
perfConfigJson = readJSON(file: "${filePath}")
Expand Down Expand Up @@ -93,7 +93,7 @@ timestamps {
}

def triggerJob(benchmarkName, platformName, buildParams, jobSuffix) {
def buildJobName = "Perf_openjdk21_j9_sanity.perf_${platformName}_${benchmarkName}_${jobSuffix}"
def buildJobName = "${JOB_NAME}_${jobSuffix}"
def JobHelper = library(identifier: 'openjdk-jenkins-helper@master').JobHelper
def jobIsRunnable = JobHelper.jobIsRunnable("${buildJobName}")
if (!jobIsRunnable) {
Expand Down
9 changes: 7 additions & 2 deletions buildenv/jenkins/perfPipeline_root.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,13 @@ PLATFORMS.each { PLATFORM ->
}
childParams << string(name: "PLATFORM", value: PLATFORM)
childParams << string(name: "BENCHMARK", value: BENCHMARK)

def jobName = "Perf_openjdk21_j9_sanity.perf_${PLATFORM}_${BENCHMARK}"
def shortName = "j9"
if (params.JDK_IMPL) {
if (params.JDK_IMPL == "hotspot") {
shortName = "hs"
}
}
def jobName = "Perf_openjdk21_${shortName}_sanity.perf_${PLATFORM}_${BENCHMARK}"
JOBS[jobName] = {
build job: jobName, parameters: childParams, propagate: true
}
Expand Down
10 changes: 10 additions & 0 deletions perf/config/hotspot/perfConfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"BENCHMARK":"dacapo",
"TARGET":"testList TESTLIST=dacapo-h2",
"BUILD_LIST": "perf/dacapo",
"PLAT_MACHINE_MAP":[
{"x86-64_linux": "hw.arch.x86&&sw.os.linux&&ci.role.perf&&!test-docker-ubi9-x64-1"}
]
}
]