Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set dev.system test_dir and remove docker label for dev.system #956

Merged
merged 3 commits into from
Mar 5, 2024
Merged
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
5 changes: 4 additions & 1 deletion pipelines/build/common/openjdk_build_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -393,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'
Expand All @@ -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
}
Expand Down Expand Up @@ -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}")
]

Expand Down
Loading