Skip to content

Commit 5010e97

Browse files
elasticmachineelasticmachine
authored
Merge branch 'main' into carlosdelest/identify-system-threads
2 parents 2adabf0 + 64ae0ae commit 5010e97

File tree

528 files changed

+9002
-7599
lines changed

Some content is hidden

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

528 files changed

+9002
-7599
lines changed

‎.backportrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "8.x", "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", "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" : {
66
"^v9.0.0$" : "main",
7-
"^v8.16.0$" : "8.x",
7+
"^v8.17.0$" : "8.x",
88
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
99
}
1010
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ steps:
7575
- trigger: elasticsearch-dra-workflow
7676
label: Trigger DRA snapshot workflow
7777
async: true
78+
branches: "main 8.* 7.17"
7879
build:
7980
branch: "$BUILDKITE_BRANCH"
8081
commit: "$BUILDKITE_COMMIT"

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
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.15.3", "8.16.0", "9.0.0"]
59+
BWC_VERSION: ["8.15.3", "8.16.0", "8.17.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,22 @@ steps:
304304
env:
305305
BWC_VERSION: 8.16.0
306306

307+
- label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
308+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0
309+
timeout_in_minutes: 300
310+
matrix:
311+
setup:
312+
image:
313+
- rocky-8
314+
- ubuntu-2004
315+
agents:
316+
provider: gcp
317+
image: family/elasticsearch-{{matrix.image}}
318+
machineType: custom-16-32768
319+
buildDirectory: /dev/shm/bk
320+
env:
321+
BWC_VERSION: 8.17.0
322+
307323
- label: "{{matrix.image}} / 9.0.0 / packaging-tests-upgrade"
308324
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.0
309325
timeout_in_minutes: 300

‎.buildkite/pipelines/periodic.yml‎

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

328+
- label: 8.17.0 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.0#bwcTest
330+
timeout_in_minutes: 300
331+
agents:
332+
provider: gcp
333+
image: family/elasticsearch-ubuntu-2004
334+
machineType: n1-standard-32
335+
buildDirectory: /dev/shm/bk
336+
preemptible: true
337+
env:
338+
BWC_VERSION: 8.17.0
339+
retry:
340+
automatic:
341+
- exit_status: "-1"
342+
limit: 3
343+
signal_reason: none
344+
- signal_reason: agent_stop
345+
limit: 3
346+
328347
- label: 9.0.0 / bwc
329348
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.0#bwcTest
330349
timeout_in_minutes: 300
@@ -410,7 +429,7 @@ steps:
410429
setup:
411430
ES_RUNTIME_JAVA:
412431
- openjdk21
413-
BWC_VERSION: ["8.15.3", "8.16.0", "9.0.0"]
432+
BWC_VERSION: ["8.15.3", "8.16.0", "8.17.0", "9.0.0"]
414433
agents:
415434
provider: gcp
416435
image: family/elasticsearch-ubuntu-2004
@@ -452,7 +471,7 @@ steps:
452471
ES_RUNTIME_JAVA:
453472
- openjdk21
454473
- openjdk23
455-
BWC_VERSION: ["8.15.3", "8.16.0", "9.0.0"]
474+
BWC_VERSION: ["8.15.3", "8.16.0", "8.17.0", "9.0.0"]
456475
agents:
457476
provider: gcp
458477
image: family/elasticsearch-ubuntu-2004
@@ -554,7 +573,7 @@ steps:
554573
image: family/elasticsearch-ubuntu-2004
555574
machineType: n2-standard-8
556575
buildDirectory: /dev/shm/bk
557-
if: build.branch == "main" || build.branch == "7.17"
576+
if: build.branch == "main" || build.branch == "8.x" || build.branch == "7.17"
558577
- label: check-branch-consistency
559578
command: .ci/scripts/run-gradle.sh branchConsistency
560579
timeout_in_minutes: 15

‎.ci/bwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ BWC_VERSION:
1616
- "8.14.3"
1717
- "8.15.3"
1818
- "8.16.0"
19+
- "8.17.0"
1920
- "9.0.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
BWC_VERSION:
22
- "8.15.3"
33
- "8.16.0"
4+
- "8.17.0"
45
- "9.0.0"

‎branches.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
{
55
"branch": "main"
66
},
7+
{
8+
"branch": "8.16"
9+
},
710
{
811
"branch": "8.x"
912
},

‎docs/changelog/113237.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 113237
2+
summary: Retry throttled snapshot deletions
3+
area: Snapshot/Restore
4+
type: bug
5+
issues: []

‎docs/changelog/114271.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114271
2+
summary: "[ES|QL] Skip validating remote cluster index names in parser"
3+
area: ES|QL
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)