Skip to content

Commit 083145f

Browse files
authored
Merge branch '8.19' into backport/8.19/pr-135096
2 parents 3ee900f + 48732c6 commit 083145f

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

.buildkite/pipelines/periodic.template.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ steps:
4545
setup:
4646
ES_RUNTIME_JAVA:
4747
- openjdk17
48+
- adoptopenjdk17
4849
GRADLE_TASK:
4950
- checkPart1
5051
- checkPart2
@@ -68,6 +69,7 @@ steps:
6869
setup:
6970
ES_RUNTIME_JAVA:
7071
- openjdk17
72+
- adoptopenjdk17
7173
BWC_VERSION: $BWC_LIST
7274
agents:
7375
provider: gcp
@@ -87,6 +89,7 @@ steps:
8789
ES_RUNTIME_JAVA:
8890
- graalvm-ce17
8991
- openjdk17
92+
- adoptopenjdk17
9093
- openjdk21
9194
- openjdk22
9295
- openjdk23
@@ -114,6 +117,7 @@ steps:
114117
ES_RUNTIME_JAVA:
115118
- graalvm-ce17
116119
- openjdk17
120+
- adoptopenjdk17
117121
- openjdk21
118122
- openjdk22
119123
- openjdk23

.buildkite/pipelines/periodic.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@ steps:
768768
setup:
769769
ES_RUNTIME_JAVA:
770770
- openjdk17
771+
- adoptopenjdk17
771772
GRADLE_TASK:
772773
- checkPart1
773774
- checkPart2
@@ -791,6 +792,7 @@ steps:
791792
setup:
792793
ES_RUNTIME_JAVA:
793794
- openjdk17
795+
- adoptopenjdk17
794796
BWC_VERSION: ["7.17.30", "8.18.8", "8.19.5"]
795797
agents:
796798
provider: gcp
@@ -810,6 +812,7 @@ steps:
810812
ES_RUNTIME_JAVA:
811813
- graalvm-ce17
812814
- openjdk17
815+
- adoptopenjdk17
813816
- openjdk21
814817
- openjdk22
815818
- openjdk23
@@ -837,6 +840,7 @@ steps:
837840
ES_RUNTIME_JAVA:
838841
- graalvm-ce17
839842
- openjdk17
843+
- adoptopenjdk17
840844
- openjdk21
841845
- openjdk22
842846
- openjdk23

.ci/matrix-runtime-javas-fips.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33

44
ES_RUNTIME_JAVA:
55
- openjdk17
6+
- adoptopenjdk17

.ci/matrix-runtime-javas.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33

44
# This axis of the build matrix represents the versions of Java on
55
# which Elasticsearch will be tested. Valid Java versions are 'java'
6-
# or 'openjdk' followed by the major release number.
6+
# 'openjdk' or `adoptopenjdk` followed by the major release number.
77

88
ES_RUNTIME_JAVA:
99
- graalvm-ce17
10+
- adoptopenjdk17
1011
- openjdk17
1112
- openjdk18
1213
- openjdk19

0 commit comments

Comments
 (0)