Skip to content

Commit

Permalink
Remove obsolete test paths for non-Adopt test builds
Browse files Browse the repository at this point in the history
- We no longer run JDK9 so we can remove this case.
  If we need to run 9 at some point in the future, test
  jobs will need to be created using the Adopt test scripts.
- Windows is now supported using the Adopt test scripts

[skip ci]
Issue eclipse-openj9#1450 eclipse-openj9#1779 adoptium/aqa-tests#506

Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
  • Loading branch information
AdamBrousseau committed Aug 16, 2018
1 parent e01440b commit 15ba064
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions buildenv/jenkins/common/pipeline-functions
Original file line number Diff line number Diff line change
Expand Up @@ -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
// temporary for OMR acceptance. This should be removed once we completely switch to AdoptOpenJDK test Jenkins file
case "_sanity.tmp":
Expand Down

0 comments on commit 15ba064

Please sign in to comment.