Merge pull request #2638 from AdamBrousseau/remove_9_win_special_case…

…_testing Remove obsolete test paths for non-Adopt test builds
eclipse-openj9 · Aug 29, 2018 · e3745a6 · e3745a6
2 parents e9ee8c1 + 15ba064
commit e3745a6
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/buildenv/jenkins/common/pipeline-functions b/buildenv/jenkins/common/pipeline-functions
@@ -238,18 +238,10 @@ def workflow(SDK_VERSION, SPEC, SHAS, OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO,
                 //  - there is no need to enable JDK9 as it is not supported anymore (https://github.com/eclipse/openj9/issues/2020)
                 //  - OpenJ9 test pipelines will be completely removed once we switch to use AdoptOpenJDK test pipelines
                 case "_sanity":
-                    if (SPEC.contains("win") || SDK_VERSION == "9") {
-                        TARGET_NAMES.add("Sanity")
-                    } else {
-                        TARGET_NAMES.addAll(["sanity.functional", "sanity.system"])
-                    }
+                    TARGET_NAMES.addAll(["sanity.functional", "sanity.system"])
                     break
                 case "_extended":
-                    if (SPEC.contains("win") || SDK_VERSION == "9") {
-                        TARGET_NAMES.add("Extended")
-                    } else {
-                        TARGET_NAMES.addAll(["extended.functional", "extended.system"])
-                    }
+                    TARGET_NAMES.addAll(["extended.functional", "extended.system"])
                     break
                 default:
                     TARGET_NAMES.add(target.trim())