Skip to content

Commit

Permalink
Add support for FIPS140-3
Browse files Browse the repository at this point in the history 
Enable 140-3_OpenJCEPlusFIPS sanity.openjdk and extended.openjdk on xlinux, plinux, zlinux and AIX on JDK11/17/21/22

Signed-off-by: Lan Xia <[email protected]>
  • Loading branch information
@llxia
llxia committed Jun 7, 2024
1 parent d439f31 commit 511e848
Show file tree
Hide file tree
Showing 5 changed files with 272 additions and 35 deletions.
15 changes: 8 additions & 7 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,11 +423,12 @@ class Build {
testStages["${testType}"] = {
context.println "Running test: ${testType}"
context.stage("${testType}") {
def isFipsTestBuild = false
def rerunIterations = '3'
if ("${testType}".contains(".fips140_2")) {
testType = testType.replace(".fips140_2","")
isFipsTestBuild = true
def fipsTestBuildSuffix = "";
if ("${testType}".contains(".fips")) {
String[] tokens = testType.split('.')
testType = tokens[0] + "." + tokens[1]
fipsTestBuildSuffix = tokens[2]
rerunIterations = '0'
}
def keep_test_reportdir = buildConfig.KEEP_TEST_REPORTDIR
Expand Down Expand Up @@ -519,9 +520,9 @@ class Build {
def jobParams = getAQATestJobParams(testType)

def testFlag = ''
if (isFipsTestBuild) {
jobParams.put('TEST_JOB_NAME', "${jobParams.TEST_JOB_NAME}_fips140_2")
testFlag = 'FIPS140_2'
if (fipsTestBuildSuffix?.trim()) {
jobParams.put('TEST_JOB_NAME', "${jobParams.TEST_JOB_NAME}_${fipsTestBuildSuffix}")
testFlag = fipsTestBuildSuffix.replace("fips", "FIPS")
}
def parallel = 'None'
def numMachinesPerTest = ''
Expand Down
73 changes: 66 additions & 7 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,9 @@ class Config11 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -342,7 +344,9 @@ class Config11 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
configureArgs : [
Expand Down Expand Up @@ -374,7 +378,54 @@ class Config11 {
additionalNodeLabels: [
openj9: 'hw.arch.ppc64 && sw.os.aix.7_2'
],
test : 'default',
test : [
nightly: [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'special.system'
],
weekly : [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'extended.perf',
'extended.jck',
'extended.system',
'special.functional',
'special.jck',
'special.openjdk',
'special.system',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'extended.perf',
'extended.jck',
'extended.system',
'special.functional',
'special.jck',
'special.openjdk',
'special.system',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
additionalFileNameTag: 'IBM',
cleanWorkspaceAfterBuild: true,
buildArgs : '--ssh --disable-adopt-branch-safety -r [email protected]:runtimes/openj9-openjdk-jdk11 -b ibm_sdk'
Expand Down Expand Up @@ -419,7 +470,9 @@ class Config11 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -443,7 +496,9 @@ class Config11 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
additionalNodeLabels: [
Expand Down Expand Up @@ -494,7 +549,9 @@ class Config11 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -518,7 +575,9 @@ class Config11 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
additionalNodeLabels: [
Expand Down
73 changes: 66 additions & 7 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,9 @@ class Config17 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -339,7 +341,9 @@ class Config17 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
additionalTestLabels: [
Expand Down Expand Up @@ -374,7 +378,54 @@ class Config17 {
additionalNodeLabels: [
openj9: 'hw.arch.ppc64 && sw.os.aix.7_2'
],
test : 'default',
test : [
nightly: [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'special.system'
],
weekly : [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'extended.perf',
'extended.jck',
'extended.system',
'special.functional',
'special.jck',
'special.openjdk',
'special.system',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'extended.perf',
'extended.jck',
'extended.system',
'special.functional',
'special.jck',
'special.openjdk',
'special.system',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
configureArgs : [
'openj9' : '--disable-ccache'
],
Expand Down Expand Up @@ -421,7 +472,9 @@ class Config17 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -445,7 +498,9 @@ class Config17 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
additionalNodeLabels: [
Expand Down Expand Up @@ -496,7 +551,9 @@ class Config17 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -520,7 +577,9 @@ class Config17 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
additionalNodeLabels: [
Expand Down
73 changes: 66 additions & 7 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,9 @@ class Config21 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -309,7 +311,9 @@ class Config21 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
cleanWorkspaceAfterBuild: true,
Expand All @@ -335,7 +339,54 @@ class Config21 {
os : 'aix',
arch : 'ppc64',
additionalNodeLabels: 'hw.arch.ppc64 && sw.os.aix.7_2',
test : 'default',
test : [
nightly: [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'special.system'
],
weekly : [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'extended.perf',
'extended.jck',
'extended.system',
'special.functional',
'special.jck',
'special.openjdk',
'special.system',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'extended.functional',
'extended.openjdk',
'extended.perf',
'extended.jck',
'extended.system',
'special.functional',
'special.jck',
'special.openjdk',
'special.system',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
cleanWorkspaceAfterBuild: true,
configureArgs : '--disable-ccache',
additionalFileNameTag: 'IBM',
Expand Down Expand Up @@ -381,7 +432,9 @@ class Config21 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -405,7 +458,9 @@ class Config21 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
cleanWorkspaceAfterBuild: true,
Expand Down Expand Up @@ -454,7 +509,9 @@ class Config21 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -478,7 +535,9 @@ class Config21 {
'extended.jck.fips140_2',
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2'
'extended.openjdk.fips140_2',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
cleanWorkspaceAfterBuild: true,
Expand Down
Loading

0 comments on commit 511e848

Please sign in to comment.