Skip to content

Commit 3569a16

Browse files
luigidellaquilaluigidellaquila
committed
Merge branch 'main' into esql/remove_redundant_sort
2 parents 937e0dc + a896779 commit 3569a16

File tree

109 files changed

+4159
-2364
lines changed

Some content is hidden

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

109 files changed

+4159
-2364
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.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.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

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

Lines changed: 40 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
@@ -490,7 +528,7 @@ steps:
490528
ES_RUNTIME_JAVA:
491529
- openjdk21
492530
- openjdk23
493-
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
531+
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"]
494532
agents:
495533
provider: gcp
496534
image: family/elasticsearch-ubuntu-2004

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

‎branches.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
{
88
"branch": "8.16"
99
},
10+
{
11+
"branch": "9.0"
12+
},
13+
{
14+
"branch": "8.18"
15+
},
1016
{
1117
"branch": "8.17"
1218
},

‎build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ include ":distribution:bwc:bugfix2"
1414
include ":distribution:bwc:minor"
1515
include ":distribution:bwc:major"
1616
include ":distribution:bwc:staged"
17+
include ":distribution:bwc:staged2"
1718
include ":distribution:bwc:maintenance"
1819
include ":distribution:archives:darwin-tar"
1920
include ":distribution:archives:oss-darwin-tar"

0 commit comments

Comments
 (0)