[ci] Add Java 21 option for multi JDK CI pipeline (#15691)

Now that CI VM images are pre-provisioned with various flavors of Java 21, we add the option for the corresponding CI job. Adoptium 17 remains the default pre-selected option. Relates elastic/ci-agent-images#463
elastic · Dec 18, 2023 · f062fef · f062fef
1 parent 6b22cc8
commit f062fef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/.buildkite/linux_jdk_matrix_pipeline.yml b/.buildkite/linux_jdk_matrix_pipeline.yml
@@ -49,14 +49,20 @@ steps:
         multiple: true
         default: "${DEFAULT_MATRIX_JDK}"
         options:
+          - label: "Adoptium JDK 21 (Eclipse Temurin)"
+            value: "adoptiumjdk_21"
           - label: "Adoptium JDK 17 (Eclipse Temurin)"
             value: "adoptiumjdk_17"
           - label: "Adoptium JDK 11 (Eclipse Temurin)"
             value: "adoptiumjdk_11"
+          - label: "OpenJDK 21"
+            value: "openjdk_21"
           - label: "OpenJDK 17"
             value: "openjdk_17"
           - label: "OpenJDK 11"
             value: "openjdk_11"
+          - label: "Zulu 21"
+            value: "zulu_21"
           - label: "Zulu 17"
             value: "zulu_17"
           - label: "Zulu 11"

diff --git a/.buildkite/windows_jdk_matrix_pipeline.yml b/.buildkite/windows_jdk_matrix_pipeline.yml
@@ -29,14 +29,20 @@ steps:
         multiple: true
         default: "${DEFAULT_MATRIX_JDK}"
         options:
+          - label: "Adoptium JDK 21 (Eclipse Temurin)"
+            value: "adoptiumjdk_21"
           - label: "Adoptium JDK 17 (Eclipse Temurin)"
             value: "adoptiumjdk_17"
           - label: "Adoptium JDK 11 (Eclipse Temurin)"
             value: "adoptiumjdk_11"
+          - label: "OpenJDK 21"
+            value: "openjdk_21"
           - label: "OpenJDK 17"
             value: "openjdk_17"
           - label: "OpenJDK 11"
             value: "openjdk_11"
+          - label: "Zulu 21"
+            value: "zulu_21"
           - label: "Zulu 17"
             value: "zulu_17"
           - label: "Zulu 11"