From 2f6e1efa1c1bd435a693267da1cf5897850dea9c Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Tue, 3 Sep 2024 11:30:54 -0400 Subject: [PATCH] Reduce FIPS functional testing - remove FIPS sanity.functional testing - limit FIPS functional testing on OpenJcePlusTests and security only related: internal/backlog/issues/1494 Signed-off-by: Lan Xia --- .../common/openjdk_build_pipeline.groovy | 21 +++++++++++++------ .../jdk11u_pipeline_config.groovy | 6 ------ .../jdk17u_pipeline_config.groovy | 6 ------ .../jdk21u_pipeline_config.groovy | 6 ------ .../jdk23_pipeline_config.groovy | 6 ------ .../jdk8u_pipeline_config.groovy | 6 ------ 6 files changed, 15 insertions(+), 36 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index 06e943325..18c56a7b8 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -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')) { @@ -500,18 +502,22 @@ class Build { def VENDOR_TEST_BRANCHES = '' def VENDOR_TEST_DIRS = '' if ("${testType}".contains('functional')) { - VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/test.git' - VENDOR_TEST_BRANCHES = aqaBranch - VENDOR_TEST_DIRS = 'functional' + if (fipsTestBuildSuffix && !"${fipsTestBuildSuffix}".contains("fips")) { + VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/test.git' + VENDOR_TEST_BRANCHES = aqaBranch + VENDOR_TEST_DIRS = 'functional' + } customizedSdkUrl += " " + testimageUrl } else if ("${testType}".contains('jck')) { VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/jck.git' VENDOR_TEST_BRANCHES = "main" VENDOR_TEST_DIRS = 'jck' } else if ("${testType}".contains('special.openjdk')) { - VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/osb-tests.git' - VENDOR_TEST_BRANCHES = "ibm_tlda" - VENDOR_TEST_DIRS = 'openjdk' + if (fipsTestBuildSuffix && !"${fipsTestBuildSuffix}".contains("fips")) { + VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/osb-tests.git' + VENDOR_TEST_BRANCHES = "ibm_tlda" + VENDOR_TEST_DIRS = 'openjdk' + } } def DOCKER_REGISTRY_URL = '' @@ -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, diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index f996166d6..a3ed2c7ed 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index ff5f4021e..8f323c140 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index 6309c9b1c..6ab4d3a4b 100644 --- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', diff --git a/pipelines/jobs/configurations/jdk23_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23_pipeline_config.groovy index ddb0983dd..b70d5e291 100644 --- a/pipelines/jobs/configurations/jdk23_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk23_pipeline_config.groovy @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy index fbb0223a6..25609b813 100644 --- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', @@ -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',