Skip to content

Commit 373b95f

Browse files
elasticsearchmachineelasticsearchmachine
authored
Merge c59e350 into openjdk23-bundle
2 parents 085f98f + c59e350 commit 373b95f

File tree

334 files changed

+4501
-1814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

334 files changed

+4501
-1814
lines changed

‎.buildkite/hooks/pre-command‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,11 @@ EOF
109109
<summary>Agent information from gobld</summary>
110110
EOF
111111
fi
112+
113+
# Amazon Linux 2 has DNS resolution issues with resource-based hostnames in EC2
114+
# We have many functional tests that try to lookup and resolve the hostname of the local machine in a particular way
115+
# And they fail. This sets up a manual entry for the hostname in dnsmasq.
116+
if [[ -f /etc/os-release ]] && grep -q '"Amazon Linux 2"' /etc/os-release; then
117+
echo "$(hostname -i | cut -d' ' -f 2) $(hostname -f)." | sudo tee /etc/dnsmasq.hosts
118+
sudo systemctl restart dnsmasq.service
119+
fi

‎.buildkite/pipelines/dra-workflow.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ steps:
66
provider: gcp
77
image: family/elasticsearch-ubuntu-2204
88
machineType: custom-32-98304
9-
buildDirectory: /dev/shm/bk
9+
localSsds: 1
10+
localSsdInterface: nvme
1011
diskSizeGb: 350
1112
- wait
1213
# The hadoop build depends on the ES artifact

‎.buildkite/pipelines/intake.template.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ steps:
77
image: family/elasticsearch-ubuntu-2004
88
machineType: custom-32-98304
99
buildDirectory: /dev/shm/bk
10-
diskSizeGb: 250
1110
- wait
1211
- label: part1
1312
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
@@ -17,7 +16,6 @@ steps:
1716
image: family/elasticsearch-ubuntu-2004
1817
machineType: n1-standard-32
1918
buildDirectory: /dev/shm/bk
20-
diskSizeGb: 250
2119
- label: part2
2220
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
2321
timeout_in_minutes: 300
@@ -26,7 +24,6 @@ steps:
2624
image: family/elasticsearch-ubuntu-2004
2725
machineType: n1-standard-32
2826
buildDirectory: /dev/shm/bk
29-
diskSizeGb: 250
3027
- label: part3
3128
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
3229
timeout_in_minutes: 300
@@ -35,7 +32,6 @@ steps:
3532
image: family/elasticsearch-ubuntu-2004
3633
machineType: n1-standard-32
3734
buildDirectory: /dev/shm/bk
38-
diskSizeGb: 250
3935
- label: part4
4036
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
4137
timeout_in_minutes: 300
@@ -44,7 +40,6 @@ steps:
4440
image: family/elasticsearch-ubuntu-2004
4541
machineType: n1-standard-32
4642
buildDirectory: /dev/shm/bk
47-
diskSizeGb: 250
4843
- label: part5
4944
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
5045
timeout_in_minutes: 300
@@ -53,7 +48,6 @@ steps:
5348
image: family/elasticsearch-ubuntu-2004
5449
machineType: n1-standard-32
5550
buildDirectory: /dev/shm/bk
56-
diskSizeGb: 250
5751
- group: bwc-snapshots
5852
steps:
5953
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
@@ -67,7 +61,6 @@ steps:
6761
image: family/elasticsearch-ubuntu-2004
6862
machineType: custom-32-98304
6963
buildDirectory: /dev/shm/bk
70-
diskSizeGb: 250
7164
env:
7265
BWC_VERSION: "{{matrix.BWC_VERSION}}"
7366
- label: rest-compat
@@ -78,7 +71,6 @@ steps:
7871
image: family/elasticsearch-ubuntu-2004
7972
machineType: custom-32-98304
8073
buildDirectory: /dev/shm/bk
81-
diskSizeGb: 250
8274
- wait
8375
- trigger: elasticsearch-dra-workflow
8476
label: Trigger DRA snapshot workflow

‎.buildkite/pipelines/intake.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ steps:
88
image: family/elasticsearch-ubuntu-2004
99
machineType: custom-32-98304
1010
buildDirectory: /dev/shm/bk
11-
diskSizeGb: 250
1211
- wait
1312
- label: part1
1413
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
@@ -18,7 +17,6 @@ steps:
1817
image: family/elasticsearch-ubuntu-2004
1918
machineType: n1-standard-32
2019
buildDirectory: /dev/shm/bk
21-
diskSizeGb: 250
2220
- label: part2
2321
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
2422
timeout_in_minutes: 300
@@ -27,7 +25,6 @@ steps:
2725
image: family/elasticsearch-ubuntu-2004
2826
machineType: n1-standard-32
2927
buildDirectory: /dev/shm/bk
30-
diskSizeGb: 250
3128
- label: part3
3229
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
3330
timeout_in_minutes: 300
@@ -36,7 +33,6 @@ steps:
3633
image: family/elasticsearch-ubuntu-2004
3734
machineType: n1-standard-32
3835
buildDirectory: /dev/shm/bk
39-
diskSizeGb: 250
4036
- label: part4
4137
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
4238
timeout_in_minutes: 300
@@ -45,7 +41,6 @@ steps:
4541
image: family/elasticsearch-ubuntu-2004
4642
machineType: n1-standard-32
4743
buildDirectory: /dev/shm/bk
48-
diskSizeGb: 250
4944
- label: part5
5045
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
5146
timeout_in_minutes: 300
@@ -54,7 +49,6 @@ steps:
5449
image: family/elasticsearch-ubuntu-2004
5550
machineType: n1-standard-32
5651
buildDirectory: /dev/shm/bk
57-
diskSizeGb: 250
5852
- group: bwc-snapshots
5953
steps:
6054
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
@@ -68,7 +62,6 @@ steps:
6862
image: family/elasticsearch-ubuntu-2004
6963
machineType: custom-32-98304
7064
buildDirectory: /dev/shm/bk
71-
diskSizeGb: 250
7265
env:
7366
BWC_VERSION: "{{matrix.BWC_VERSION}}"
7467
- label: rest-compat
@@ -79,7 +72,6 @@ steps:
7972
image: family/elasticsearch-ubuntu-2004
8073
machineType: custom-32-98304
8174
buildDirectory: /dev/shm/bk
82-
diskSizeGb: 250
8375
- wait
8476
- trigger: elasticsearch-dra-workflow
8577
label: Trigger DRA snapshot workflow

‎.buildkite/pipelines/lucene-snapshot/build-snapshot.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ steps:
1515
image: family/elasticsearch-ubuntu-2004
1616
machineType: custom-32-98304
1717
buildDirectory: /dev/shm/bk
18-
diskSizeGb: 250
1918
- wait
2019
- trigger: "elasticsearch-lucene-snapshot-tests"
2120
build:

‎.buildkite/pipelines/lucene-snapshot/run-tests.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ steps:
77
image: family/elasticsearch-ubuntu-2004
88
machineType: custom-32-98304
99
buildDirectory: /dev/shm/bk
10-
diskSizeGb: 250
1110
- wait: null
1211
- label: part1
1312
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart1
@@ -17,7 +16,6 @@ steps:
1716
image: family/elasticsearch-ubuntu-2004
1817
machineType: custom-32-98304
1918
buildDirectory: /dev/shm/bk
20-
diskSizeGb: 250
2119
- label: part2
2220
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
2321
timeout_in_minutes: 300
@@ -26,7 +24,6 @@ steps:
2624
image: family/elasticsearch-ubuntu-2004
2725
machineType: custom-32-98304
2826
buildDirectory: /dev/shm/bk
29-
diskSizeGb: 250
3027
- label: part3
3128
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart3
3229
timeout_in_minutes: 300
@@ -35,7 +32,6 @@ steps:
3532
image: family/elasticsearch-ubuntu-2004
3633
machineType: custom-32-98304
3734
buildDirectory: /dev/shm/bk
38-
diskSizeGb: 250
3935
- label: part4
4036
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart4
4137
timeout_in_minutes: 300
@@ -44,7 +40,6 @@ steps:
4440
image: family/elasticsearch-ubuntu-2004
4541
machineType: custom-32-98304
4642
buildDirectory: /dev/shm/bk
47-
diskSizeGb: 250
4843
- label: part5
4944
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart5
5045
timeout_in_minutes: 300
@@ -53,7 +48,6 @@ steps:
5348
image: family/elasticsearch-ubuntu-2004
5449
machineType: custom-32-98304
5550
buildDirectory: /dev/shm/bk
56-
diskSizeGb: 250
5751
- group: bwc-snapshots
5852
steps:
5953
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
@@ -70,7 +64,6 @@ steps:
7064
image: family/elasticsearch-ubuntu-2004
7165
machineType: custom-32-98304
7266
buildDirectory: /dev/shm/bk
73-
diskSizeGb: 250
7467
env:
7568
BWC_VERSION: "{{matrix.BWC_VERSION}}"
7669
- label: rest-compat
@@ -81,4 +74,3 @@ steps:
8174
image: family/elasticsearch-ubuntu-2004
8275
machineType: custom-32-98304
8376
buildDirectory: /dev/shm/bk
84-
diskSizeGb: 250

‎.buildkite/pipelines/periodic-packaging.bwc.template.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
image: family/elasticsearch-{{matrix.image}}
1212
machineType: custom-16-32768
1313
buildDirectory: /dev/shm/bk
14-
diskSizeGb: 250
1514
env:
1615
BWC_VERSION: $BWC_VERSION

‎.buildkite/pipelines/periodic-packaging.template.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ steps:
33
steps:
44
- label: "{{matrix.image}} / packaging-tests-unix"
55
command: ./.ci/scripts/packaging-test.sh destructivePackagingTest
6-
timeout_in_minutes: 300
6+
timeout_in_minutes: 420
77
matrix:
88
setup:
99
image:

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
steps:
55
- label: "{{matrix.image}} / packaging-tests-unix"
66
command: ./.ci/scripts/packaging-test.sh destructivePackagingTest
7-
timeout_in_minutes: 300
7+
timeout_in_minutes: 420
88
matrix:
99
setup:
1010
image:
@@ -44,7 +44,6 @@ steps:
4444
image: family/elasticsearch-{{matrix.image}}
4545
machineType: custom-16-32768
4646
buildDirectory: /dev/shm/bk
47-
diskSizeGb: 250
4847
env:
4948
BWC_VERSION: 8.0.1
5049

@@ -61,7 +60,6 @@ steps:
6160
image: family/elasticsearch-{{matrix.image}}
6261
machineType: custom-16-32768
6362
buildDirectory: /dev/shm/bk
64-
diskSizeGb: 250
6563
env:
6664
BWC_VERSION: 8.1.3
6765

@@ -78,7 +76,6 @@ steps:
7876
image: family/elasticsearch-{{matrix.image}}
7977
machineType: custom-16-32768
8078
buildDirectory: /dev/shm/bk
81-
diskSizeGb: 250
8279
env:
8380
BWC_VERSION: 8.2.3
8481

@@ -95,7 +92,6 @@ steps:
9592
image: family/elasticsearch-{{matrix.image}}
9693
machineType: custom-16-32768
9794
buildDirectory: /dev/shm/bk
98-
diskSizeGb: 250
9995
env:
10096
BWC_VERSION: 8.3.3
10197

@@ -112,7 +108,6 @@ steps:
112108
image: family/elasticsearch-{{matrix.image}}
113109
machineType: custom-16-32768
114110
buildDirectory: /dev/shm/bk
115-
diskSizeGb: 250
116111
env:
117112
BWC_VERSION: 8.4.3
118113

@@ -129,7 +124,6 @@ steps:
129124
image: family/elasticsearch-{{matrix.image}}
130125
machineType: custom-16-32768
131126
buildDirectory: /dev/shm/bk
132-
diskSizeGb: 250
133127
env:
134128
BWC_VERSION: 8.5.3
135129

@@ -146,7 +140,6 @@ steps:
146140
image: family/elasticsearch-{{matrix.image}}
147141
machineType: custom-16-32768
148142
buildDirectory: /dev/shm/bk
149-
diskSizeGb: 250
150143
env:
151144
BWC_VERSION: 8.6.2
152145

@@ -163,7 +156,6 @@ steps:
163156
image: family/elasticsearch-{{matrix.image}}
164157
machineType: custom-16-32768
165158
buildDirectory: /dev/shm/bk
166-
diskSizeGb: 250
167159
env:
168160
BWC_VERSION: 8.7.1
169161

@@ -180,7 +172,6 @@ steps:
180172
image: family/elasticsearch-{{matrix.image}}
181173
machineType: custom-16-32768
182174
buildDirectory: /dev/shm/bk
183-
diskSizeGb: 250
184175
env:
185176
BWC_VERSION: 8.8.2
186177

@@ -197,7 +188,6 @@ steps:
197188
image: family/elasticsearch-{{matrix.image}}
198189
machineType: custom-16-32768
199190
buildDirectory: /dev/shm/bk
200-
diskSizeGb: 250
201191
env:
202192
BWC_VERSION: 8.9.2
203193

@@ -214,7 +204,6 @@ steps:
214204
image: family/elasticsearch-{{matrix.image}}
215205
machineType: custom-16-32768
216206
buildDirectory: /dev/shm/bk
217-
diskSizeGb: 250
218207
env:
219208
BWC_VERSION: 8.10.4
220209

@@ -231,7 +220,6 @@ steps:
231220
image: family/elasticsearch-{{matrix.image}}
232221
machineType: custom-16-32768
233222
buildDirectory: /dev/shm/bk
234-
diskSizeGb: 250
235223
env:
236224
BWC_VERSION: 8.11.4
237225

@@ -248,7 +236,6 @@ steps:
248236
image: family/elasticsearch-{{matrix.image}}
249237
machineType: custom-16-32768
250238
buildDirectory: /dev/shm/bk
251-
diskSizeGb: 250
252239
env:
253240
BWC_VERSION: 8.12.2
254241

@@ -265,7 +252,6 @@ steps:
265252
image: family/elasticsearch-{{matrix.image}}
266253
machineType: custom-16-32768
267254
buildDirectory: /dev/shm/bk
268-
diskSizeGb: 250
269255
env:
270256
BWC_VERSION: 8.13.4
271257

@@ -282,7 +268,6 @@ steps:
282268
image: family/elasticsearch-{{matrix.image}}
283269
machineType: custom-16-32768
284270
buildDirectory: /dev/shm/bk
285-
diskSizeGb: 250
286271
env:
287272
BWC_VERSION: 8.14.3
288273

@@ -299,7 +284,6 @@ steps:
299284
image: family/elasticsearch-{{matrix.image}}
300285
machineType: custom-16-32768
301286
buildDirectory: /dev/shm/bk
302-
diskSizeGb: 250
303287
env:
304288
BWC_VERSION: 8.15.3
305289

@@ -316,7 +300,6 @@ steps:
316300
image: family/elasticsearch-{{matrix.image}}
317301
machineType: custom-16-32768
318302
buildDirectory: /dev/shm/bk
319-
diskSizeGb: 250
320303
env:
321304
BWC_VERSION: 8.16.0
322305

@@ -333,7 +316,6 @@ steps:
333316
image: family/elasticsearch-{{matrix.image}}
334317
machineType: custom-16-32768
335318
buildDirectory: /dev/shm/bk
336-
diskSizeGb: 250
337319
env:
338320
BWC_VERSION: 9.0.0
339321

‎.buildkite/pipelines/periodic-platform-support.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ steps:
2828
localSsds: 1
2929
localSsdInterface: nvme
3030
machineType: custom-32-98304
31-
diskSizeGb: 250
3231
env: {}
3332
- group: platform-support-windows
3433
steps:

0 commit comments

Comments
 (0)