@@ -29,8 +29,8 @@ def PIPELINE_DISPLAY_NAME = (params.PIPELINE_DISPLAY_NAME) ? "#${currentBuild.nu
29
29
// Set the AQA_TEST_PIPELINE Jenkins job displayName
30
30
currentBuild. setDisplayName(PIPELINE_DISPLAY_NAME )
31
31
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"
34
34
if (params. BUILD_TYPE == " nightly" ) {
35
35
defaultTestTargets = " sanity.functional,extended.functional,sanity.openjdk,extended.openjdk,sanity.perf,sanity.jck,sanity.system,special.system"
36
36
}
@@ -60,20 +60,19 @@ JDK_VERSIONS.each { JDK_VERSION ->
60
60
}
61
61
62
62
configJson. each { item ->
63
- def releaseTestFlag = " "
64
- releaseTestFlag = item. TEST_FLAG
63
+ def releaseTestFlag = item. TEST_FLAG
65
64
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
+ }
71
73
} else {
72
- releaseTargets = t . replace( " defaultTestTargets " , " ${ defaultTestTargets } " )
74
+ generateJobs( JDK_VERSION , releaseTestFlag, p, t, PARALLEL )
73
75
}
74
- String [] releasePlatformArray = releasePlatform. split(" \\ s*,\\ s*" )
75
- String [] releaseTargetsArray = releaseTargets. split(" \\ s*,\\ s*" )
76
- generateJobs(JDK_VERSION , releaseTestFlag, releasePlatformArray, releaseTargetsArray, PARALLEL )
77
76
}
78
77
}
79
78
}
@@ -87,6 +86,18 @@ if (fail) {
87
86
}
88
87
89
88
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
+
90
101
echo " jobJdkVersion: ${ jobJdkVersion} , jobTestFlag: ${ jobTestFlag} , jobPlatforms: ${ jobPlatforms} , jobTargets: ${ jobTargets} , jobParallel: ${ jobParallel} "
91
102
if (jobTestFlag == " NONE" ) {
92
103
jobTestFlag = " "
@@ -197,7 +208,6 @@ def generateJobs(jobJdkVersion, jobTestFlag, jobPlatforms, jobTargets, jobParall
197
208
jobParallel = " None"
198
209
}
199
210
}
200
- echo " AUTO_AQA_GEN: ${ AUTO_AQA_GEN} "
201
211
// Grinder job has special settings and should be regenerated specifically, not via aqaTestPipeline
202
212
if (AUTO_AQA_GEN . toBoolean() && ! TEST_JOB_NAME . contains(" Grinder" )) {
203
213
String [] targetTokens = TARGET . split(" \\ ." )
0 commit comments