Skip to content

Commit e61dbd8

Browse files
idegtiarenkoidegtiarenko
committed
Merge branch 'main' into reuse_groupped_indices
# Conflicts: # server/src/main/resources/transport/upper_bounds/9.3.csv # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlExecutionInfo.java
2 parents de65409 + 44ff2de commit e61dbd8

File tree

136 files changed

+4183
-727
lines changed

Some content is hidden

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

136 files changed

+4183
-727
lines changed

‎.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.19.8", "9.1.7", "9.2.1", "9.3.0"]
68+
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 7 additions & 7 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.7 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.7#bwcTest
407+
- label: 9.1.8 / bwc
408+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.8#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.7
417+
BWC_VERSION: 9.1.8
418418
retry:
419419
automatic:
420420
- exit_status: "-1"
@@ -423,8 +423,8 @@ steps:
423423
- signal_reason: agent_stop
424424
limit: 3
425425

426-
- label: 9.2.1 / bwc
427-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.1#bwcTest
426+
- label: 9.2.2 / bwc
427+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.2#bwcTest
428428
timeout_in_minutes: 300
429429
agents:
430430
provider: gcp
@@ -433,7 +433,7 @@ steps:
433433
buildDirectory: /dev/shm/bk
434434
preemptible: true
435435
env:
436-
BWC_VERSION: 9.2.1
436+
BWC_VERSION: 9.2.2
437437
retry:
438438
automatic:
439439
- exit_status: "-1"
@@ -538,7 +538,7 @@ steps:
538538
timeout_in_minutes: 300
539539
matrix:
540540
setup:
541-
BWC_VERSION: ["8.19.8", "9.1.7", "9.2.1", "9.3.0"]
541+
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
542542
agents:
543543
provider: gcp
544544
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ steps:
88
setup:
99
image:
1010
- debian-12
11+
- debian-13
1112
- opensuse-leap-15
1213
- oraclelinux-8
1314
- oraclelinux-9

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ steps:
99
setup:
1010
image:
1111
- debian-12
12+
- debian-13
1213
- opensuse-leap-15
1314
- oraclelinux-8
1415
- oraclelinux-9
@@ -367,8 +368,8 @@ steps:
367368
env:
368369
BWC_VERSION: 9.0.7
369370

370-
- label: "{{matrix.image}} / 9.1.7 / packaging-tests-upgrade"
371-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.7
371+
- label: "{{matrix.image}} / 9.1.8 / packaging-tests-upgrade"
372+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.8
372373
timeout_in_minutes: 300
373374
matrix:
374375
setup:
@@ -381,10 +382,10 @@ steps:
381382
machineType: custom-16-32768
382383
buildDirectory: /dev/shm/bk
383384
env:
384-
BWC_VERSION: 9.1.7
385+
BWC_VERSION: 9.1.8
385386

386-
- label: "{{matrix.image}} / 9.2.1 / packaging-tests-upgrade"
387-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.1
387+
- label: "{{matrix.image}} / 9.2.2 / packaging-tests-upgrade"
388+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.2
388389
timeout_in_minutes: 300
389390
matrix:
390391
setup:
@@ -397,7 +398,7 @@ steps:
397398
machineType: custom-16-32768
398399
buildDirectory: /dev/shm/bk
399400
env:
400-
BWC_VERSION: 9.2.1
401+
BWC_VERSION: 9.2.2
401402

402403
- label: "{{matrix.image}} / 9.3.0 / packaging-tests-upgrade"
403404
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.3.0

‎.buildkite/pipelines/periodic-platform-support.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ steps:
88
setup:
99
image:
1010
- debian-12
11+
- debian-13
1112
- opensuse-leap-15
1213
- oraclelinux-8
1314
- oraclelinux-9

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 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.7 / bwc
405-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.7#bwcTest
404+
- label: 9.1.8 / bwc
405+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.8#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.7
414+
BWC_VERSION: 9.1.8
415415
retry:
416416
automatic:
417417
- exit_status: "-1"
@@ -420,8 +420,8 @@ steps:
420420
- signal_reason: agent_stop
421421
limit: 3
422422

423-
- label: 9.2.1 / bwc
424-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.1#bwcTest
423+
- label: 9.2.2 / bwc
424+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.2#bwcTest
425425
timeout_in_minutes: 300
426426
agents:
427427
provider: gcp
@@ -430,7 +430,7 @@ steps:
430430
buildDirectory: /dev/shm/bk
431431
preemptible: true
432432
env:
433-
BWC_VERSION: 9.2.1
433+
BWC_VERSION: 9.2.2
434434
retry:
435435
automatic:
436436
- exit_status: "-1"
@@ -530,7 +530,7 @@ steps:
530530
setup:
531531
ES_RUNTIME_JAVA:
532532
- openjdk21
533-
BWC_VERSION: ["8.19.8", "9.1.7", "9.2.1", "9.3.0"]
533+
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
534534
agents:
535535
provider: gcp
536536
image: family/elasticsearch-ubuntu-2404
@@ -576,7 +576,7 @@ steps:
576576
ES_RUNTIME_JAVA:
577577
- openjdk21
578578
- openjdk23
579-
BWC_VERSION: ["8.19.8", "9.1.7", "9.2.1", "9.3.0"]
579+
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
580580
agents:
581581
provider: gcp
582582
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/pull-request/packaging-tests-unix.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ steps:
1111
setup:
1212
image:
1313
- debian-12
14+
- debian-13
1415
- opensuse-leap-15
1516
- oraclelinux-8
1617
- oraclelinux-9

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ BWC_VERSION:
2020
- "8.18.8"
2121
- "8.19.8"
2222
- "9.0.7"
23-
- "9.1.7"
24-
- "9.2.1"
23+
- "9.1.8"
24+
- "9.2.2"
2525
- "9.3.0"

‎.ci/scripts/packaging-test.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,15 @@ sudo bash -c 'cat > /etc/sudoers.d/elasticsearch_vars' << SUDOERS_VARS
6161
SUDOERS_VARS
6262
sudo chmod 0440 /etc/sudoers.d/elasticsearch_vars
6363

64-
# Bats tests still use this locationa
64+
# Bats tests still use this location
6565
sudo rm -Rf /elasticsearch
6666
sudo mkdir -p /elasticsearch/qa/ && sudo chown jenkins /elasticsearch/qa/ && ln -s $PWD/qa/vagrant /elasticsearch/qa/
6767

68+
#
69+
if [[ -z "${WORKSPACE}" ]]; then
70+
WORKSPACE=$(pwd)
71+
fi
72+
6873
# Ensure since we're running as root that we can do git operations in this directory
6974
# See: https://git-scm.com/docs/git-config/2.35.2#Documentation/git-config.txt-safedirectory
7075
git config --global --add safe.directory $WORKSPACE

‎.ci/snapshotBwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BWC_VERSION:
22
- "8.19.8"
3-
- "9.1.7"
4-
- "9.2.1"
3+
- "9.1.8"
4+
- "9.2.2"
55
- "9.3.0"

0 commit comments

Comments
 (0)