Skip to content

Commit 52d77dd

Browse files
authored
Run java periodic matrix on ubuntu24 (elastic#135671)
- Use adoptopenjdk17 instead of openjdk17
1 parent c934908 commit 52d77dd

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

.buildkite/pipelines/periodic.template.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ steps:
4444
matrix:
4545
setup:
4646
ES_RUNTIME_JAVA:
47-
- openjdk17
4847
- adoptopenjdk17
4948
GRADLE_TASK:
5049
- checkPart1
@@ -56,7 +55,7 @@ steps:
5655
- checkRestCompat
5756
agents:
5857
provider: gcp
59-
image: family/elasticsearch-ubuntu-2204
58+
image: family/elasticsearch-ubuntu-2404
6059
machineType: n1-standard-32
6160
buildDirectory: /dev/shm/bk
6261
env:
@@ -68,12 +67,11 @@ steps:
6867
matrix:
6968
setup:
7069
ES_RUNTIME_JAVA:
71-
- openjdk17
7270
- adoptopenjdk17
7371
BWC_VERSION: $BWC_LIST
7472
agents:
7573
provider: gcp
76-
image: family/elasticsearch-ubuntu-2204
74+
image: family/elasticsearch-ubuntu-2404
7775
machineType: n1-standard-32
7876
buildDirectory: /dev/shm/bk
7977
env:
@@ -88,7 +86,6 @@ steps:
8886
setup:
8987
ES_RUNTIME_JAVA:
9088
- graalvm-ce17
91-
- openjdk17
9289
- adoptopenjdk17
9390
- openjdk21
9491
- openjdk22
@@ -103,7 +100,7 @@ steps:
103100
- checkRestCompat
104101
agents:
105102
provider: gcp
106-
image: family/elasticsearch-ubuntu-2204
103+
image: family/elasticsearch-ubuntu-2404
107104
machineType: n1-standard-32
108105
buildDirectory: /dev/shm/bk
109106
env:
@@ -116,15 +113,14 @@ steps:
116113
setup:
117114
ES_RUNTIME_JAVA:
118115
- graalvm-ce17
119-
- openjdk17
120116
- adoptopenjdk17
121117
- openjdk21
122118
- openjdk22
123119
- openjdk23
124120
BWC_VERSION: $BWC_LIST
125121
agents:
126122
provider: gcp
127-
image: family/elasticsearch-ubuntu-2204
123+
image: family/elasticsearch-ubuntu-2404
128124
machineType: n1-standard-32
129125
buildDirectory: /dev/shm/bk
130126
env:

.buildkite/pipelines/periodic.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,6 @@ steps:
767767
matrix:
768768
setup:
769769
ES_RUNTIME_JAVA:
770-
- openjdk17
771770
- adoptopenjdk17
772771
GRADLE_TASK:
773772
- checkPart1
@@ -779,7 +778,7 @@ steps:
779778
- checkRestCompat
780779
agents:
781780
provider: gcp
782-
image: family/elasticsearch-ubuntu-2204
781+
image: family/elasticsearch-ubuntu-2404
783782
machineType: n1-standard-32
784783
buildDirectory: /dev/shm/bk
785784
env:
@@ -791,12 +790,11 @@ steps:
791790
matrix:
792791
setup:
793792
ES_RUNTIME_JAVA:
794-
- openjdk17
795793
- adoptopenjdk17
796794
BWC_VERSION: ["7.17.30", "8.18.8", "8.19.5"]
797795
agents:
798796
provider: gcp
799-
image: family/elasticsearch-ubuntu-2204
797+
image: family/elasticsearch-ubuntu-2404
800798
machineType: n1-standard-32
801799
buildDirectory: /dev/shm/bk
802800
env:
@@ -811,7 +809,6 @@ steps:
811809
setup:
812810
ES_RUNTIME_JAVA:
813811
- graalvm-ce17
814-
- openjdk17
815812
- adoptopenjdk17
816813
- openjdk21
817814
- openjdk22
@@ -826,7 +823,7 @@ steps:
826823
- checkRestCompat
827824
agents:
828825
provider: gcp
829-
image: family/elasticsearch-ubuntu-2204
826+
image: family/elasticsearch-ubuntu-2404
830827
machineType: n1-standard-32
831828
buildDirectory: /dev/shm/bk
832829
env:
@@ -839,15 +836,14 @@ steps:
839836
setup:
840837
ES_RUNTIME_JAVA:
841838
- graalvm-ce17
842-
- openjdk17
843839
- adoptopenjdk17
844840
- openjdk21
845841
- openjdk22
846842
- openjdk23
847843
BWC_VERSION: ["7.17.30", "8.18.8", "8.19.5"]
848844
agents:
849845
provider: gcp
850-
image: family/elasticsearch-ubuntu-2204
846+
image: family/elasticsearch-ubuntu-2404
851847
machineType: n1-standard-32
852848
buildDirectory: /dev/shm/bk
853849
env:

0 commit comments

Comments
 (0)