Skip to content

Commit

Permalink
Java versions for ci (#29320)
Browse files Browse the repository at this point in the history
* Add test matrix axis files for periodic java testing

* Add properties file defining java versions to use

* We have no openjdk8

* Remove openjdk

Oracle Java and OpenJDK basically only differ in license, so we don't
need to test both.
  • Loading branch information
leathekd committed Apr 2, 2018
1 parent 3be960d commit 1172b3b
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .ci/java-versions.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file is used with all of the non-matrix tests in Jenkins.

# This .properties file defines the versions of Java with which to
# build and test Elasticsearch for this branch. Valid Java versions
# are 'java' or 'openjdk' followed by the major release number.

ES_BUILD_JAVA=java10
ES_RUNTIME_JAVA=java8
9 changes: 9 additions & 0 deletions .ci/matrix-build-javas.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# 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 with
# which Elasticsearch will be built. Valid Java versions are 'java'
# or 'openjdk' followed by the major release number.

ES_BUILD_JAVA:
- java10
14 changes: 14 additions & 0 deletions .ci/matrix-java-exclusions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file is used as part of a matrix build in Jenkins where the
# values below are excluded from the test matrix.

# The yaml mapping below represents a single intersection on the build
# matrix where a test *should not* be run. The value of the exclude
# key is a list of maps.

# In this example all of the combinations defined in the matrix will
# run except for the test that builds with java10 and runs with java8.
# exclude:
# - ES_BUILD_JAVA: java10
# ES_RUNTIME_JAVA: java8

exclude:
10 changes: 10 additions & 0 deletions .ci/matrix-runtime-javas.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# 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.

ES_RUNTIME_JAVA:
- java8
- java10

0 comments on commit 1172b3b

Please sign in to comment.