Skip to content

Commit e158358

Browse files
craigtavernercraigtaverner
committed
Merge remote-tracking branch 'origin/main' into esql_grid_aggs
2 parents 5dde316 + 1ed0278 commit e158358

File tree

2,002 files changed

+73763
-24751
lines changed

Some content is hidden

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

2,002 files changed

+73763
-24751
lines changed

‎.backportrc.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"upstream" : "elastic/elasticsearch",
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" ],
3+
"targetBranchChoices" : [ "main", "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" : {
66
"^v9.1.0$" : "main",
7-
"^v8.19.0$" : "8.x",
87
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
98
}
109
}

‎.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.17.6", "8.18.1", "8.19.0", "9.0.1", "9.1.0"]
59+
BWC_VERSION: ["8.17.7", "8.18.2", "8.19.0", "9.0.2", "9.1.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ steps:
303303
env:
304304
BWC_VERSION: 8.16.6
305305

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

322-
- label: "{{matrix.image}} / 8.18.1 / packaging-tests-upgrade"
323-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.1
322+
- label: "{{matrix.image}} / 8.18.2 / packaging-tests-upgrade"
323+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.2
324324
timeout_in_minutes: 300
325325
matrix:
326326
setup:
@@ -333,7 +333,7 @@ steps:
333333
machineType: custom-16-32768
334334
buildDirectory: /dev/shm/bk
335335
env:
336-
BWC_VERSION: 8.18.1
336+
BWC_VERSION: 8.18.2
337337

338338
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
339339
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
@@ -351,8 +351,8 @@ steps:
351351
env:
352352
BWC_VERSION: 8.19.0
353353

354-
- label: "{{matrix.image}} / 9.0.1 / packaging-tests-upgrade"
355-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.1
354+
- label: "{{matrix.image}} / 9.0.2 / packaging-tests-upgrade"
355+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.2
356356
timeout_in_minutes: 300
357357
matrix:
358358
setup:
@@ -365,7 +365,7 @@ steps:
365365
machineType: custom-16-32768
366366
buildDirectory: /dev/shm/bk
367367
env:
368-
BWC_VERSION: 9.0.1
368+
BWC_VERSION: 9.0.2
369369

370370
- label: "{{matrix.image}} / 9.1.0 / packaging-tests-upgrade"
371371
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.0

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ steps:
7878
BWC_VERSION: "{{matrix.BWC_VERSION}}"
7979
- group: java-matrix
8080
steps:
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
81+
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
82+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
8383
timeout_in_minutes: 300
8484
matrix:
8585
setup:
@@ -94,9 +94,6 @@ steps:
9494
- checkPart4
9595
- checkPart5
9696
- checkRestCompat
97-
ENTITLEMENTS_ENABLED:
98-
- "true"
99-
- "false"
10097
agents:
10198
provider: gcp
10299
image: family/elasticsearch-ubuntu-2004
@@ -105,7 +102,6 @@ steps:
105102
env:
106103
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
107104
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
108-
ENTITLEMENTS_ENABLED: "{{matrix.ENTITLEMENTS_ENABLED}}"
109105
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
110106
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
111107
timeout_in_minutes: 300
@@ -237,7 +233,7 @@ steps:
237233
image: family/elasticsearch-ubuntu-2004
238234
machineType: n2-standard-8
239235
buildDirectory: /dev/shm/bk
240-
if: build.branch == "main" || build.branch == "8.x" || build.branch == "7.17"
236+
if: build.branch == "main" || build.branch == "8.19" || build.branch == "7.17"
241237
- label: check-branch-consistency
242238
command: .ci/scripts/run-gradle.sh branchConsistency
243239
timeout_in_minutes: 15

‎.buildkite/pipelines/periodic.yml‎

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

328-
- label: 8.17.6 / bwc
329-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.6#bwcTest
328+
- label: 8.17.7 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.7#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.6
338+
BWC_VERSION: 8.17.7
339339
retry:
340340
automatic:
341341
- exit_status: "-1"
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.1 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.1#bwcTest
347+
- label: 8.18.2 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.2#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.1
357+
BWC_VERSION: 8.18.2
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.1 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.1#bwcTest
385+
- label: 9.0.2 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.2#bwcTest
387387
timeout_in_minutes: 300
388388
agents:
389389
provider: gcp
@@ -392,7 +392,7 @@ steps:
392392
buildDirectory: /dev/shm/bk
393393
preemptible: true
394394
env:
395-
BWC_VERSION: 9.0.1
395+
BWC_VERSION: 9.0.2
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -486,7 +486,7 @@ steps:
486486
setup:
487487
ES_RUNTIME_JAVA:
488488
- openjdk21
489-
BWC_VERSION: ["8.17.6", "8.18.1", "8.19.0", "9.0.1", "9.1.0"]
489+
BWC_VERSION: ["8.17.7", "8.18.2", "8.19.0", "9.0.2", "9.1.0"]
490490
agents:
491491
provider: gcp
492492
image: family/elasticsearch-ubuntu-2004
@@ -497,8 +497,8 @@ steps:
497497
BWC_VERSION: "{{matrix.BWC_VERSION}}"
498498
- group: java-matrix
499499
steps:
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
500+
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"
501+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $$GRADLE_TASK
502502
timeout_in_minutes: 300
503503
matrix:
504504
setup:
@@ -513,9 +513,6 @@ steps:
513513
- checkPart4
514514
- checkPart5
515515
- checkRestCompat
516-
ENTITLEMENTS_ENABLED:
517-
- "true"
518-
- "false"
519516
agents:
520517
provider: gcp
521518
image: family/elasticsearch-ubuntu-2004
@@ -524,7 +521,6 @@ steps:
524521
env:
525522
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
526523
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
527-
ENTITLEMENTS_ENABLED: "{{matrix.ENTITLEMENTS_ENABLED}}"
528524
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-matrix-bwc"
529525
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
530526
timeout_in_minutes: 300
@@ -533,7 +529,7 @@ steps:
533529
ES_RUNTIME_JAVA:
534530
- openjdk21
535531
- openjdk23
536-
BWC_VERSION: ["8.17.6", "8.18.1", "8.19.0", "9.0.1", "9.1.0"]
532+
BWC_VERSION: ["8.17.7", "8.18.2", "8.19.0", "9.0.2", "9.1.0"]
537533
agents:
538534
provider: gcp
539535
image: family/elasticsearch-ubuntu-2004
@@ -656,7 +652,7 @@ steps:
656652
image: family/elasticsearch-ubuntu-2004
657653
machineType: n2-standard-8
658654
buildDirectory: /dev/shm/bk
659-
if: build.branch == "main" || build.branch == "8.x" || build.branch == "7.17"
655+
if: build.branch == "main" || build.branch == "8.19" || build.branch == "7.17"
660656
- label: check-branch-consistency
661657
command: .ci/scripts/run-gradle.sh branchConsistency
662658
timeout_in_minutes: 15

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)