Skip to content

Commit 69b143b

Browse files
prdoyleprdoyle
authored
Merge branch 'main' into suppress-awt
2 parents eda5ac1 + b1aa31a commit 69b143b

File tree

133 files changed

+1770
-935
lines changed

Some content is hidden

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

133 files changed

+1770
-935
lines changed

‎.backportrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "9.2", "9.1", "9.0", "8.19", "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" ],
3+
"targetBranchChoices" : [ "main", "9.3", "9.2", "9.1", "9.0", "8.19", "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.3.0$" : "main",
6+
"^v9.4.0$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: []
13+
FWC_VERSION: ["9.4.0"]
1414
env:
1515
FWC_VERSION: "{{matrix.FWC_VERSION}}"

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,25 @@ steps:
461461
- signal_reason: agent_stop
462462
limit: 3
463463

464+
- label: 9.4.0 / bwc
465+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.4.0#bwcTest
466+
timeout_in_minutes: 300
467+
agents:
468+
provider: gcp
469+
image: family/elasticsearch-ubuntu-2404
470+
machineType: n1-standard-32
471+
buildDirectory: /dev/shm/bk
472+
preemptible: true
473+
env:
474+
BWC_VERSION: 9.4.0
475+
retry:
476+
automatic:
477+
- exit_status: "-1"
478+
limit: 3
479+
signal_reason: none
480+
- signal_reason: agent_stop
481+
limit: 3
482+
464483
- label: concurrent-search-tests
465484
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
466485
timeout_in_minutes: 420

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,22 @@ steps:
416416
env:
417417
BWC_VERSION: 9.3.0
418418

419+
- label: "{{matrix.image}} / 9.4.0 / packaging-tests-upgrade"
420+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.4.0
421+
timeout_in_minutes: 300
422+
matrix:
423+
setup:
424+
image:
425+
- rocky-8
426+
- ubuntu-2404
427+
agents:
428+
provider: gcp
429+
image: family/elasticsearch-{{matrix.image}}
430+
machineType: custom-16-32768
431+
buildDirectory: /dev/shm/bk
432+
env:
433+
BWC_VERSION: 9.4.0
434+
419435
- group: packaging-tests-windows
420436
steps:
421437
- label: "{{matrix.image}} / packaging-tests-windows"

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 53 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
# This file is auto-generated. See .buildkite/pipelines/periodic.template.yml
2+
# Smart Retries Configuration
3+
# SMART_RETRIES=true enables intelligent test filtering on retry attempts.
4+
# The pre-command hook fetches failed test history from Develocity API and
5+
# the InternalTestRerunPlugin filters test execution to only run previously failed tests.
6+
#
7+
# Retry Strategy:
8+
# - exit_status "-1": Agent/infrastructure failures (3 retries)
9+
# - signal_reason agent_stop: Agent stops (3 retries)
10+
# - exit_status "1": Test/build failures (1 retry with smart filtering)
11+
#
12+
# Note: exit_status "1" retries all failures including configuration errors.
13+
# Future improvement: Implement distinct exit codes for different failure types.
214
env:
315
SMART_RETRIES: "true"
416
steps:
@@ -508,6 +520,27 @@ steps:
508520
- exit_status: "1"
509521
limit: 1
510522

523+
- label: 9.4.0 / bwc
524+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.4.0#bwcTest
525+
timeout_in_minutes: 300
526+
agents:
527+
provider: gcp
528+
image: family/elasticsearch-ubuntu-2404
529+
machineType: n1-standard-32
530+
buildDirectory: /dev/shm/bk
531+
preemptible: true
532+
env:
533+
BWC_VERSION: 9.4.0
534+
retry:
535+
automatic:
536+
- exit_status: "-1"
537+
limit: 3
538+
signal_reason: none
539+
- signal_reason: agent_stop
540+
limit: 3
541+
- exit_status: "1"
542+
limit: 1
543+
511544
- label: concurrent-search-tests
512545
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
513546
timeout_in_minutes: 420
@@ -581,6 +614,10 @@ steps:
581614
limit: 3
582615
- exit_status: "1"
583616
limit: 1
617+
manual:
618+
allowed: true
619+
permit_on_passed: false
620+
reason: "Retry with smart test selection if desired"
584621
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-fips-matrix-bwc"
585622
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.fips.enabled=true v$$BWC_VERSION#bwcTest
586623
timeout_in_minutes: 300
@@ -597,7 +634,19 @@ steps:
597634
env:
598635
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
599636
BWC_VERSION: "{{matrix.BWC_VERSION}}"
600-
637+
retry:
638+
automatic:
639+
- exit_status: "-1"
640+
limit: 3
641+
signal_reason: none
642+
- signal_reason: agent_stop
643+
limit: 3
644+
- exit_status: "1"
645+
limit: 1
646+
manual:
647+
allowed: true
648+
permit_on_passed: false
649+
reason: "Retry with smart test selection if desired"
601650
- group: java-matrix
602651
steps:
603652
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
@@ -624,15 +673,7 @@ steps:
624673
env:
625674
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
626675
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
627-
retry:
628-
automatic:
629-
- exit_status: "-1"
630-
limit: 3
631-
signal_reason: none
632-
- signal_reason: agent_stop
633-
limit: 3
634-
- exit_status: "1"
635-
limit: 1
676+
636677
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
637678
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
638679
timeout_in_minutes: 300
@@ -650,15 +691,7 @@ steps:
650691
env:
651692
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
652693
BWC_VERSION: "{{matrix.BWC_VERSION}}"
653-
retry:
654-
automatic:
655-
- exit_status: "-1"
656-
limit: 3
657-
signal_reason: none
658-
- signal_reason: agent_stop
659-
limit: 3
660-
- exit_status: "1"
661-
limit: 1
694+
662695
- label: release-tests
663696
command: .buildkite/scripts/release-tests.sh
664697
timeout_in_minutes: 360
@@ -791,15 +824,7 @@ steps:
791824
env:
792825
ES_VERSION: "{{matrix.ES_VERSION}}"
793826
ES_COMMIT: "{{matrix.ES_COMMIT}}"
794-
retry:
795-
automatic:
796-
- exit_status: "-1"
797-
limit: 3
798-
signal_reason: none
799-
- signal_reason: agent_stop
800-
limit: 3
801-
- exit_status: "1"
802-
limit: 1
827+
803828
- label: Upload Snyk Dependency Graph
804829
command: .ci/scripts/run-gradle.sh uploadSnykDependencyGraph -PsnykTargetReference=$BUILDKITE_BRANCH
805830
env:

‎.ci/bwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ BWC_VERSION:
2323
- "9.1.9"
2424
- "9.2.3"
2525
- "9.3.0"
26+
- "9.4.0"

‎branches.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
"branches" : [
44
{
55
"branch" : "main",
6+
"version" : "9.4.0"
7+
},
8+
{
9+
"branch" : "9.3",
610
"version" : "9.3.0"
711
},
812
{

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 9.3.0
1+
elasticsearch = 9.4.0
22
lucene = 10.3.2
33

44
bundled_jdk_vendor = openjdk

‎docs/changelog/138611.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138611
2+
summary: "More actionable `PUT /{index}/_settings` error"
3+
area: Indices APIs
4+
type: enhancement
5+
issues: []

‎docs/changelog/139540.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 139540
2+
summary: ES|QL - Add parsing, preanalysis and analysis timing information to profile
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)