From 8e216b3dae52229204f52a0ddfe3b5a12558d869 Mon Sep 17 00:00:00 2001 From: Yang Wang Date: Thu, 16 Sep 2021 11:16:48 +1000 Subject: [PATCH] [Test] Hardcode java11 for Pull Request FIPS CI (#77736) This PR changes the Pull Request FIPS CI to use Java 11 instead of Java 8 for consistency with Periodic FIPS CI setup and the support matrix. --- .ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml | 2 +- .ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml index 766b158b59d7a..0eb7525c613e3 100644 --- a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml +++ b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml @@ -31,7 +31,7 @@ properties-file: '.ci/java-versions.properties' properties-content: | JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA - RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + RUNTIME_JAVA_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/openjdk15 - shell: | #!/usr/local/bin/runbld --redirect-stderr diff --git a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml index f22125ba5f51d..dfd7ebaf62bd2 100644 --- a/.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml +++ b/.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml @@ -31,7 +31,7 @@ properties-file: '.ci/java-versions.properties' properties-content: | JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA - RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA + RUNTIME_JAVA_HOME=$HOME/.java/java11 JAVA15_HOME=$HOME/.java/openjdk15 - shell: | #!/usr/local/bin/runbld --redirect-stderr