Skip to content

Commit

Permalink
Add FIPS140-3 weak profile to weekly JDK17/21/23
Browse files Browse the repository at this point in the history
- Add 'fips140_3_OpenJCEPlusFIPS' to following test targets in weekly:
  - extended.functional
  - sanity.openjdk
  - extended.openjdk
  - sanity.jck
  - extended.jck
  - special.jck
- Add the test targets to run on platforms : ppc64_aix, ppc64le_linux,
s390x_linux, x86-64_linux, x86-64_windows

related: https://github.ibm.com/runtimes/automation/issues/106

Signed-off-by: Anna Babu Palathingal <[email protected]>
  • Loading branch information
annaibm committed Dec 3, 2024
1 parent f819e7d commit 0ff79af
Show file tree
Hide file tree
Showing 3 changed files with 201 additions and 3 deletions.
68 changes: 67 additions & 1 deletion pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ class Config17 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -360,7 +364,57 @@ class Config17 {
buildArgs : [
'openj9' : '--ssh --disable-adopt-branch-safety -r [email protected]:runtimes/openj9-openjdk-jdk17 -b ibm_sdk --create-jre-image'
],
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',
'dev.functional',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'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'
]
],
configureArgs : [
'openj9' : '--with-jdk-rc-name="IBM Semeru Runtime"'
],
Expand Down Expand Up @@ -399,6 +453,10 @@ class Config17 {
'special.jck',
'special.openjdk',
'special.system',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -466,6 +524,10 @@ class Config17 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -544,6 +606,10 @@ class Config17 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down
68 changes: 67 additions & 1 deletion pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@ class Config21 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -316,7 +320,57 @@ class Config21 {
arch : 'x64',
additionalNodeLabels: 'hw.arch.x86 && sw.os.windows',
cleanWorkspaceAfterBuild: true,
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',
'dev.functional',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'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'
]
],
configureArgs : '--with-jdk-rc-name="IBM Semeru Runtime"',
additionalFileNameTag: 'IBM',
buildArgs : '--ssh --disable-adopt-branch-safety -r [email protected]:runtimes/openj9-openjdk-jdk21 -b ibm_sdk --create-jre-image'
Expand Down Expand Up @@ -352,6 +406,10 @@ class Config21 {
'special.jck',
'special.openjdk',
'special.system',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -418,6 +476,10 @@ class Config21 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -496,6 +558,10 @@ class Config21 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down
68 changes: 67 additions & 1 deletion pipelines/jobs/configurations/jdk23u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ class Config23 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -144,7 +148,57 @@ class Config23 {
temurin : 'win2022&&vs2022'
],
cleanWorkspaceAfterBuild: true,
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',
'dev.functional',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'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'
]
],
configureArgs : [
openj9 : '--with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-jdk-rc-name="IBM Semeru Runtime"',
temurin : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'"
Expand Down Expand Up @@ -188,6 +242,10 @@ class Config23 {
'special.jck',
'special.openjdk',
'special.system',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -260,6 +318,10 @@ class Config23 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down Expand Up @@ -341,6 +403,10 @@ class Config23 {
'special.jck.fips140_2',
'sanity.openjdk.fips140_2',
'extended.openjdk.fips140_2',
'extended.functional.fips140_3_OpenJCEPlusFIPS',
'sanity.jck.fips140_3_OpenJCEPlusFIPS',
'extended.jck.fips140_3_OpenJCEPlusFIPS',
'special.jck.fips140_3_OpenJCEPlusFIPS',
'sanity.openjdk.fips140_3_OpenJCEPlusFIPS',
'extended.openjdk.fips140_3_OpenJCEPlusFIPS'
],
Expand Down

0 comments on commit 0ff79af

Please sign in to comment.