[7.x] Backport JDK Unit Testing Matrices (#11839)

* Defined the versions of JDK to use in test build separated by OS (#11768)

* Added JDK 11 and 14 to Unix testing matrix (#11801)

- OpenJDK14 AdoptOpenJDK11 Zulu11
- OpenJDK14 AdoptOpenJDK14 Zulu14

Close #11801

Co-authored-by: Andrea Selva <andrea.selva@elastic.co>
This commit is contained in:
Rob Bavey 2020-04-28 09:31:57 -04:00 committed by GitHub
parent 51431af405
commit ba78c05e0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 0 deletions

View file

@ -0,0 +1,18 @@
# This file is used as part of a matrix build in Jenkins where the
# values below are included as an axis of the matrix.
# This axis of the build matrix represents the versions of Java on
# which Elasticsearch will be tested. Valid Java versions are 'java'
# or 'openjdk' followed by the major release number.
LS_RUNTIME_JAVA:
# - java8
# - zulu8
# - adoptopenjdk8
# - java11
- openjdk11
- adoptopenjdk11
- zulu11
- openjdk14
- adoptopenjdk14
- zulu14

View file

@ -0,0 +1,12 @@
# This file is used as part of a matrix build in Jenkins where the
# values below are included as an axis of the matrix.
# This axis of the build matrix represents the versions of Java on
# which Elasticsearch will be tested. Valid Java versions are 'java'
# or 'openjdk' followed by the major release number.
LS_RUNTIME_JAVA:
# - zulu8
# - adoptopenjdk8
- zulu11
# - adoptopenjdk11

View file

@ -40,6 +40,9 @@ echo Using drive !use_drive! for %WORKSPACE%
!use_drive!
echo Running core tests..
if "%BUILD_JAVA_HOME%" == "" (
GRADLE_OPTS="%GRADLE_OPTS% -Dorg.gradle.java.home=%BUILD_JAVA_HOME%"
)
call .\gradlew.bat test --console=plain --no-daemon --info
if errorlevel 1 (