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.

Sign up for GitHub

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

Fix vendor repo missing issue for regular test builds #251

Merged
merged 1 commit into from
Nov 1, 2024
+16 −8
Merged

Fix vendor repo missing issue for regular test builds #251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,21 +502,29 @@ class Build {
def VENDOR_TEST_BRANCHES = ''
def VENDOR_TEST_DIRS = ''
if ("${testType}".contains('functional')) {
if (fipsTestBuildSuffix && !"${fipsTestBuildSuffix}".contains("fips")) {
VENDOR_TEST_REPOS = '[email protected]:runtimes/test.git'
VENDOR_TEST_BRANCHES = aqaBranch
VENDOR_TEST_DIRS = 'functional'
VENDOR_TEST_REPOS = '[email protected]:runtimes/test.git'
VENDOR_TEST_BRANCHES = aqaBranch
VENDOR_TEST_DIRS = 'functional'
// do not set functional vendor repo for FIPS
if (fipsTestBuildSuffix && "${fipsTestBuildSuffix}".contains("fips")) {
VENDOR_TEST_REPOS = ''
VENDOR_TEST_BRANCHES = ''
VENDOR_TEST_DIRS = ''
}
customizedSdkUrl += " " + testimageUrl
} else if ("${testType}".contains('jck')) {
VENDOR_TEST_REPOS = '[email protected]:runtimes/jck.git'
VENDOR_TEST_BRANCHES = "main"
VENDOR_TEST_DIRS = 'jck'
} else if ("${testType}".contains('special.openjdk')) {
if (fipsTestBuildSuffix && !"${fipsTestBuildSuffix}".contains("fips")) {
VENDOR_TEST_REPOS = '[email protected]:runtimes/osb-tests.git'
VENDOR_TEST_BRANCHES = "ibm_tlda"
VENDOR_TEST_DIRS = 'openjdk'
VENDOR_TEST_REPOS = '[email protected]:runtimes/osb-tests.git'
VENDOR_TEST_BRANCHES = "ibm_tlda"
VENDOR_TEST_DIRS = 'openjdk'
// do not set openjdk vendor repo for FIPS
if (fipsTestBuildSuffix && "${fipsTestBuildSuffix}".contains("fips")) {
VENDOR_TEST_REPOS = ''
VENDOR_TEST_BRANCHES = ''
VENDOR_TEST_DIRS = ''
}
}

Expand Down