From 7edf1ca4435ea9faa31ca25b3002b6da499bc1d8 Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Mon, 4 Mar 2024 11:50:29 -0500 Subject: [PATCH 1/2] Set dev.system test dir Signed-off-by: Sophia Guo --- pipelines/build/common/openjdk_build_pipeline.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index 8f7ec797a..3cc3aaa05 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -359,6 +359,7 @@ class Build { def vendorTestRepos = '' def vendorTestBranches = '' + def vendorTestDirs = '' List testList = buildConfig.TEST_LIST List dynamicList = buildConfig.DYNAMIC_LIST List numMachines = buildConfig.NUM_MACHINES @@ -407,6 +408,7 @@ class Build { vendorTestBranches = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON['repository']['build_branch'] : DEFAULTS_JSON['repository']['build_branch'] vendorTestRepos = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON['repository']['build_url'] : DEFAULTS_JSON['repository']['build_url'] vendorTestRepos = vendorTestRepos - ('.git') + vendorTestDirs = '/test/system' // Use BUILD_REF override if specified vendorTestBranches = buildConfig.BUILD_REF ?: vendorTestBranches } @@ -481,6 +483,7 @@ class Build { context.booleanParam(name: 'DYNAMIC_COMPILE', value: DYNAMIC_COMPILE), context.string(name: 'VENDOR_TEST_REPOS', value: vendorTestRepos), context.string(name: 'VENDOR_TEST_BRANCHES', value: vendorTestBranches), + context.string(name: 'VENDOR_TEST_DIRS', value: vendorTestDirs), context.string(name: 'RERUN_ITERATIONS', value: "${rerunIterations}") ] From 01650d70f052c05f241fd9e188c7ac4d12b59e89 Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Mon, 4 Mar 2024 13:56:47 -0500 Subject: [PATCH 2/2] Remove docker laber requirement for dev.system Signed-off-by: Sophia Guo --- pipelines/build/common/openjdk_build_pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index 3cc3aaa05..230dde948 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -394,7 +394,7 @@ class Build { DYNAMIC_COMPILE = true } def additionalTestLabel = buildConfig.ADDITIONAL_TEST_LABEL - if (testType == 'dev.openjdk' || testType == 'dev.system') { + if (testType == 'dev.openjdk') { context.println "${testType} need extra label sw.tool.docker" if (additionalTestLabel == '') { additionalTestLabel = 'sw.tool.docker'