Skip to content

Commit 3c62df5

Browse files
authored
Only trigger testing with the platform specified (#5710)
resolves: #5709 Signed-off-by: Lan Xia <[email protected]>
1 parent d9e0bd2 commit 3c62df5

File tree

1 file changed

+24
-14
lines changed

1 file changed

+24
-14
lines changed

buildenv/jenkins/aqaTestPipeline.groovy

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def PIPELINE_DISPLAY_NAME = (params.PIPELINE_DISPLAY_NAME) ? "#${currentBuild.nu
2929
// Set the AQA_TEST_PIPELINE Jenkins job displayName
3030
currentBuild.setDisplayName(PIPELINE_DISPLAY_NAME)
3131

32-
def defaultTestTargets = "sanity.functional,extended.functional,special.functional,sanity.openjdk,extended.openjdk,special.openjdk,sanity.system,extended.system,special.system,sanity.perf,extended.perf,sanity.jck,extended.jck,special.jck"
33-
def defaultFipsTestTargets = "extended.functional,sanity.openjdk,extended.openjdk,sanity.jck,extended.jck,special.jck"
32+
defaultTestTargets = "sanity.functional,extended.functional,special.functional,sanity.openjdk,extended.openjdk,special.openjdk,sanity.system,extended.system,special.system,sanity.perf,extended.perf,sanity.jck,extended.jck,special.jck"
33+
defaultFipsTestTargets = "extended.functional,sanity.openjdk,extended.openjdk,sanity.jck,extended.jck,special.jck"
3434
if (params.BUILD_TYPE == "nightly") {
3535
defaultTestTargets = "sanity.functional,extended.functional,sanity.openjdk,extended.openjdk,sanity.perf,sanity.jck,sanity.system,special.system"
3636
}
@@ -60,20 +60,19 @@ JDK_VERSIONS.each { JDK_VERSION ->
6060
}
6161

6262
configJson.each { item ->
63-
def releaseTestFlag = ""
64-
releaseTestFlag = item.TEST_FLAG
63+
def releaseTestFlag = item.TEST_FLAG
6564
item.PLATFORM_TARGETS.each { pt ->
66-
pt.each{ p, t ->
67-
def releasePlatform = p
68-
def releaseTargets = ""
69-
if (t.contains("defaultFipsTestTargets")) {
70-
releaseTargets = t.replace("defaultFipsTestTargets","${defaultFipsTestTargets}")
65+
pt.each { p, t ->
66+
// When the AQA Test Pipeline is triggered by an upstream pipeline at runtime, we only receive the SDK URL for a single platform at a time.
67+
// if params.PLATFORMS is set, only trigger testing for the platform that is specified
68+
if (params.PLATFORMS) {
69+
if (params.PLATFORMS.contains(p)) {
70+
echo "Only triggering test builds specified in PLATFORMS: ${params.PLATFORMS}..."
71+
generateJobs(JDK_VERSION, releaseTestFlag, p, t, PARALLEL)
72+
}
7173
} else {
72-
releaseTargets = t.replace("defaultTestTargets","${defaultTestTargets}")
74+
generateJobs(JDK_VERSION, releaseTestFlag, p, t, PARALLEL)
7375
}
74-
String[] releasePlatformArray = releasePlatform.split("\\s*,\\s*")
75-
String[] releaseTargetsArray = releaseTargets.split("\\s*,\\s*")
76-
generateJobs(JDK_VERSION, releaseTestFlag, releasePlatformArray, releaseTargetsArray, PARALLEL)
7776
}
7877
}
7978
}
@@ -87,6 +86,18 @@ if (fail) {
8786
}
8887

8988
def generateJobs(jobJdkVersion, jobTestFlag, jobPlatforms, jobTargets, jobParallel) {
89+
if (jobTargets instanceof String) {
90+
if (jobTargets.contains("defaultFipsTestTargets")) {
91+
jobTargets = jobTargets.replace("defaultFipsTestTargets","${defaultFipsTestTargets}")
92+
} else {
93+
jobTargets = jobTargets.replace("defaultTestTargets","${defaultTestTargets}")
94+
}
95+
jobTargets = jobTargets.split("\\s*,\\s*")
96+
}
97+
if (jobPlatforms instanceof String) {
98+
jobPlatforms = jobPlatforms.split("\\s*,\\s*")
99+
}
100+
90101
echo "jobJdkVersion: ${jobJdkVersion}, jobTestFlag: ${jobTestFlag}, jobPlatforms: ${jobPlatforms}, jobTargets: ${jobTargets}, jobParallel: ${jobParallel}"
91102
if (jobTestFlag == "NONE") {
92103
jobTestFlag = ""
@@ -197,7 +208,6 @@ def generateJobs(jobJdkVersion, jobTestFlag, jobPlatforms, jobTargets, jobParall
197208
jobParallel = "None"
198209
}
199210
}
200-
echo "AUTO_AQA_GEN: ${AUTO_AQA_GEN}"
201211
// Grinder job has special settings and should be regenerated specifically, not via aqaTestPipeline
202212
if (AUTO_AQA_GEN.toBoolean() && !TEST_JOB_NAME.contains("Grinder")) {
203213
String[] targetTokens = TARGET.split("\\.")

0 commit comments

Comments
 (0)