Fix periodic Java matrix jobs to use correct JVM

Author: mark-vieira

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

@@ -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

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

@@ -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