Skip to content

Commit dc371ff

Browse files
samxbrsamxbr
committed
Merge branch 'main' into feature/slm-health
2 parents 64b10ee + 09b1c6d commit dc371ff

File tree

1,790 files changed

+34277
-12036
lines changed

Some content is hidden

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

1,790 files changed

+34277
-12036
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/pipelines/intake.template.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,27 @@ steps:
6363
buildDirectory: /dev/shm/bk
6464
env:
6565
BWC_VERSION: "{{matrix.BWC_VERSION}}"
66+
- group: lucene-compat
67+
steps:
68+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
69+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
70+
timeout_in_minutes: 300
71+
matrix:
72+
setup:
73+
LUCENE_VERSION:
74+
- "10.0.0"
75+
ES_VERSION:
76+
- "9.0.0"
77+
ES_COMMIT:
78+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
79+
agents:
80+
provider: gcp
81+
image: family/elasticsearch-ubuntu-2004
82+
machineType: custom-32-98304
83+
buildDirectory: /dev/shm/bk
84+
env:
85+
ES_VERSION: "{{matrix.ES_VERSION}}"
86+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
6687
- label: rest-compat
6788
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6889
timeout_in_minutes: 300

‎.buildkite/pipelines/intake.yml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,35 @@ 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.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004
6363
machineType: custom-32-98304
6464
buildDirectory: /dev/shm/bk
6565
env:
6666
BWC_VERSION: "{{matrix.BWC_VERSION}}"
67+
- group: lucene-compat
68+
steps:
69+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
70+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
71+
timeout_in_minutes: 300
72+
matrix:
73+
setup:
74+
LUCENE_VERSION:
75+
- "10.0.0"
76+
ES_VERSION:
77+
- "9.0.0"
78+
ES_COMMIT:
79+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
80+
agents:
81+
provider: gcp
82+
image: family/elasticsearch-ubuntu-2004
83+
machineType: custom-32-98304
84+
buildDirectory: /dev/shm/bk
85+
env:
86+
ES_VERSION: "{{matrix.ES_VERSION}}"
87+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
6788
- label: rest-compat
6889
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints checkRestCompat
6990
timeout_in_minutes: 300

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,27 @@ steps:
201201
image: family/elasticsearch-ubuntu-2004
202202
machineType: n2-standard-8
203203
buildDirectory: /dev/shm/bk
204+
- group: lucene-compat
205+
steps:
206+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
207+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
208+
timeout_in_minutes: 300
209+
matrix:
210+
setup:
211+
LUCENE_VERSION:
212+
- "10.0.0"
213+
ES_VERSION:
214+
- "9.0.0"
215+
ES_COMMIT:
216+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
217+
agents:
218+
provider: gcp
219+
image: family/elasticsearch-ubuntu-2004
220+
machineType: custom-32-98304
221+
buildDirectory: /dev/shm/bk
222+
env:
223+
ES_VERSION: "{{matrix.ES_VERSION}}"
224+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
204225
- label: Upload Snyk Dependency Graph
205226
command: .ci/scripts/run-gradle.sh uploadSnykDependencyGraph -PsnykTargetReference=$BUILDKITE_BRANCH
206227
env:

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
452490
agents:
453491
provider: gcp
454492
image: family/elasticsearch-ubuntu-2004
@@ -490,7 +528,7 @@ steps:
490528
ES_RUNTIME_JAVA:
491529
- openjdk21
492530
- openjdk23
493-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
531+
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
494532
agents:
495533
provider: gcp
496534
image: family/elasticsearch-ubuntu-2004
@@ -582,6 +620,27 @@ steps:
582620
image: family/elasticsearch-ubuntu-2004
583621
machineType: n2-standard-8
584622
buildDirectory: /dev/shm/bk
623+
- group: lucene-compat
624+
steps:
625+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
626+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints -Dtests.bwc.main.version=$$ES_VERSION -Dtests.bwc.refspec.main=$$ES_COMMIT luceneBwcTest
627+
timeout_in_minutes: 300
628+
matrix:
629+
setup:
630+
LUCENE_VERSION:
631+
- "10.0.0"
632+
ES_VERSION:
633+
- "9.0.0"
634+
ES_COMMIT:
635+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
636+
agents:
637+
provider: gcp
638+
image: family/elasticsearch-ubuntu-2004
639+
machineType: custom-32-98304
640+
buildDirectory: /dev/shm/bk
641+
env:
642+
ES_VERSION: "{{matrix.ES_VERSION}}"
643+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
585644
- label: Upload Snyk Dependency Graph
586645
command: .ci/scripts/run-gradle.sh uploadSnykDependencyGraph -PsnykTargetReference=$BUILDKITE_BRANCH
587646
env:

‎.buildkite/pipelines/pull-request/part-4-entitlements.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ steps:
77
agents:
88
provider: gcp
99
image: family/elasticsearch-ubuntu-2004
10-
machineType: custom-32-98304
10+
machineType: n1-standard-32
1111
buildDirectory: /dev/shm/bk

‎.buildkite/pipelines/pull-request/part-4-fips.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ steps:
77
agents:
88
provider: gcp
99
image: family/elasticsearch-ubuntu-2004
10-
machineType: custom-32-98304
10+
machineType: n1-standard-32
1111
buildDirectory: /dev/shm/bk

‎.buildkite/pipelines/pull-request/part-4.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ steps:
77
agents:
88
provider: gcp
99
image: family/elasticsearch-ubuntu-2004
10-
machineType: custom-32-98304
10+
machineType: n1-standard-32
1111
buildDirectory: /dev/shm/bk

‎.buildkite/scripts/dra-workflow.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WORKFLOW="${DRA_WORKFLOW:-snapshot}"
66
BRANCH="${BUILDKITE_BRANCH:-}"
77

88
# Don't publish main branch to staging
9-
if [[ "$BRANCH" == *.x && "$WORKFLOW" == "staging" ]]; then
9+
if [[ ("$BRANCH" == "main" || "$BRANCH" == *.x) && "$WORKFLOW" == "staging" ]]; then
1010
exit 0
1111
fi
1212

0 commit comments

Comments
 (0)