Skip to content

Commit 60d0a4e

Browse files
leemthompoleemthompo
authored
Merge branch 'elastic:main' into main
2 parents fadb235 + 9e40bb3 commit 60d0a4e

File tree

2,253 files changed

+97736
-22553
lines changed

Some content is hidden

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

2,253 files changed

+97736
-22553
lines changed

‎.buildkite/hooks/pre-command‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,16 @@ if [[ "${USE_PROD_DOCKER_CREDENTIALS:-}" == "true" ]]; then
9494
fi
9595
fi
9696

97+
if [[ "${USE_PERF_CREDENTIALS:-}" == "true" ]]; then
98+
PERF_METRICS_HOST=$(vault read -field=es_host /secret/ci/elastic-elasticsearch/microbenchmarks-metrics)
99+
PERF_METRICS_USERNAME=$(vault read -field=es_user /secret/ci/elastic-elasticsearch/microbenchmarks-metrics)
100+
PERF_METRICS_PASSWORD=$(vault read -field=es_password /secret/ci/elastic-elasticsearch/microbenchmarks-metrics)
101+
102+
export PERF_METRICS_HOST
103+
export PERF_METRICS_USERNAME
104+
export PERF_METRICS_PASSWORD
105+
fi
106+
97107
# Authenticate to the Docker Hub public read-only registry
98108
if which docker > /dev/null 2>&1; then
99109
DOCKERHUB_REGISTRY_USERNAME="$(vault read -field=username secret/ci/elastic-elasticsearch/docker_hub_public_ro_credentials)"

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ steps:
4848
image: family/elasticsearch-ubuntu-2004
4949
machineType: n1-standard-32
5050
buildDirectory: /dev/shm/bk
51+
- label: part6
52+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6
53+
timeout_in_minutes: 300
54+
agents:
55+
provider: gcp
56+
image: family/elasticsearch-ubuntu-2004
57+
machineType: n1-standard-32
58+
buildDirectory: /dev/shm/bk
59+
5160
- group: bwc-snapshots
5261
steps:
5362
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"

‎.buildkite/pipelines/intake.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,22 @@ steps:
4949
image: family/elasticsearch-ubuntu-2004
5050
machineType: n1-standard-32
5151
buildDirectory: /dev/shm/bk
52+
- label: part6
53+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6
54+
timeout_in_minutes: 300
55+
agents:
56+
provider: gcp
57+
image: family/elasticsearch-ubuntu-2004
58+
machineType: n1-standard-32
59+
buildDirectory: /dev/shm/bk
5260
- group: bwc-snapshots
5361
steps:
5462
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
5563
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints v$$BWC_VERSION#bwcTest
5664
timeout_in_minutes: 300
5765
matrix:
5866
setup:
59-
BWC_VERSION: ["8.17.7", "8.18.2", "8.19.0", "9.0.2", "9.1.0"]
67+
BWC_VERSION: ["8.17.8", "8.18.3", "8.19.0", "9.0.3", "9.1.0"]
6068
agents:
6169
provider: gcp
6270
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ steps:
4848
image: family/elasticsearch-ubuntu-2004
4949
machineType: custom-32-98304
5050
buildDirectory: /dev/shm/bk
51+
- label: part6
52+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkPart6
53+
timeout_in_minutes: 300
54+
agents:
55+
provider: gcp
56+
image: family/elasticsearch-ubuntu-2004
57+
machineType: custom-32-98304
58+
buildDirectory: /dev/shm/bk
5159
- group: bwc-snapshots
5260
steps:
5361
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"

‎.buildkite/pipelines/periodic-micro-benchmarks.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
steps:
2+
- label: periodic-micro-benchmarks
3+
command: |
4+
.ci/scripts/run-gradle.sh :benchmarks:run --args 'org.elasticsearch.benchmark._nightly -rf json -rff build/result.json'
5+
.buildkite/scripts/index-micro-benchmark-results.sh
6+
env:
7+
USE_PERF_CREDENTIALS: "true"
8+
timeout_in_minutes: 300
9+
agents:
10+
provider: gcp
11+
image: family/elasticsearch-ubuntu-2004
12+
machineType: custom-32-98304
13+
buildDirectory: /dev/shm/bk

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ steps:
303303
env:
304304
BWC_VERSION: 8.16.6
305305

306-
- label: "{{matrix.image}} / 8.17.7 / packaging-tests-upgrade"
307-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.7
306+
- label: "{{matrix.image}} / 8.17.8 / packaging-tests-upgrade"
307+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.8
308308
timeout_in_minutes: 300
309309
matrix:
310310
setup:
@@ -317,10 +317,10 @@ steps:
317317
machineType: custom-16-32768
318318
buildDirectory: /dev/shm/bk
319319
env:
320-
BWC_VERSION: 8.17.7
320+
BWC_VERSION: 8.17.8
321321

322-
- label: "{{matrix.image}} / 8.18.2 / packaging-tests-upgrade"
323-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.2
322+
- label: "{{matrix.image}} / 8.18.3 / packaging-tests-upgrade"
323+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.3
324324
timeout_in_minutes: 300
325325
matrix:
326326
setup:
@@ -333,7 +333,7 @@ steps:
333333
machineType: custom-16-32768
334334
buildDirectory: /dev/shm/bk
335335
env:
336-
BWC_VERSION: 8.18.2
336+
BWC_VERSION: 8.18.3
337337

338338
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
339339
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
@@ -351,8 +351,8 @@ steps:
351351
env:
352352
BWC_VERSION: 8.19.0
353353

354-
- label: "{{matrix.image}} / 9.0.2 / packaging-tests-upgrade"
355-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.2
354+
- label: "{{matrix.image}} / 9.0.3 / packaging-tests-upgrade"
355+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.3
356356
timeout_in_minutes: 300
357357
matrix:
358358
setup:
@@ -365,7 +365,7 @@ steps:
365365
machineType: custom-16-32768
366366
buildDirectory: /dev/shm/bk
367367
env:
368-
BWC_VERSION: 9.0.2
368+
BWC_VERSION: 9.0.3
369369

370370
- label: "{{matrix.image}} / 9.1.0 / packaging-tests-upgrade"
371371
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ steps:
4545
- checkPart3
4646
- checkPart4
4747
- checkPart5
48+
- checkPart6
4849
- checkRestCompat
4950
agents:
5051
provider: gcp
@@ -71,6 +72,7 @@ steps:
7172
- checkPart3
7273
- checkPart4
7374
- checkPart5
75+
- checkPart6
7476
- checkRestCompat
7577
agents:
7678
provider: aws

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ steps:
5151
- checkPart3
5252
- checkPart4
5353
- checkPart5
54+
- checkPart6
5455
- checkRestCompat
5556
agents:
5657
provider: gcp
@@ -93,6 +94,7 @@ steps:
9394
- checkPart3
9495
- checkPart4
9596
- checkPart5
97+
- checkPart6
9698
- checkRestCompat
9799
agents:
98100
provider: gcp

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ steps:
325325
- signal_reason: agent_stop
326326
limit: 3
327327

328-
- label: 8.17.7 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.7#bwcTest
328+
- label: 8.17.8 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.8#bwcTest
330330
timeout_in_minutes: 300
331331
agents:
332332
provider: gcp
@@ -335,7 +335,7 @@ steps:
335335
buildDirectory: /dev/shm/bk
336336
preemptible: true
337337
env:
338-
BWC_VERSION: 8.17.7
338+
BWC_VERSION: 8.17.8
339339
retry:
340340
automatic:
341341
- exit_status: "-1"
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.2 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.2#bwcTest
347+
- label: 8.18.3 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.3#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.2
357+
BWC_VERSION: 8.18.3
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.2 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.2#bwcTest
385+
- label: 9.0.3 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.3#bwcTest
387387
timeout_in_minutes: 300
388388
agents:
389389
provider: gcp
@@ -392,7 +392,7 @@ steps:
392392
buildDirectory: /dev/shm/bk
393393
preemptible: true
394394
env:
395-
BWC_VERSION: 9.0.2
395+
BWC_VERSION: 9.0.3
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -470,6 +470,7 @@ steps:
470470
- checkPart3
471471
- checkPart4
472472
- checkPart5
473+
- checkPart6
473474
- checkRestCompat
474475
agents:
475476
provider: gcp
@@ -486,7 +487,7 @@ steps:
486487
setup:
487488
ES_RUNTIME_JAVA:
488489
- openjdk21
489-
BWC_VERSION: ["8.17.7", "8.18.2", "8.19.0", "9.0.2", "9.1.0"]
490+
BWC_VERSION: ["8.17.8", "8.18.3", "8.19.0", "9.0.3", "9.1.0"]
490491
agents:
491492
provider: gcp
492493
image: family/elasticsearch-ubuntu-2004
@@ -512,6 +513,7 @@ steps:
512513
- checkPart3
513514
- checkPart4
514515
- checkPart5
516+
- checkPart6
515517
- checkRestCompat
516518
agents:
517519
provider: gcp
@@ -529,7 +531,7 @@ steps:
529531
ES_RUNTIME_JAVA:
530532
- openjdk21
531533
- openjdk23
532-
BWC_VERSION: ["8.17.7", "8.18.2", "8.19.0", "9.0.2", "9.1.0"]
534+
BWC_VERSION: ["8.17.8", "8.18.3", "8.19.0", "9.0.3", "9.1.0"]
533535
agents:
534536
provider: gcp
535537
image: family/elasticsearch-ubuntu-2004

‎.buildkite/pipelines/pull-request/bwc-snapshots.yml‎

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ config:
66
steps:
77
- group: bwc-snapshots
88
steps:
9-
- label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
10-
key: "bwc-snapshots"
11-
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTest
9+
- label: "{{matrix.BWC_VERSION}} / Part 1 / bwc-snapshots"
10+
key: "bwc-snapshots-part1"
11+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart1
1212
timeout_in_minutes: 300
1313
matrix:
1414
setup:
@@ -18,3 +18,64 @@ steps:
1818
image: family/elasticsearch-ubuntu-2004
1919
machineType: n1-standard-32
2020
buildDirectory: /dev/shm/bk
21+
- label: "{{matrix.BWC_VERSION}} / Part 2 / bwc-snapshots"
22+
key: "bwc-snapshots-part2"
23+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart2
24+
timeout_in_minutes: 300
25+
matrix:
26+
setup:
27+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
28+
agents:
29+
provider: gcp
30+
image: family/elasticsearch-ubuntu-2004
31+
machineType: n1-standard-32
32+
buildDirectory: /dev/shm/bk
33+
- label: "{{matrix.BWC_VERSION}} / Part 3 / bwc-snapshots"
34+
key: "bwc-snapshots-part3"
35+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart3
36+
timeout_in_minutes: 300
37+
matrix:
38+
setup:
39+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
40+
agents:
41+
provider: gcp
42+
image: family/elasticsearch-ubuntu-2004
43+
machineType: n1-standard-32
44+
buildDirectory: /dev/shm/bk
45+
- label: "{{matrix.BWC_VERSION}} / Part 4 / bwc-snapshots"
46+
key: "bwc-snapshots-part4"
47+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart5
48+
timeout_in_minutes: 300
49+
matrix:
50+
setup:
51+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
52+
agents:
53+
provider: gcp
54+
image: family/elasticsearch-ubuntu-2004
55+
machineType: n1-standard-32
56+
buildDirectory: /dev/shm/bk
57+
- label: "{{matrix.BWC_VERSION}} / Part 5 / bwc-snapshots"
58+
key: "bwc-snapshots-part5"
59+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart5
60+
timeout_in_minutes: 300
61+
matrix:
62+
setup:
63+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
64+
agents:
65+
provider: gcp
66+
image: family/elasticsearch-ubuntu-2004
67+
machineType: n1-standard-32
68+
buildDirectory: /dev/shm/bk
69+
- label: "{{matrix.BWC_VERSION}} / Part 6 / bwc-snapshots"
70+
key: "bwc-snapshots-part6"
71+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed v{{matrix.BWC_VERSION}}#bwcTestPart6
72+
timeout_in_minutes: 300
73+
matrix:
74+
setup:
75+
BWC_VERSION: $SNAPSHOT_BWC_VERSIONS
76+
agents:
77+
provider: gcp
78+
image: family/elasticsearch-ubuntu-2004
79+
machineType: n1-standard-32
80+
buildDirectory: /dev/shm/bk
81+

0 commit comments

Comments
 (0)