Browse Source

Fix FIPS PR builds across branches with different Java requirements

Mark Vieira 4 years ago
parent
commit
cb306d6052

+ 8 - 0
.ci/java-versions-fips.properties

@@ -0,0 +1,8 @@
+# This file is used when building pull requests with FIPS enabled
+
+# 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=openjdk16
+ES_RUNTIME_JAVA=openjdk17

+ 2 - 2
.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml

@@ -28,10 +28,10 @@
             - '>test-mute'
     builders:
       - inject:
-          properties-file: '.ci/java-versions.properties'
+          properties-file: '.ci/java-versions-fips.properties'
           properties-content: |
             JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
-            RUNTIME_JAVA_HOME=$HOME/.java/java11
+            RUNTIME_JAVA_HOME=$HOME/$ES_RUNTIME_JAVA
             JAVA15_HOME=$HOME/.java/openjdk15
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr

+ 2 - 2
.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml

@@ -28,10 +28,10 @@
             - '>test-mute'
     builders:
       - inject:
-          properties-file: '.ci/java-versions.properties'
+          properties-file: '.ci/java-versions-fips.properties'
           properties-content: |
             JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
-            RUNTIME_JAVA_HOME=$HOME/.java/java11
+            RUNTIME_JAVA_HOME=$HOME/$ES_RUNTIME_JAVA
             JAVA15_HOME=$HOME/.java/openjdk15
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr