From dac8636fac0b4feb62d50067370a6a332e7d5b8b Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Wed, 27 Oct 2021 10:05:34 -0700 Subject: [PATCH] Add missing JAVA11_HOME to CI jobs --- .../elastic+elasticsearch+multijob+platform-support-arm.yml | 1 + .../elastic+elasticsearch+multijob+platform-support-darwin.yml | 1 + .../elastic+elasticsearch+multijob+platform-support-unix.yml | 1 + .../elastic+elasticsearch+multijob+platform-support-windows.yml | 1 + .ci/jobs.t/elastic+elasticsearch+periodic+ear.yml | 1 + .ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml | 1 + .ci/templates.t/generic-gradle-unix.yml | 1 + .ci/templates.t/matrix-gradle-unix.yml | 1 + 8 files changed, 8 insertions(+) diff --git a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml index 9a120435dcac..20954708ffe9 100644 --- a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml +++ b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml @@ -23,6 +23,7 @@ COMPOSE_HTTP_TIMEOUT=120 JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + JAVA11_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/jdk15 - shell: | #!/usr/local/bin/runbld --redirect-stderr diff --git a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-darwin.yml b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-darwin.yml index b25a245f8f4d..a702f5ba6db2 100644 --- a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-darwin.yml +++ b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-darwin.yml @@ -10,6 +10,7 @@ properties-content: | JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + JAVA11_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/openjdk15 - shell: | #!/usr/local/bin/runbld --redirect-stderr diff --git a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-unix.yml b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-unix.yml index 0fe2ae5fa1d3..069688c80a5b 100644 --- a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-unix.yml +++ b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-unix.yml @@ -32,6 +32,7 @@ properties-content: | JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + JAVA11_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/openjdk15 - shell: | #!/usr/local/bin/runbld --redirect-stderr diff --git a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-windows.yml b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-windows.yml index adeeb6a8841e..b8b3a3b770ec 100644 --- a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-windows.yml +++ b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-windows.yml @@ -34,6 +34,7 @@ properties-content: | JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA + JAVA11_HOME=$USERPROFILE\\.java\\java11 JAVA15_HOME=$USERPROFILE\\.java\\openjdk15 - batch: | del /f /s /q %USERPROFILE%\.gradle\init.d\*.* diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+ear.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+ear.yml index 0d7ea88c0b60..a54328175588 100644 --- a/.ci/jobs.t/elastic+elasticsearch+periodic+ear.yml +++ b/.ci/jobs.t/elastic+elasticsearch+periodic+ear.yml @@ -11,6 +11,7 @@ properties-content: | JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + JAVA11_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/openjdk15 - shell: | #!/bin/bash diff --git a/.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml b/.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml index cb4e9b8884ef..64302fdecd70 100644 --- a/.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml +++ b/.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml @@ -11,6 +11,7 @@ properties-content: | JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + JAVA11_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/openjdk15 - shell: | #!/usr/local/bin/runbld --redirect-stderr diff --git a/.ci/templates.t/generic-gradle-unix.yml b/.ci/templates.t/generic-gradle-unix.yml index a5adc34f9320..fe98734a882b 100644 --- a/.ci/templates.t/generic-gradle-unix.yml +++ b/.ci/templates.t/generic-gradle-unix.yml @@ -10,6 +10,7 @@ properties-content: | JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + JAVA11_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/openjdk15 - shell: | #!/usr/local/bin/runbld --redirect-stderr diff --git a/.ci/templates.t/matrix-gradle-unix.yml b/.ci/templates.t/matrix-gradle-unix.yml index 4952a31674ec..228a6b89f552 100644 --- a/.ci/templates.t/matrix-gradle-unix.yml +++ b/.ci/templates.t/matrix-gradle-unix.yml @@ -25,6 +25,7 @@ properties-content: | JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + JAVA11_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/openjdk15 - shell: | #!/usr/local/bin/runbld --redirect-stderr