Prevent expanding sanity for Valhalla testing

The sanity test target is expanded to sanity.functional,sanity.openjdk. However, for Valhalla-specific testing, such as xlinuxval, the only test targets that are supported are sanity.functional and extended.functional. The sanity.openjdk is supported for the 'standard' Valhalla platform targets, such as xlinuxvalst. This change prevents the expansion of sanity from including sanity.openjdk for Valhalla-specific testing. Signed-off-by: Henry Zongaro <[email protected]>
eclipse-openj9 · Oct 8, 2024 · 384fcb4 · 384fcb4
1 parent 8357d17
commit 384fcb4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/buildenv/jenkins/common/variables-functions.groovy b/buildenv/jenkins/common/variables-functions.groovy
@@ -710,11 +710,16 @@ def set_test_targets() {
     // Map of Maps
     TESTS = [:]
     if (TESTS_TARGETS != 'none') {
+        hasValhallaSpec = SPECS.any{SPEC, target -> SPEC.contains("valhalla")}
+
         for (target in TESTS_TARGETS.replaceAll("\\s","").toLowerCase().tokenize(',')) {
             switch (target) {
                 case ["sanity"]:
                     TESTS["${target}.functional"] = [:]
-                    TESTS["${target}.openjdk"] = [:]
+                    // Valhalla-specific testing does not yet support sanity.openjdk
+                    // Only expand sanity to sanity.functional if any SPEC is valhalla
+                    if (!hasValhallaSpec)
+                        TESTS["${target}.openjdk"] = [:]
                     break
                 case ["extended"]:
                     TESTS["${target}.functional"] = [:]