Skip to content

Commit 2e6a384

Browse files
prwhelanprwhelan
committed
Merge branch 'main' of github.com:elastic/elasticsearch into cps/indicesoptions
2 parents b187fa7 + fe8ba14 commit 2e6a384

File tree

1,891 files changed

+54341
-17021
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,891 files changed

+54341
-17021
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.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.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.2.0$" : "main",
6+
"^v9.3.0$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.buildkite/pipelines/cuvs-snapshot/run-tests.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
steps:
2+
- label: "{{matrix.GRADLE_TASK}}"
3+
command: .buildkite/scripts/cuvs-snapshot/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints {{matrix.GRADLE_TASK}}
4+
timeout_in_minutes: 300
5+
agents:
6+
provider: gcp
7+
image: family/elasticsearch-ubuntu-2404-nvidia
8+
machineType: g2-standard-32
9+
buildDirectory: /dev/shm/bk
10+
zones: us-central1-b,us-central1-c
11+
env:
12+
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
13+
matrix:
14+
setup:
15+
GRADLE_TASK:
16+
- checkPart1
17+
- checkPart2
18+
- checkPart3
19+
- checkPart4
20+
- checkPart5
21+
- checkPart6

‎.buildkite/pipelines/cuvs-snapshot/update-snapshot.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
steps:
2+
- label: "Smoke test and update new cuVS snapshot"
3+
command: .buildkite/scripts/cuvs-snapshot/update-current-snapshot-version.sh
4+
agents:
5+
provider: gcp
6+
image: family/elasticsearch-ubuntu-2404-nvidia
7+
machineType: g2-standard-16
8+
zones: us-central1-b,us-central1-c
9+
diskSizeGb: 150
10+
- wait: ~
11+
- trigger: "elasticsearch-cuvs-run-tests"
12+
build:
13+
branch: "${BUILDKITE_BRANCH}"
14+
async: true

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
68+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.6", "9.2.0", "9.3.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ steps:
404404
- signal_reason: agent_stop
405405
limit: 3
406406

407-
- label: 9.1.5 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.5#bwcTest
407+
- label: 9.1.6 / bwc
408+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.6#bwcTest
409409
timeout_in_minutes: 300
410410
agents:
411411
provider: gcp
@@ -414,7 +414,7 @@ steps:
414414
buildDirectory: /dev/shm/bk
415415
preemptible: true
416416
env:
417-
BWC_VERSION: 9.1.5
417+
BWC_VERSION: 9.1.6
418418
retry:
419419
automatic:
420420
- exit_status: "-1"
@@ -442,6 +442,25 @@ steps:
442442
- signal_reason: agent_stop
443443
limit: 3
444444

445+
- label: 9.3.0 / bwc
446+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.3.0#bwcTest
447+
timeout_in_minutes: 300
448+
agents:
449+
provider: gcp
450+
image: family/elasticsearch-ubuntu-2404
451+
machineType: n1-standard-32
452+
buildDirectory: /dev/shm/bk
453+
preemptible: true
454+
env:
455+
BWC_VERSION: 9.3.0
456+
retry:
457+
automatic:
458+
- exit_status: "-1"
459+
limit: 3
460+
signal_reason: none
461+
- signal_reason: agent_stop
462+
limit: 3
463+
445464
- label: concurrent-search-tests
446465
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
447466
timeout_in_minutes: 420
@@ -519,7 +538,7 @@ steps:
519538
timeout_in_minutes: 300
520539
matrix:
521540
setup:
522-
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
541+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.6", "9.2.0", "9.3.0"]
523542
agents:
524543
provider: gcp
525544
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ steps:
366366
env:
367367
BWC_VERSION: 9.0.8
368368

369-
- label: "{{matrix.image}} / 9.1.5 / packaging-tests-upgrade"
370-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.5
369+
- label: "{{matrix.image}} / 9.1.6 / packaging-tests-upgrade"
370+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.6
371371
timeout_in_minutes: 300
372372
matrix:
373373
setup:
@@ -380,7 +380,7 @@ steps:
380380
machineType: custom-16-32768
381381
buildDirectory: /dev/shm/bk
382382
env:
383-
BWC_VERSION: 9.1.5
383+
BWC_VERSION: 9.1.6
384384

385385
- label: "{{matrix.image}} / 9.2.0 / packaging-tests-upgrade"
386386
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.0
@@ -398,6 +398,22 @@ steps:
398398
env:
399399
BWC_VERSION: 9.2.0
400400

401+
- label: "{{matrix.image}} / 9.3.0 / packaging-tests-upgrade"
402+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.3.0
403+
timeout_in_minutes: 300
404+
matrix:
405+
setup:
406+
image:
407+
- rocky-8
408+
- ubuntu-2404
409+
agents:
410+
provider: gcp
411+
image: family/elasticsearch-{{matrix.image}}
412+
machineType: custom-16-32768
413+
buildDirectory: /dev/shm/bk
414+
env:
415+
BWC_VERSION: 9.3.0
416+
401417
- group: packaging-tests-windows
402418
steps:
403419
- label: "{{matrix.image}} / packaging-tests-windows"

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ steps:
401401
- signal_reason: agent_stop
402402
limit: 3
403403

404-
- label: 9.1.5 / bwc
405-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.5#bwcTest
404+
- label: 9.1.6 / bwc
405+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.6#bwcTest
406406
timeout_in_minutes: 300
407407
agents:
408408
provider: gcp
@@ -411,7 +411,7 @@ steps:
411411
buildDirectory: /dev/shm/bk
412412
preemptible: true
413413
env:
414-
BWC_VERSION: 9.1.5
414+
BWC_VERSION: 9.1.6
415415
retry:
416416
automatic:
417417
- exit_status: "-1"
@@ -439,6 +439,25 @@ steps:
439439
- signal_reason: agent_stop
440440
limit: 3
441441

442+
- label: 9.3.0 / bwc
443+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.3.0#bwcTest
444+
timeout_in_minutes: 300
445+
agents:
446+
provider: gcp
447+
image: family/elasticsearch-ubuntu-2404
448+
machineType: n1-standard-32
449+
buildDirectory: /dev/shm/bk
450+
preemptible: true
451+
env:
452+
BWC_VERSION: 9.3.0
453+
retry:
454+
automatic:
455+
- exit_status: "-1"
456+
limit: 3
457+
signal_reason: none
458+
- signal_reason: agent_stop
459+
limit: 3
460+
442461
- label: concurrent-search-tests
443462
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
444463
timeout_in_minutes: 420
@@ -506,7 +525,7 @@ steps:
506525
setup:
507526
ES_RUNTIME_JAVA:
508527
- openjdk21
509-
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
528+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.6", "9.2.0", "9.3.0"]
510529
agents:
511530
provider: gcp
512531
image: family/elasticsearch-ubuntu-2404
@@ -550,7 +569,7 @@ steps:
550569
ES_RUNTIME_JAVA:
551570
- openjdk21
552571
- openjdk23
553-
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5", "9.2.0"]
572+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.6", "9.2.0", "9.3.0"]
554573
agents:
555574
provider: gcp
556575
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/pull-request/.defaults.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
config:
2-
skip-labels: ">test-mute"
2+
skip-labels:
3+
- ">test-mute"
34
excluded-regions:
45
- ^docs/.*
56
- ^x-pack/docs/.*

‎.buildkite/pipelines/pull-request/bwc-snapshots.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,3 @@ steps:
7878
image: family/elasticsearch-ubuntu-2004
7979
machineType: n1-standard-32
8080
buildDirectory: /dev/shm/bk
81-

‎.buildkite/pipelines/pull-request/gpu.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
config:
2+
allow-labels: test-gpu
3+
skip-labels:
4+
- ">test-mute"
5+
steps:
6+
- group: gpu-tests
7+
steps:
8+
- label: "{{matrix.GRADLE_TASK}} / gpu-tests"
9+
key: "packaging-tests-unix"
10+
command: .buildkite/scripts/cuvs-snapshot/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints {{matrix.GRADLE_TASK}}
11+
timeout_in_minutes: 300
12+
agents:
13+
provider: gcp
14+
image: family/elasticsearch-ubuntu-2404-nvidia
15+
machineType: g2-standard-32
16+
buildDirectory: /dev/shm/bk
17+
zones: us-central1-b,us-central1-c
18+
env:
19+
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
20+
matrix:
21+
setup:
22+
GRADLE_TASK:
23+
- checkPart1
24+
- checkPart2
25+
- checkPart3
26+
- checkPart4
27+
- checkPart5
28+
- checkPart6

0 commit comments

Comments
 (0)