@@ -350,7 +350,9 @@ class Build {
350
350
def jdkBranch = getJDKBranch()
351
351
def jdkRepo = getJDKRepo()
352
352
def openj9Branch = (buildConfig. SCM_REF && buildConfig. VARIANT == ' openj9' ) ? buildConfig. SCM_REF : ' master'
353
-
353
+ def vendorTestRepos = ' '
354
+ def vendorTestBranches = ' '
355
+
354
356
List testList = buildConfig. TEST_LIST
355
357
List dynamicList = buildConfig. DYNAMIC_LIST
356
358
List numMachines = buildConfig. NUM_MACHINES
@@ -385,14 +387,24 @@ class Build {
385
387
DYNAMIC_COMPILE = true
386
388
}
387
389
def additionalTestLabel = buildConfig. ADDITIONAL_TEST_LABEL
388
- if (testType == ' dev.openjdk' ) {
390
+ if (testType == ' dev.openjdk' || testType == ' dev.system ' ) {
389
391
context. println " ${ testType} need extra label sw.tool.docker"
390
392
if (additionalTestLabel == ' ' ) {
391
393
additionalTestLabel = ' sw.tool.docker'
392
394
} else {
393
395
additionalTestLabel + = ' &&sw.tool.docker'
394
396
}
395
397
}
398
+
399
+ if (testType == ' dev.system' ) {
400
+ def useAdoptShellScripts = Boolean . valueOf(buildConfig. USE_ADOPT_SHELL_SCRIPTS )
401
+ vendorTestBranches = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON [' repository' ][' build_branch' ] : DEFAULTS_JSON [' repository' ][' build_branch' ]
402
+ vendorTestRepos = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON [' repository' ][' build_url' ] : DEFAULTS_JSON [' repository' ][' build_url' ]
403
+ vendorTestRepos = vendorTestRepos - (' .git' )
404
+ // Use BUILD_REF override if specified
405
+ vendorTestBranches = buildConfig. BUILD_REF ?: vendorTestBranches
406
+ }
407
+
396
408
def jobParams = getAQATestJobParams(testType)
397
409
def parallel = ' None'
398
410
def numMachinesPerTest = ' '
@@ -463,6 +475,8 @@ class Build {
463
475
context. string(name : ' ADOPTOPENJDK_BRANCH' , value : aqaBranch),
464
476
context. string(name : ' ACTIVE_NODE_TIMEOUT' , value : " ${ buildConfig.ACTIVE_NODE_TIMEOUT} " ),
465
477
context. booleanParam(name : ' DYNAMIC_COMPILE' , value : DYNAMIC_COMPILE ),
478
+ context. string(name : ' VENDOR_TEST_REPOS' , value : vendorTestRepos),
479
+ context. string(name : ' VENDOR_TEST_BRANCHES' , value : vendorTestBranches),
466
480
context. string(name : ' RERUN_ITERATIONS' , value : " ${ rerunIterations} " )
467
481
],
468
482
wait : true
0 commit comments