Skip to content

Commit b70d222

Browse files
eyalkoreneyalkoren
committed
Merge remote-tracking branch 'upstream/main' into support-dotted-fields-in-ingest-processors
2 parents 03a216b + 24bc9fa commit b70d222

File tree

1,838 files changed

+28502
-15657
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,838 files changed

+28502
-15657
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: 22 additions & 1 deletion
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
@@ -75,7 +96,7 @@ steps:
7596
- trigger: elasticsearch-dra-workflow
7697
label: Trigger DRA snapshot workflow
7798
async: true
78-
branches: "main 8.* 7.17"
99+
branches: "main 9.* 8.* 7.17"
79100
build:
80101
branch: "$BUILDKITE_BRANCH"
81102
commit: "$BUILDKITE_COMMIT"

‎.buildkite/pipelines/intake.yml‎

Lines changed: 23 additions & 2 deletions
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
@@ -76,7 +97,7 @@ steps:
7697
- trigger: elasticsearch-dra-workflow
7798
label: Trigger DRA snapshot workflow
7899
async: true
79-
branches: "main 8.* 7.17"
100+
branches: "main 9.* 8.* 7.17"
80101
build:
81102
branch: "$BUILDKITE_BRANCH"
82103
commit: "$BUILDKITE_COMMIT"

‎.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: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ steps:
8686
ES_RUNTIME_JAVA:
8787
- openjdk21
8888
- openjdk23
89+
- openjdk24
8990
GRADLE_TASK:
9091
- checkPart1
9192
- checkPart2
@@ -201,6 +202,27 @@ steps:
201202
image: family/elasticsearch-ubuntu-2004
202203
machineType: n2-standard-8
203204
buildDirectory: /dev/shm/bk
205+
- group: lucene-compat
206+
steps:
207+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
208+
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
209+
timeout_in_minutes: 300
210+
matrix:
211+
setup:
212+
LUCENE_VERSION:
213+
- "10.0.0"
214+
ES_VERSION:
215+
- "9.0.0"
216+
ES_COMMIT:
217+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
218+
agents:
219+
provider: gcp
220+
image: family/elasticsearch-ubuntu-2004
221+
machineType: custom-32-98304
222+
buildDirectory: /dev/shm/bk
223+
env:
224+
ES_VERSION: "{{matrix.ES_VERSION}}"
225+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
204226
- label: Upload Snyk Dependency Graph
205227
command: .ci/scripts/run-gradle.sh uploadSnykDependencyGraph -PsnykTargetReference=$BUILDKITE_BRANCH
206228
env:

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 62 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
@@ -467,6 +505,7 @@ steps:
467505
ES_RUNTIME_JAVA:
468506
- openjdk21
469507
- openjdk23
508+
- openjdk24
470509
GRADLE_TASK:
471510
- checkPart1
472511
- checkPart2
@@ -490,7 +529,7 @@ steps:
490529
ES_RUNTIME_JAVA:
491530
- openjdk21
492531
- openjdk23
493-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
532+
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
494533
agents:
495534
provider: gcp
496535
image: family/elasticsearch-ubuntu-2004
@@ -582,6 +621,27 @@ steps:
582621
image: family/elasticsearch-ubuntu-2004
583622
machineType: n2-standard-8
584623
buildDirectory: /dev/shm/bk
624+
- group: lucene-compat
625+
steps:
626+
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"
627+
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
628+
timeout_in_minutes: 300
629+
matrix:
630+
setup:
631+
LUCENE_VERSION:
632+
- "10.0.0"
633+
ES_VERSION:
634+
- "9.0.0"
635+
ES_COMMIT:
636+
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
637+
agents:
638+
provider: gcp
639+
image: family/elasticsearch-ubuntu-2004
640+
machineType: custom-32-98304
641+
buildDirectory: /dev/shm/bk
642+
env:
643+
ES_VERSION: "{{matrix.ES_VERSION}}"
644+
ES_COMMIT: "{{matrix.ES_COMMIT}}"
585645
- label: Upload Snyk Dependency Graph
586646
command: .ci/scripts/run-gradle.sh uploadSnykDependencyGraph -PsnykTargetReference=$BUILDKITE_BRANCH
587647
env:

‎.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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ echo "steps:"
77
source .buildkite/scripts/branches.sh
88

99
for BRANCH in "${BRANCHES[@]}"; do
10-
if [[ "$BRANCH" == "main" ]]; then
11-
export VERSION_QUALIFIER="alpha1"
10+
if [[ "$BRANCH" == "9.0" ]]; then
11+
export VERSION_QUALIFIER="beta1"
1212
fi
1313

1414
INTAKE_PIPELINE_SLUG="elasticsearch-intake"

‎.ci/bwcVersions‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ BWC_VERSION:
1818
- "8.16.4"
1919
- "8.17.2"
2020
- "8.18.0"
21+
- "8.19.0"
2122
- "9.0.0"
23+
- "9.1.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ BWC_VERSION:
22
- "8.16.4"
33
- "8.17.2"
44
- "8.18.0"
5+
- "8.19.0"
56
- "9.0.0"
7+
- "9.1.0"

0 commit comments

Comments
 (0)