diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index cdf1fc3f3..67d1b7df2 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -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 @@ -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 = '' diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 7204938d2..285f220a9 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -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', @@ -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 : [ @@ -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', @@ -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', @@ -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', @@ -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: [ @@ -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', @@ -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: [ diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index b44e39077..d843edabc 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -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: [ @@ -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' ], @@ -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: [ @@ -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: [ diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index 316716f60..9ba45c3e1 100644 --- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy @@ -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", @@ -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, @@ -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', @@ -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", @@ -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, @@ -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', @@ -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, diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy index bbd62dfd1..1db1d8321 100644 --- a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy @@ -22,7 +22,67 @@ class Config22 { dockerFile: [ openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile' ], - 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.functional.fips140_2", + "extended.functional.fips140_2", + "sanity.jck.fips140_2", + "extended.jck.fips140_2", + "special.jck.fips140_2", + "sanity.openjdk.fips140_2", + "extended.openjdk.fips140_2", + '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.functional.fips140_2", + "extended.functional.fips140_2", + "sanity.jck.fips140_2", + "extended.jck.fips140_2", + "special.jck.fips140_2", + "sanity.openjdk.fips140_2", + "extended.openjdk.fips140_2", + 'sanity.openjdk.fips140_3_OpenJCEPlusFIPS', + 'extended.openjdk.fips140_3_OpenJCEPlusFIPS' + ] + ], additionalTestLabels: [ openj9 : '!(centos6||rhel6)' ], @@ -75,7 +135,53 @@ class Config22 { temurin: 'xlc16&&aix720', openj9: 'xlc16&&aix715' ], - 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' + ] + ], additionalTestLabels: [ temurin : 'sw.os.aix.7_2' ], @@ -89,7 +195,67 @@ class Config22 { os : 'linux', arch : 's390x', dockerImage : 'rhel7_build_image', - 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.functional.fips140_2", + "extended.functional.fips140_2", + "sanity.jck.fips140_2", + "extended.jck.fips140_2", + "special.jck.fips140_2", + "sanity.openjdk.fips140_2", + "extended.openjdk.fips140_2", + '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.functional.fips140_2", + "extended.functional.fips140_2", + "sanity.jck.fips140_2", + "extended.jck.fips140_2", + "special.jck.fips140_2", + "sanity.openjdk.fips140_2", + "extended.openjdk.fips140_2", + 'sanity.openjdk.fips140_3_OpenJCEPlusFIPS', + 'extended.openjdk.fips140_3_OpenJCEPlusFIPS' + ] + ], buildArgs : [ 'temurin' : '--create-jre-image --create-sbom' ] @@ -99,7 +265,67 @@ class Config22 { os : 'linux', arch : 'ppc64le', dockerImage : 'adoptopenjdk/centos7_build_image', - 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.functional.fips140_2', + 'extended.functional.fips140_2', + 'sanity.jck.fips140_2', + 'extended.jck.fips140_2', + 'special.jck.fips140_2', + 'sanity.openjdk.fips140_2', + 'extended.openjdk.fips140_2', + '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.functional.fips140_2', + 'extended.functional.fips140_2', + 'sanity.jck.fips140_2', + 'extended.jck.fips140_2', + 'special.jck.fips140_2', + 'sanity.openjdk.fips140_2', + 'extended.openjdk.fips140_2', + 'sanity.openjdk.fips140_3_OpenJCEPlusFIPS', + 'extended.openjdk.fips140_3_OpenJCEPlusFIPS' + ] + ], configureArgs : [ 'openj9' : '--enable-dtrace' ],