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.
- remove FIPS sanity.functional testing - limit FIPS functional testing on OpenJcePlusTests and security only related: internal/backlog/issues/1494 Signed-off-by: Lan Xia <[email protected]>
- Loading branch information
Showing
6 changed files
with
15 additions
and
36 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 |
|---|---|---|
|
|
@@ -465,11 +465,13 @@ class Build { | |
| context.stage("${testType}") { | ||
| def rerunIterations = '3' | ||
| def fipsTestBuildSuffix = ""; | ||
| def buildList = "" | ||
| if ("${testType}".contains(".fips")) { | ||
| String[] tokens = testType.split('\\.') | ||
| testType = tokens[0] + "." + tokens[1] | ||
| fipsTestBuildSuffix = tokens[2] | ||
| rerunIterations = '0' | ||
| buildList = "functional/OpenJcePlusTests,functional/security" | ||
| } | ||
| def keep_test_reportdir = buildConfig.KEEP_TEST_REPORTDIR | ||
| if ("${testType}".contains('dev') || "${testType}".contains('external')) { | ||
|
|
@@ -500,18 +502,22 @@ class Build { | |
| def VENDOR_TEST_BRANCHES = '' | ||
| def VENDOR_TEST_DIRS = '' | ||
| if ("${testType}".contains('functional')) { | ||
| VENDOR_TEST_REPOS = '[email protected]:runtimes/test.git' | ||
| VENDOR_TEST_BRANCHES = aqaBranch | ||
| VENDOR_TEST_DIRS = 'functional' | ||
| if (fipsTestBuildSuffix && !"${fipsTestBuildSuffix}".contains("fips")) { | ||
| VENDOR_TEST_REPOS = '[email protected]:runtimes/test.git' | ||
| VENDOR_TEST_BRANCHES = aqaBranch | ||
| VENDOR_TEST_DIRS = 'functional' | ||
| } | ||
| 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')) { | ||
| VENDOR_TEST_REPOS = '[email protected]:runtimes/osb-tests.git' | ||
| VENDOR_TEST_BRANCHES = "ibm_tlda" | ||
| VENDOR_TEST_DIRS = 'openjdk' | ||
| if (fipsTestBuildSuffix && !"${fipsTestBuildSuffix}".contains("fips")) { | ||
| VENDOR_TEST_REPOS = '[email protected]:runtimes/osb-tests.git' | ||
| VENDOR_TEST_BRANCHES = "ibm_tlda" | ||
| VENDOR_TEST_DIRS = 'openjdk' | ||
| } | ||
| } | ||
|
|
||
| def DOCKER_REGISTRY_URL = '' | ||
|
|
@@ -637,6 +643,9 @@ class Build { | |
| if (jobParams.any{mapEntry -> mapEntry.key.equals("TIME_LIMIT")}) { | ||
| testJobParams.add(context.string(name: 'TIME_LIMIT', value: jobParams["TIME_LIMIT"])) | ||
| } | ||
| if (buildList) { | ||
| testJobParams.add(context.string(name: 'BUILD_LIST', value: buildList)) | ||
| } | ||
|
|
||
| def testJob = context.build job: jobName, | ||
| propagate: false, | ||
|
|
||
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
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
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
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
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