-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix periodic Java matrix jobs to use correct JVM
- Loading branch information
1 parent
82490eb
commit 2b211db
Showing
2 changed files
with
62 additions
and
16 deletions.
There are no files selected for viewing
39 changes: 31 additions & 8 deletions
39
.ci/jobs.t/elastic+elasticsearch+periodic+java-fips-matrix.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,32 @@ | ||
| --- | ||
| jjbb-template: matrix-gradle-unix.yml | ||
| vars: | ||
| - job-name: elastic+elasticsearch+%BRANCH%+periodic+java-fips-matrix | ||
| - job-display-name: "elastic / elasticsearch # %BRANCH% - java fips compatibility matrix" | ||
| - job-description: "Testing of the Elasticsearch %BRANCH% branch java FIPS compatibility matrix.\n" | ||
| - matrix-yaml-file: ".ci/matrix-runtime-javas-fips.yml" | ||
| - matrix-variable: ES_RUNTIME_JAVA | ||
| - gradle-args: "-Dbwc.checkout.align=true -Dtests.fips.enabled=true check" | ||
| - job: | ||
| name: "elastic+elasticsearch+%BRANCH%+periodic+java-fips-matrix" | ||
| display-name: "elastic / elasticsearch # %BRANCH% - java fips compatibility matrix" | ||
| description: "Testing of the Elasticsearch %BRANCH% branch java FIPS compatibility matrix.\n" | ||
| project-type: matrix | ||
| child-workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+java-fips-matrix | ||
| node: master | ||
| scm: | ||
| - git: | ||
| wipe-workspace: false | ||
| axes: | ||
| - axis: | ||
| type: slave | ||
| name: nodes | ||
| values: | ||
| - "general-purpose" | ||
| - axis: | ||
| type: yaml | ||
| filename: ".ci/matrix-runtime-javas-fips.yml" | ||
| name: "ES_RUNTIME_JAVA" | ||
| builders: | ||
| - inject: | ||
| properties-file: '.ci/java-versions.properties' | ||
| properties-content: | | ||
| JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA | ||
| JAVA11_HOME=$HOME/.java/java11 | ||
| JAVA16_HOME=$HOME/.java/openjdk16 | ||
| RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA | ||
| - shell: | | ||
| #!/usr/local/bin/runbld --redirect-stderr | ||
| $WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.fips.enabled=true check |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,32 @@ | ||
| --- | ||
| jjbb-template: matrix-gradle-unix.yml | ||
| vars: | ||
| - job-name: elastic+elasticsearch+%BRANCH%+periodic+java-matrix | ||
| - job-display-name: "elastic / elasticsearch # %BRANCH% - java compatibility matrix" | ||
| - job-description: "Testing of the Elasticsearch %BRANCH% branch java compatibility matrix.\n" | ||
| - matrix-yaml-file: ".ci/matrix-runtime-javas.yml" | ||
| - matrix-variable: ES_RUNTIME_JAVA | ||
| - gradle-args: "-Dbwc.checkout.align=true check" | ||
| - job: | ||
| name: "elastic+elasticsearch+%BRANCH%+periodic+java-matrix" | ||
| display-name: "elastic / elasticsearch # %BRANCH% - java compatibility matrix" | ||
| description: "Testing of the Elasticsearch %BRANCH% branch java compatibility matrix.\n" | ||
| project-type: matrix | ||
| child-workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+java-matrix | ||
| node: master | ||
| scm: | ||
| - git: | ||
| wipe-workspace: false | ||
| axes: | ||
| - axis: | ||
| type: slave | ||
| name: nodes | ||
| values: | ||
| - "general-purpose" | ||
| - axis: | ||
| type: yaml | ||
| filename: ".ci/matrix-runtime-javas.yml" | ||
| name: "ES_RUNTIME_JAVA" | ||
| builders: | ||
| - inject: | ||
| properties-file: '.ci/java-versions.properties' | ||
| properties-content: | | ||
| JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA | ||
| JAVA11_HOME=$HOME/.java/java11 | ||
| JAVA16_HOME=$HOME/.java/openjdk16 | ||
| RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA | ||
| - shell: | | ||
| #!/usr/local/bin/runbld --redirect-stderr | ||
| $WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true check |