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

Jump to bottom

Reduce FIPS functional testing #245

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Reduce FIPS functional testing #245

Show file tree
Hide file tree
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
21 changes: 15 additions & 6 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 @@ -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')) {
Expand Down Expand Up @@ -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 = ''
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 0 additions & 6 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@ class Config11 {
'sanity.external',
'dev.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -403,7 +402,6 @@ class Config11 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -529,7 +527,6 @@ class Config11 {
'sanity.external',
'dev.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -555,7 +552,6 @@ class Config11 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -611,7 +607,6 @@ class Config11 {
'sanity.external',
'dev.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -637,7 +632,6 @@ class Config11 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down
6 changes: 0 additions & 6 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ class Config17 {
'sanity.external',
'dev.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -356,7 +355,6 @@ class Config17 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -487,7 +485,6 @@ class Config17 {
'sanity.external',
'dev.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -513,7 +510,6 @@ class Config17 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -569,7 +565,6 @@ class Config17 {
'sanity.external',
'dev.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -595,7 +590,6 @@ class Config17 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down
6 changes: 0 additions & 6 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ class Config21 {
'dev.external',
'dev.openjdk',
'dev.system',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -317,7 +316,6 @@ class Config21 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -438,7 +436,6 @@ class Config21 {
'sanity.external',
'dev.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -464,7 +461,6 @@ class Config21 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -520,7 +516,6 @@ class Config21 {
'sanity.external',
'dev.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -546,7 +541,6 @@ class Config21 {
'special.openjdk',
'special.system',
'dev.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down
6 changes: 0 additions & 6 deletions pipelines/jobs/configurations/jdk23_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class Config23 {
'dev.functional',
'sanity.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -86,7 +85,6 @@ class Config23 {
'special.jck',
'special.openjdk',
'special.system',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -259,7 +257,6 @@ class Config23 {
'dev.functional',
'sanity.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -284,7 +281,6 @@ class Config23 {
'special.jck',
'special.openjdk',
'special.system',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -344,7 +340,6 @@ class Config23 {
'dev.functional',
'sanity.external',
'dev.openjdk',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -369,7 +364,6 @@ class Config23 {
'special.jck',
'special.openjdk',
'special.system',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down
6 changes: 0 additions & 6 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ class Config8 {
'special.system',
'sanity.external',
'dev.functional',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -83,7 +82,6 @@ class Config8 {
'special.openjdk',
'special.system',
'sanity.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -234,7 +232,6 @@ class Config8 {
'special.system',
'sanity.external',
'dev.functional',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -258,7 +255,6 @@ class Config8 {
'special.openjdk',
'special.system',
'sanity.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down Expand Up @@ -328,7 +324,6 @@ class Config8 {
'special.system',
'sanity.external',
'dev.functional',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand All @@ -352,7 +347,6 @@ class Config8 {
'special.openjdk',
'special.system',
'sanity.external',
'sanity.functional.fips140_2',
'extended.functional.fips140_2',
'sanity.jck.fips140_2',
'extended.jck.fips140_2',
Expand Down