Skip to content

Commit f24c821

Browse files
julian-elasticjulian-elastic
committed
Merge branch 'main' into generalExpressionJoin_v2
2 parents d348465 + 1af93e1 commit f24c821

File tree

2,191 files changed

+122793
-23882
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,191 files changed

+122793
-23882
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.7", "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: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ steps:
366366
- signal_reason: agent_stop
367367
limit: 3
368368

369-
- label: 8.19.7 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.7#bwcTest
369+
- label: 8.19.8 / bwc
370+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.8#bwcTest
371371
timeout_in_minutes: 300
372372
agents:
373373
provider: gcp
@@ -376,7 +376,7 @@ steps:
376376
buildDirectory: /dev/shm/bk
377377
preemptible: true
378378
env:
379-
BWC_VERSION: 8.19.7
379+
BWC_VERSION: 8.19.8
380380
retry:
381381
automatic:
382382
- exit_status: "-1"
@@ -385,8 +385,8 @@ steps:
385385
- signal_reason: agent_stop
386386
limit: 3
387387

388-
- label: 9.0.7 / bwc
389-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.7#bwcTest
388+
- label: 9.0.8 / bwc
389+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.8#bwcTest
390390
timeout_in_minutes: 300
391391
agents:
392392
provider: gcp
@@ -395,7 +395,7 @@ steps:
395395
buildDirectory: /dev/shm/bk
396396
preemptible: true
397397
env:
398-
BWC_VERSION: 9.0.7
398+
BWC_VERSION: 9.0.8
399399
retry:
400400
automatic:
401401
- exit_status: "-1"
@@ -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.7", "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: 13 additions & 12 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
@@ -335,8 +336,8 @@ steps:
335336
env:
336337
BWC_VERSION: 8.18.8
337338

338-
- label: "{{matrix.image}} / 8.19.7 / packaging-tests-upgrade"
339-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.7
339+
- label: "{{matrix.image}} / 8.19.8 / packaging-tests-upgrade"
340+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.8
340341
timeout_in_minutes: 300
341342
matrix:
342343
setup:
@@ -349,10 +350,10 @@ steps:
349350
machineType: custom-16-32768
350351
buildDirectory: /dev/shm/bk
351352
env:
352-
BWC_VERSION: 8.19.7
353+
BWC_VERSION: 8.19.8
353354

354-
- label: "{{matrix.image}} / 9.0.7 / packaging-tests-upgrade"
355-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.7
355+
- label: "{{matrix.image}} / 9.0.8 / packaging-tests-upgrade"
356+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
356357
timeout_in_minutes: 300
357358
matrix:
358359
setup:
@@ -365,10 +366,10 @@ steps:
365366
machineType: custom-16-32768
366367
buildDirectory: /dev/shm/bk
367368
env:
368-
BWC_VERSION: 9.0.7
369+
BWC_VERSION: 9.0.8
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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 8.19.7 / bwc
367-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.7#bwcTest
366+
- label: 8.19.8 / bwc
367+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.8#bwcTest
368368
timeout_in_minutes: 300
369369
agents:
370370
provider: gcp
@@ -373,7 +373,7 @@ steps:
373373
buildDirectory: /dev/shm/bk
374374
preemptible: true
375375
env:
376-
BWC_VERSION: 8.19.7
376+
BWC_VERSION: 8.19.8
377377
retry:
378378
automatic:
379379
- exit_status: "-1"
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.7 / bwc
386-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.0.7#bwcTest
385+
- label: 9.0.8 / bwc
386+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.0.8#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.7
395+
BWC_VERSION: 9.0.8
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -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.7", "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.7", "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

‎.buildkite/scripts/trigger-if-java-ea-new-build.sh‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
RECENT_TIME_WINDOW=${RECENT_TIME_WINDOW:-24}
1414

1515
# Extract current JDK major version from bundled_jdk in version.properties
16-
CURRENT_JDK=$(grep "^bundled_jdk =" build-tools-internal/version.properties | cut -d'=' -f2 | tr -d ' ' | cut -d'+' -f1)
16+
CURRENT_JDK=$(grep "^bundled_jdk =" build-tools-internal/version.properties | cut -d'=' -f2 | tr -d ' ' | cut -d'+' -f1 | cut -d'.' -f1)
1717
TARGET_JDK=$((CURRENT_JDK + 1))
1818

1919
echo "Current JDK major version: $CURRENT_JDK"
@@ -51,10 +51,6 @@ echo "Latest JDK ${TARGET_JDK} build from ES archive:"
5151
echo " Timestamp: $TIMESTAMP"
5252
echo " JDK Identifier: $JDK_IDENTIFIER"
5353

54-
# Set variables for use in the pipeline trigger
55-
jdkbuild="$JDK_IDENTIFIER"
56-
jdk_timestamp="$TIMESTAMP"
57-
5854
# Check if timestamp is within last 24 hours
5955
CURRENT_TIME=$(date +%s)
6056
BUILD_TIME=$(date -d "$TIMESTAMP" +%s 2>/dev/null || date -j -f "%Y-%m-%dT%H:%M:%S" "${TIMESTAMP%Z}" +%s 2>/dev/null || echo "0")

‎.ci/bwcVersions‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ BWC_VERSION:
1818
- "8.16.6"
1919
- "8.17.10"
2020
- "8.18.8"
21-
- "8.19.7"
22-
- "9.0.7"
23-
- "9.1.7"
24-
- "9.2.1"
21+
- "8.19.8"
22+
- "9.0.8"
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

0 commit comments

Comments
 (0)