forked from adoptium/ci-jenkins-pipelines
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #251 from llxia/test2
Fix vendor repo missing issue for regular test builds
- Loading branch information
Showing
1 changed file
with
16 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 = '' | ||
| } | ||
| } | ||
|
|
||
|
|
||