Temporarily disable FIPS140-2 extended.functional (adoptium#5722)

resovles: automation/issues/96 Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
LongyuZhang · Oct 28, 2024 · 21799ed · 21799ed
1 parent 6761a03
commit 21799ed
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/buildenv/jenkins/aqaTestPipeline.groovy b/buildenv/jenkins/aqaTestPipeline.groovy
@@ -31,6 +31,9 @@ currentBuild.setDisplayName(PIPELINE_DISPLAY_NAME)
 
 defaultTestTargets = "sanity.functional,extended.functional,special.functional,sanity.openjdk,extended.openjdk,special.openjdk,sanity.system,extended.system,special.system,sanity.perf,extended.perf,sanity.jck,extended.jck,special.jck"
 defaultFipsTestTargets = "extended.functional,sanity.openjdk,extended.openjdk,sanity.jck,extended.jck,special.jck"
+// There is no applicable tests for FIPS140-2 extended.functional atm, so temporarily disable FIPS140-2 extended.functional
+defaultFips140_2TestTargets = defaultFipsTestTargets.replace("extended.functional,", "")
+
 if (params.BUILD_TYPE == "nightly") {
     defaultTestTargets = "sanity.functional,extended.functional,sanity.openjdk,extended.openjdk,sanity.perf,sanity.jck,sanity.system,special.system"
 }
@@ -87,8 +90,9 @@ if (fail) {
 
 def generateJobs(jobJdkVersion, jobTestFlag, jobPlatforms, jobTargets, jobParallel) {
     if (jobTargets instanceof String) {
-        if (jobTargets.contains("defaultFipsTestTargets")) {
+        if (jobTargets.contains("defaultFips")) {
             jobTargets = jobTargets.replace("defaultFipsTestTargets","${defaultFipsTestTargets}")
+            jobTargets = jobTargets.replace("defaultFips140_2TestTargets","${defaultFips140_2TestTargets}")
         } else {
             jobTargets = jobTargets.replace("defaultTestTargets","${defaultTestTargets}")
         }

diff --git a/buildenv/jenkins/config/openj9/release/default.json b/buildenv/jenkins/config/openj9/release/default.json
@@ -15,9 +15,9 @@
     {
         "TEST_FLAG" : "FIPS140_2",
         "PLATFORM_TARGETS" : [
-            { "ppc64le_linux" : "defaultFipsTestTargets" },
-            { "s390x_linux" : "defaultFipsTestTargets" },
-            { "x86-64_linux" : "defaultFipsTestTargets" }
+            { "ppc64le_linux" : "defaultFips140_2TestTargets" },
+            { "s390x_linux" : "defaultFips140_2TestTargets" },
+            { "x86-64_linux" : "defaultFips140_2TestTargets" }
         ]
     },
     {

diff --git a/buildenv/jenkins/config/openj9/release/jdk8.json b/buildenv/jenkins/config/openj9/release/jdk8.json
@@ -15,9 +15,9 @@
     {
         "TEST_FLAG" : "FIPS140_2",
         "PLATFORM_TARGETS" : [
-            { "ppc64le_linux" : "defaultFipsTestTargets" },
-            { "s390x_linux" : "defaultFipsTestTargets" },
-            { "x86-64_linux" : "defaultFipsTestTargets" }
+            { "ppc64le_linux" : "defaultFips140_2TestTargets" },
+            { "s390x_linux" : "defaultFips140_2TestTargets" },
+            { "x86-64_linux" : "defaultFips140_2TestTargets" }
         ]
     }
 ]
diff --git a/buildenv/jenkins/config/openj9/weekly/default.json b/buildenv/jenkins/config/openj9/weekly/default.json
@@ -15,9 +15,9 @@
     {
         "TEST_FLAG" : "FIPS140_2", 
         "PLATFORM_TARGETS" : [
-            { "ppc64le_linux" : "defaultFipsTestTargets" },
-            { "s390x_linux" : "defaultFipsTestTargets" },
-            { "x86-64_linux" : "defaultFipsTestTargets" }
+            { "ppc64le_linux" : "defaultFips140_2TestTargets" },
+            { "s390x_linux" : "defaultFips140_2TestTargets" },
+            { "x86-64_linux" : "defaultFips140_2TestTargets" }
         ]
     },
     {

diff --git a/buildenv/jenkins/config/openj9/weekly/jdk8.json b/buildenv/jenkins/config/openj9/weekly/jdk8.json
@@ -15,9 +15,9 @@
     {
         "TEST_FLAG" : "FIPS140_2",
         "PLATFORM_TARGETS" : [
-            { "ppc64le_linux" : "defaultFipsTestTargets" },
-            { "s390x_linux" : "defaultFipsTestTargets" },
-            { "x86-64_linux" : "defaultFipsTestTargets" }
+            { "ppc64le_linux" : "defaultFips140_2TestTargets" },
+            { "s390x_linux" : "defaultFips140_2TestTargets" },
+            { "x86-64_linux" : "defaultFips140_2TestTargets" }
         ]
     }
 ]