Skip to content

Commit b81d263

Browse files
richard-dennehyrichard-dennehy
committed
merge main
2 parents 6109ecb + aaa9202 commit b81d263

File tree

2,880 files changed

+65910
-19040
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,880 files changed

+65910
-19040
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.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
68+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ steps:
347347
- signal_reason: agent_stop
348348
limit: 3
349349

350-
- label: 8.18.9 / bwc
351-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.9#bwcTest
350+
- label: 8.18.8 / bwc
351+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.8#bwcTest
352352
timeout_in_minutes: 300
353353
agents:
354354
provider: gcp
@@ -357,7 +357,7 @@ steps:
357357
buildDirectory: /dev/shm/bk
358358
preemptible: true
359359
env:
360-
BWC_VERSION: 8.18.9
360+
BWC_VERSION: 8.18.8
361361
retry:
362362
automatic:
363363
- exit_status: "-1"
@@ -366,8 +366,8 @@ steps:
366366
- signal_reason: agent_stop
367367
limit: 3
368368

369-
- label: 8.19.6 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.6#bwcTest
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
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.6
379+
BWC_VERSION: 8.19.7
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.9 / bwc
389-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.9#bwcTest
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
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.9
398+
BWC_VERSION: 9.0.7
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.6 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.6#bwcTest
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
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.6
417+
BWC_VERSION: 9.1.7
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.0 / bwc
427-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.0#bwcTest
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
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.0
436+
BWC_VERSION: 9.2.1
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.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
541+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
542542
agents:
543543
provider: gcp
544544
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ steps:
318318
env:
319319
BWC_VERSION: 8.17.10
320320

321-
- label: "{{matrix.image}} / 8.18.9 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.9
321+
- label: "{{matrix.image}} / 8.18.8 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.8
323323
timeout_in_minutes: 300
324324
matrix:
325325
setup:
@@ -332,10 +332,10 @@ steps:
332332
machineType: custom-16-32768
333333
buildDirectory: /dev/shm/bk
334334
env:
335-
BWC_VERSION: 8.18.9
335+
BWC_VERSION: 8.18.8
336336

337-
- label: "{{matrix.image}} / 8.19.6 / packaging-tests-upgrade"
338-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.6
337+
- label: "{{matrix.image}} / 8.19.7 / packaging-tests-upgrade"
338+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.7
339339
timeout_in_minutes: 300
340340
matrix:
341341
setup:
@@ -348,10 +348,10 @@ steps:
348348
machineType: custom-16-32768
349349
buildDirectory: /dev/shm/bk
350350
env:
351-
BWC_VERSION: 8.19.6
351+
BWC_VERSION: 8.19.7
352352

353-
- label: "{{matrix.image}} / 9.0.9 / packaging-tests-upgrade"
354-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.9
353+
- label: "{{matrix.image}} / 9.0.7 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.7
355355
timeout_in_minutes: 300
356356
matrix:
357357
setup:
@@ -364,10 +364,10 @@ steps:
364364
machineType: custom-16-32768
365365
buildDirectory: /dev/shm/bk
366366
env:
367-
BWC_VERSION: 9.0.9
367+
BWC_VERSION: 9.0.7
368368

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

385-
- label: "{{matrix.image}} / 9.2.0 / packaging-tests-upgrade"
386-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.0
385+
- label: "{{matrix.image}} / 9.2.1 / packaging-tests-upgrade"
386+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.1
387387
timeout_in_minutes: 300
388388
matrix:
389389
setup:
@@ -396,7 +396,7 @@ steps:
396396
machineType: custom-16-32768
397397
buildDirectory: /dev/shm/bk
398398
env:
399-
BWC_VERSION: 9.2.0
399+
BWC_VERSION: 9.2.1
400400

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

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.9 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.9#bwcTest
347+
- label: 8.18.8 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.8#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.9
357+
BWC_VERSION: 8.18.8
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -363,8 +363,8 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 8.19.6 / bwc
367-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.6#bwcTest
366+
- label: 8.19.7 / bwc
367+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.7#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.6
376+
BWC_VERSION: 8.19.7
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.9 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.9#bwcTest
385+
- label: 9.0.7 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.7#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.9
395+
BWC_VERSION: 9.0.7
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.6 / bwc
405-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.6#bwcTest
404+
- label: 9.1.7 / bwc
405+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.7#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.6
414+
BWC_VERSION: 9.1.7
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.0 / bwc
424-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.2.0#bwcTest
423+
- label: 9.2.1 / bwc
424+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.2.1#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.0
433+
BWC_VERSION: 9.2.1
434434
retry:
435435
automatic:
436436
- exit_status: "-1"
@@ -525,7 +525,7 @@ steps:
525525
setup:
526526
ES_RUNTIME_JAVA:
527527
- openjdk21
528-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
528+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
529529
agents:
530530
provider: gcp
531531
image: family/elasticsearch-ubuntu-2404
@@ -569,7 +569,7 @@ steps:
569569
ES_RUNTIME_JAVA:
570570
- openjdk21
571571
- openjdk23
572-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6", "9.2.0", "9.3.0"]
572+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
573573
agents:
574574
provider: gcp
575575
image: family/elasticsearch-ubuntu-2404

‎.buildkite/scripts/dra-workflow.trigger.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,18 @@ for BRANCH in "${BRANCHES[@]}"; do
4646
DRA_WORKFLOW: staging
4747
VERSION_QUALIFIER: ${VERSION_QUALIFIER:-}
4848
EOF
49+
50+
if [ "$BRANCH" = "7.17" ]; then
51+
cat <<EOF
52+
- trigger: elasticsearch-dra-workflow
53+
label: Trigger DRA snapshot workflow for $BRANCH
54+
async: true
55+
build:
56+
branch: "$BRANCH"
57+
commit: "$LAST_GOOD_COMMIT"
58+
env:
59+
DRA_WORKFLOW: snapshot
60+
VERSION_QUALIFIER: ${VERSION_QUALIFIER:-}
61+
EOF
62+
fi
4963
done

‎.buildkite/scripts/periodic.trigger.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@ IS_FIRST=true
1111
SKIP_DELAY="${SKIP_DELAY:-false}"
1212

1313
for BRANCH in "${BRANCHES[@]}"; do
14+
# Removing 7.17 periodic branch builds
15+
if [[ $BRANCH == "7.17" ]];
16+
then
17+
continue;
18+
fi
1419
INTAKE_PIPELINE_SLUG="elasticsearch-intake"
1520
BUILD_JSON=$(curl -sH "Authorization: Bearer ${BUILDKITE_API_TOKEN}" "https://api.buildkite.com/v2/organizations/elastic/pipelines/${INTAKE_PIPELINE_SLUG}/builds?branch=${BRANCH}&state=passed&per_page=1" | jq '.[0] | {commit: .commit, url: .web_url}')
1621
LAST_GOOD_COMMIT=$(echo "${BUILD_JSON}" | jq -r '.commit')
1722

23+
1824
# Put a delay between each branch's set of pipelines by prepending each non-first branch with a sleep
1925
# This is to smooth out the spike in agent requests
2026
if [[ "$IS_FIRST" != "true" && "$SKIP_DELAY" != "true" ]]; then

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

Lines changed: 5 additions & 3 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)
1717
TARGET_JDK=$((CURRENT_JDK + 1))
1818

1919
echo "Current JDK major version: $CURRENT_JDK"
@@ -80,13 +80,13 @@ echo "SHOULD_TRIGGER: $SHOULD_TRIGGER"
8080

8181
if [[ "$SHOULD_TRIGGER" == "true" ]]; then
8282
EFFECTIVE_START_DATE=$(date -u -d "@$BUILD_TIME" +"%Y-%m-%dT%H:%M:%SZ" 2>/dev/null || date -u -r "$BUILD_TIME" +"%Y-%m-%dT%H:%M:%SZ" 2>/dev/null || echo "")
83-
83+
8484
# Use "master" branch for elasticsearch-performance-esbench-jdk when BUILDKITE_BRANCH is "main"
8585
TRIGGER_BRANCH="$BUILDKITE_BRANCH"
8686
if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
8787
TRIGGER_BRANCH="master"
8888
fi
89-
89+
9090
echo "Triggering performance-esbench-jdk for new jdk build $JDK_IDENTIFIER"
9191
cat << EOF | buildkite-agent pipeline upload
9292
steps:
@@ -98,5 +98,7 @@ steps:
9898
env:
9999
EFFECTIVE_START_DATE: "$EFFECTIVE_START_DATE"
100100
EXECUTION_MODE: "start-run"
101+
JDK_VERSION: "$TARGET_JDK"
102+
JDK_IDENTIFIER: "$JDK_IDENTIFIER"
101103
EOF
102104
fi

‎.ci/bwcVersions‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ BWC_VERSION:
1717
- "8.15.5"
1818
- "8.16.6"
1919
- "8.17.10"
20-
- "8.18.9"
21-
- "8.19.6"
22-
- "9.0.9"
23-
- "9.1.6"
24-
- "9.2.0"
20+
- "8.18.8"
21+
- "8.19.7"
22+
- "9.0.7"
23+
- "9.1.7"
24+
- "9.2.1"
2525
- "9.3.0"

0 commit comments

Comments
 (0)