github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix Java matrix compatibility test jobs

Browse source
This commit is contained in:
Mark Vieira 2023-03-02 14:02:05 -08:00
parent 2ff145b190
commit 0172ead708
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix.yml
View file

@ -18,7 +18,7 @@
- axis: - axis:
type: yaml type: yaml
filename: ".ci/matrix-runtime-javas-fips.yml" filename: ".ci/matrix-runtime-javas-fips.yml"
name: "RUNTIME_JAVA_HOME" name: "ES_RUNTIME_JAVA"
# We shred out these jobs to avoid running out of memory given since we use a ramdisk workspace # We shred out these jobs to avoid running out of memory given since we use a ramdisk workspace
- axis: - axis:
type: user-defined type: user-defined
@ -34,6 +34,7 @@
properties-file: '.ci/java-versions.properties' properties-file: '.ci/java-versions.properties'
properties-content: | properties-content: |
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
JAVA11_HOME=$HOME/.java/java11 JAVA11_HOME=$HOME/.java/java11
JAVA16_HOME=$HOME/.java/openjdk16 JAVA16_HOME=$HOME/.java/openjdk16
- shell: | - shell: |

3
.ci/jobs.t/elastic+elasticsearch+periodic+java-matrix.yml
View file

@ -18,7 +18,7 @@
- axis: - axis:
type: yaml type: yaml
filename: ".ci/matrix-runtime-javas.yml" filename: ".ci/matrix-runtime-javas.yml"
name: "RUNTIME_JAVA_HOME" name: "ES_RUNTIME_JAVA"
# We shred out these jobs to avoid running out of memory given since we use a ramdisk workspace # We shred out these jobs to avoid running out of memory given since we use a ramdisk workspace
- axis: - axis:
type: user-defined type: user-defined
@ -34,6 +34,7 @@
properties-file: '.ci/java-versions.properties' properties-file: '.ci/java-versions.properties'
properties-content: | properties-content: |
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
JAVA11_HOME=$HOME/.java/java11 JAVA11_HOME=$HOME/.java/java11
JAVA16_HOME=$HOME/.java/openjdk16 JAVA16_HOME=$HOME/.java/openjdk16
- shell: | - shell: |

2
.ci/matrix-runtime-javas-fips.yml
View file

@ -1,5 +1,5 @@
# This file is used as part of a matrix build in Jenkins where the # This file is used as part of a matrix build in Jenkins where the
# values below are included as an axis of the matrix. # values below are included as an axis of the matrix.
RUNTIME_JAVA_HOME: ES_RUNTIME_JAVA:
- openjdk17 - openjdk17

2
.ci/matrix-runtime-javas.yml
View file

@ -5,7 +5,7 @@
# which Elasticsearch will be tested. Valid Java versions are 'java' # which Elasticsearch will be tested. Valid Java versions are 'java'
# or 'openjdk' followed by the major release number. # or 'openjdk' followed by the major release number.
RUNTIME_JAVA_HOME: ES_RUNTIME_JAVA:
- graalvm-ce17 - graalvm-ce17
- openjdk17 - openjdk17
- openjdk18 - openjdk18