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 6, 2024
1 parent 99d0b74 commit e2bfd75
Show file tree
Hide file tree
Showing 5 changed files with 359 additions and 30 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 @@ -375,11 +375,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 @@ -447,9 +448,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
32 changes: 24 additions & 8 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,9 @@ class Config11 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'dev.jck'
'dev.jck',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -354,7 +356,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 @@ -451,7 +455,9 @@ class Config11 {
'extended.system',
'special.functional',
'special.jck',
'dev.jck'
'dev.jck',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
'sanity.functional',
Expand All @@ -466,7 +472,9 @@ class Config11 {
'extended.jck',
'extended.system',
'special.functional',
'special.jck'
'special.jck',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
additionalFileNameTag: 'IBM',
Expand Down Expand Up @@ -509,7 +517,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 @@ -531,7 +541,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 @@ -578,7 +590,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 @@ -600,7 +614,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
36 changes: 32 additions & 4 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,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 @@ -339,7 +341,29 @@ class Config17 {
additionalNodeLabels: [
openj9: 'hw.arch.ppc64 && sw.os.aix.7_2'
],
test : 'default',
test : [
nightly: [
'sanity.functional',
'extended.functional',
'sanity.openjdk',
'sanity.perf',
'sanity.jck',
'sanity.system',
'special.system'
],
weekly : [
'dev.external',
'extended.openjdk',
'extended.perf',
'extended.jck',
'extended.system',
'special.functional',
'special.jck',
'sanity.external',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
configureArgs : [
'openj9' : '--disable-ccache'
],
Expand Down Expand Up @@ -375,7 +399,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 @@ -415,7 +441,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
72 changes: 65 additions & 7 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,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 @@ -302,7 +304,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 @@ -328,7 +332,53 @@ class Config21 {
os : 'aix',
arch : 'ppc64',
additionalNodeLabels: 'hw.arch.ppc64 && sw.os.aix.7_2',
test : 'default',
test : [
nightly: [
"sanity.functional",
"extended.functional",
"sanity.openjdk",
"sanity.perf",
"sanity.jck",
"sanity.system",
"special.system"
],
weekly : [
"sanity.functional",
"extended.functional",
"sanity.openjdk",
"sanity.perf",
"sanity.jck",
"sanity.system",
"special.system",
"dev.external",
"extended.openjdk",
"extended.perf",
"extended.jck",
"extended.system",
"special.functional",
"special.jck",
"sanity.external",
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
release : [
"sanity.functional",
"extended.functional",
"sanity.openjdk",
"sanity.perf",
"sanity.jck",
"sanity.system",
"special.system",
"extended.openjdk",
"extended.perf",
"extended.jck",
"extended.system",
"special.functional",
"special.jck",
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
]
],
cleanWorkspaceAfterBuild: true,
configureArgs : '--disable-ccache',
additionalFileNameTag: 'IBM',
Expand Down Expand Up @@ -370,7 +420,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 @@ -392,7 +444,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 @@ -437,7 +491,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 @@ -459,7 +515,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 e2bfd75

Please sign in to comment.