Skip to content

Commit b20d791

Browse files
drempapisdrempapis
authored
Merge branch 'main' into fix/117042_Support_7x_segments_as_archive_in_8x
2 parents 6b26b66 + 67d0dd4 commit b20d791

File tree

9,135 files changed

+283481
-436961
lines changed

Some content is hidden

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

9,135 files changed

+283481
-436961
lines changed

‎.backportrc.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "8.x", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
3+
"targetBranchChoices" : [ "main", "8.x", "9.0", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v9.0.0$" : "main",
7-
"^v8.18.0$" : "8.x",
6+
"^v9.1.0$" : "main",
7+
"^v8.19.0$" : "8.x",
88
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
99
}
10-
}
10+
}

‎.buildkite/hooks/pre-command‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ export GRADLE_BUILD_CACHE_USERNAME
4444
GRADLE_BUILD_CACHE_PASSWORD=$(vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)
4545
export GRADLE_BUILD_CACHE_PASSWORD
4646

47+
DEVELOCITY_ACCESS_KEY="gradle-enterprise.elastic.co=$(vault read -field=accesskey secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)"
48+
export DEVELOCITY_ACCESS_KEY
49+
4750
BUILDKITE_API_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/buildkite-api-token)
4851
export BUILDKITE_API_TOKEN
4952

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ steps:
7575
ES_VERSION:
7676
- "9.0.0"
7777
ES_COMMIT:
78-
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
78+
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
7979
agents:
8080
provider: gcp
8181
image: family/elasticsearch-ubuntu-2004
@@ -96,7 +96,7 @@ steps:
9696
- trigger: elasticsearch-dra-workflow
9797
label: Trigger DRA snapshot workflow
9898
async: true
99-
branches: "main 8.* 7.17"
99+
branches: "main 9.* 8.* 7.17"
100100
build:
101101
branch: "$BUILDKITE_BRANCH"
102102
commit: "$BUILDKITE_COMMIT"

‎.buildkite/pipelines/intake.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ steps:
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
59-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
59+
BWC_VERSION: ["8.16.6", "8.17.4", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004
@@ -76,7 +76,7 @@ steps:
7676
ES_VERSION:
7777
- "9.0.0"
7878
ES_COMMIT:
79-
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
79+
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
8080
agents:
8181
provider: gcp
8282
image: family/elasticsearch-ubuntu-2004
@@ -97,7 +97,7 @@ steps:
9797
- trigger: elasticsearch-dra-workflow
9898
label: Trigger DRA snapshot workflow
9999
async: true
100-
branches: "main 8.* 7.17"
100+
branches: "main 9.* 8.* 7.17"
101101
build:
102102
branch: "$BUILDKITE_BRANCH"
103103
commit: "$BUILDKITE_COMMIT"

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
steps:
2+
- label: $FWC_VERSION / fwc
3+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
4+
timeout_in_minutes: 300
5+
agents:
6+
provider: gcp
7+
image: family/elasticsearch-ubuntu-2004
8+
machineType: n1-standard-32
9+
buildDirectory: /dev/shm/bk
10+
matrix:
11+
setup:
12+
FWC_VERSION: $FWC_LIST
13+
env:
14+
FWC_VERSION: $FWC_VERSION

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file is auto-generated. See .buildkite/pipelines/periodic-fwc.template.yml
2+
steps:
3+
- label: $FWC_VERSION / fwc
4+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
5+
timeout_in_minutes: 300
6+
agents:
7+
provider: gcp
8+
image: family/elasticsearch-ubuntu-2004
9+
machineType: n1-standard-32
10+
buildDirectory: /dev/shm/bk
11+
matrix:
12+
setup:
13+
FWC_VERSION: []
14+
env:
15+
FWC_VERSION: $FWC_VERSION

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

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ steps:
287287
env:
288288
BWC_VERSION: 8.15.5
289289

290-
- label: "{{matrix.image}} / 8.16.4 / packaging-tests-upgrade"
291-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.4
290+
- label: "{{matrix.image}} / 8.16.6 / packaging-tests-upgrade"
291+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.6
292292
timeout_in_minutes: 300
293293
matrix:
294294
setup:
@@ -301,10 +301,10 @@ steps:
301301
machineType: custom-16-32768
302302
buildDirectory: /dev/shm/bk
303303
env:
304-
BWC_VERSION: 8.16.4
304+
BWC_VERSION: 8.16.6
305305

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

322322
- label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
323323
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0
@@ -335,6 +335,22 @@ steps:
335335
env:
336336
BWC_VERSION: 8.18.0
337337

338+
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
339+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
340+
timeout_in_minutes: 300
341+
matrix:
342+
setup:
343+
image:
344+
- rocky-8
345+
- ubuntu-2004
346+
agents:
347+
provider: gcp
348+
image: family/elasticsearch-{{matrix.image}}
349+
machineType: custom-16-32768
350+
buildDirectory: /dev/shm/bk
351+
env:
352+
BWC_VERSION: 8.19.0
353+
338354
- label: "{{matrix.image}} / 9.0.0 / packaging-tests-upgrade"
339355
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.0
340356
timeout_in_minutes: 300
@@ -351,6 +367,22 @@ steps:
351367
env:
352368
BWC_VERSION: 9.0.0
353369

370+
- label: "{{matrix.image}} / 9.1.0 / packaging-tests-upgrade"
371+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.0
372+
timeout_in_minutes: 300
373+
matrix:
374+
setup:
375+
image:
376+
- rocky-8
377+
- ubuntu-2004
378+
agents:
379+
provider: gcp
380+
image: family/elasticsearch-{{matrix.image}}
381+
machineType: custom-16-32768
382+
buildDirectory: /dev/shm/bk
383+
env:
384+
BWC_VERSION: 9.1.0
385+
354386
- group: packaging-tests-windows
355387
steps:
356388
- label: "{{matrix.image}} / packaging-tests-windows"

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,25 @@ steps:
7878
BWC_VERSION: "{{matrix.BWC_VERSION}}"
7979
- group: java-matrix
8080
steps:
81-
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
82-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
81+
- label: "{{matrix.ES_RUNTIME_JAVA}} / entitlements={{matrix.ENTITLEMENTS_ENABLED}} / {{matrix.GRADLE_TASK}} / java-matrix"
82+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline="-Des.entitlements.enabled=$$ENTITLEMENTS_ENABLED" $$GRADLE_TASK
8383
timeout_in_minutes: 300
8484
matrix:
8585
setup:
8686
ES_RUNTIME_JAVA:
8787
- openjdk21
8888
- openjdk23
89+
- openjdk24
8990
GRADLE_TASK:
9091
- checkPart1
9192
- checkPart2
9293
- checkPart3
9394
- checkPart4
9495
- checkPart5
9596
- checkRestCompat
97+
ENTITLEMENTS_ENABLED:
98+
- "true"
99+
- "false"
96100
agents:
97101
provider: gcp
98102
image: family/elasticsearch-ubuntu-2004
@@ -101,6 +105,7 @@ steps:
101105
env:
102106
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
103107
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
108+
ENTITLEMENTS_ENABLED: "{{matrix.ENTITLEMENTS_ENABLED}}"
104109
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
105110
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
106111
timeout_in_minutes: 300

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 53 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ steps:
306306
- signal_reason: agent_stop
307307
limit: 3
308308

309-
- label: 8.16.4 / bwc
310-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.4#bwcTest
309+
- label: 8.16.6 / bwc
310+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.6#bwcTest
311311
timeout_in_minutes: 300
312312
agents:
313313
provider: gcp
@@ -316,7 +316,7 @@ steps:
316316
buildDirectory: /dev/shm/bk
317317
preemptible: true
318318
env:
319-
BWC_VERSION: 8.16.4
319+
BWC_VERSION: 8.16.6
320320
retry:
321321
automatic:
322322
- exit_status: "-1"
@@ -325,8 +325,8 @@ steps:
325325
- signal_reason: agent_stop
326326
limit: 3
327327

328-
- label: 8.17.2 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.2#bwcTest
328+
- label: 8.17.4 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.4#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.2
338+
BWC_VERSION: 8.17.4
339339
retry:
340340
automatic:
341341
- exit_status: "-1"
@@ -363,6 +363,25 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366+
- label: 8.19.0 / bwc
367+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.0#bwcTest
368+
timeout_in_minutes: 300
369+
agents:
370+
provider: gcp
371+
image: family/elasticsearch-ubuntu-2004
372+
machineType: n1-standard-32
373+
buildDirectory: /dev/shm/bk
374+
preemptible: true
375+
env:
376+
BWC_VERSION: 8.19.0
377+
retry:
378+
automatic:
379+
- exit_status: "-1"
380+
limit: 3
381+
signal_reason: none
382+
- signal_reason: agent_stop
383+
limit: 3
384+
366385
- label: 9.0.0 / bwc
367386
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.0#bwcTest
368387
timeout_in_minutes: 300
@@ -382,6 +401,25 @@ steps:
382401
- signal_reason: agent_stop
383402
limit: 3
384403

404+
- label: 9.1.0 / bwc
405+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.0#bwcTest
406+
timeout_in_minutes: 300
407+
agents:
408+
provider: gcp
409+
image: family/elasticsearch-ubuntu-2004
410+
machineType: n1-standard-32
411+
buildDirectory: /dev/shm/bk
412+
preemptible: true
413+
env:
414+
BWC_VERSION: 9.1.0
415+
retry:
416+
automatic:
417+
- exit_status: "-1"
418+
limit: 3
419+
signal_reason: none
420+
- signal_reason: agent_stop
421+
limit: 3
422+
385423
- label: concurrent-search-tests
386424
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
387425
timeout_in_minutes: 420
@@ -448,7 +486,7 @@ steps:
448486
setup:
449487
ES_RUNTIME_JAVA:
450488
- openjdk21
451-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
489+
BWC_VERSION: ["8.16.6", "8.17.4", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
452490
agents:
453491
provider: gcp
454492
image: family/elasticsearch-ubuntu-2004
@@ -459,21 +497,25 @@ steps:
459497
BWC_VERSION: "{{matrix.BWC_VERSION}}"
460498
- group: java-matrix
461499
steps:
462-
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
463-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
500+
- label: "{{matrix.ES_RUNTIME_JAVA}} / entitlements={{matrix.ENTITLEMENTS_ENABLED}} / {{matrix.GRADLE_TASK}} / java-matrix"
501+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline="-Des.entitlements.enabled=$$ENTITLEMENTS_ENABLED" $$GRADLE_TASK
464502
timeout_in_minutes: 300
465503
matrix:
466504
setup:
467505
ES_RUNTIME_JAVA:
468506
- openjdk21
469507
- openjdk23
508+
- openjdk24
470509
GRADLE_TASK:
471510
- checkPart1
472511
- checkPart2
473512
- checkPart3
474513
- checkPart4
475514
- checkPart5
476515
- checkRestCompat
516+
ENTITLEMENTS_ENABLED:
517+
- "true"
518+
- "false"
477519
agents:
478520
provider: gcp
479521
image: family/elasticsearch-ubuntu-2004
@@ -482,6 +524,7 @@ steps:
482524
env:
483525
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
484526
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
527+
ENTITLEMENTS_ENABLED: "{{matrix.ENTITLEMENTS_ENABLED}}"
485528
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
486529
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
487530
timeout_in_minutes: 300
@@ -490,7 +533,7 @@ steps:
490533
ES_RUNTIME_JAVA:
491534
- openjdk21
492535
- openjdk23
493-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
536+
BWC_VERSION: ["8.16.6", "8.17.4", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
494537
agents:
495538
provider: gcp
496539
image: family/elasticsearch-ubuntu-2004

‎.buildkite/scripts/branches.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22

33
# This determines which branches will have pipelines triggered periodically, for dra workflows.
44
BRANCHES=( $(cat branches.json | jq -r '.branches[].branch') )
5+
6+
# Sort them to make ordering predictable
7+
IFS=$'\n' BRANCHES=($(sort <<<"${BRANCHES[*]}"))
8+
unset IFS

0 commit comments

Comments
 (0)