From 9ff1360cb61dada15616464ffa05f6fc5d2c44b3 Mon Sep 17 00:00:00 2001 From: David Leatherman Date: Fri, 30 Mar 2018 14:35:25 -0400 Subject: [PATCH 1/4] Add test matrix axis files for periodic java testing --- .ci/matrix-build-javas.yml | 9 +++++++++ .ci/matrix-java-exclusions.yml | 14 ++++++++++++++ .ci/matrix-runtime-javas.yml | 12 ++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 .ci/matrix-build-javas.yml create mode 100644 .ci/matrix-java-exclusions.yml create mode 100644 .ci/matrix-runtime-javas.yml diff --git a/.ci/matrix-build-javas.yml b/.ci/matrix-build-javas.yml new file mode 100644 index 0000000000000..17aa4b0bf222a --- /dev/null +++ b/.ci/matrix-build-javas.yml @@ -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 diff --git a/.ci/matrix-java-exclusions.yml b/.ci/matrix-java-exclusions.yml new file mode 100644 index 0000000000000..e2adf9f0955db --- /dev/null +++ b/.ci/matrix-java-exclusions.yml @@ -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: diff --git a/.ci/matrix-runtime-javas.yml b/.ci/matrix-runtime-javas.yml new file mode 100644 index 0000000000000..9a4ebe0cd68f7 --- /dev/null +++ b/.ci/matrix-runtime-javas.yml @@ -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. + +ES_RUNTIME_JAVA: + - java8 + - java10 + - openjdk8 + - openjdk10 From 3b4a549a2147ff97d6926ecb4e21ca21e9adb745 Mon Sep 17 00:00:00 2001 From: David Leatherman Date: Fri, 30 Mar 2018 14:36:09 -0400 Subject: [PATCH 2/4] Add properties file defining java versions to use --- .ci/java-versions.properties | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .ci/java-versions.properties diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties new file mode 100644 index 0000000000000..a0713ce128e6f --- /dev/null +++ b/.ci/java-versions.properties @@ -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 From 31dd8dcc911a21ad68b3731350f1254cc0107492 Mon Sep 17 00:00:00 2001 From: David Leatherman Date: Fri, 30 Mar 2018 16:01:48 -0400 Subject: [PATCH 3/4] We have no openjdk8 --- .ci/matrix-runtime-javas.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/matrix-runtime-javas.yml b/.ci/matrix-runtime-javas.yml index 9a4ebe0cd68f7..8f57edd9dc1da 100644 --- a/.ci/matrix-runtime-javas.yml +++ b/.ci/matrix-runtime-javas.yml @@ -8,5 +8,4 @@ ES_RUNTIME_JAVA: - java8 - java10 - - openjdk8 - openjdk10 From db16f842791174648d55b5ddcea8e283e4c3e0fe Mon Sep 17 00:00:00 2001 From: David Leatherman Date: Mon, 2 Apr 2018 10:15:49 -0400 Subject: [PATCH 4/4] Remove openjdk Oracle Java and OpenJDK basically only differ in license, so we don't need to test both. --- .ci/matrix-runtime-javas.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/matrix-runtime-javas.yml b/.ci/matrix-runtime-javas.yml index 8f57edd9dc1da..72282ca805afd 100644 --- a/.ci/matrix-runtime-javas.yml +++ b/.ci/matrix-runtime-javas.yml @@ -8,4 +8,3 @@ ES_RUNTIME_JAVA: - java8 - java10 - - openjdk10