Skip to content

Commit 94c7279

Browse files
pawankartik-elasticpawankartik-elastic
authored
Merge branch 'main' into pkar/fleet-search-disable-cross-cluster
2 parents 8019c58 + 9f78848 commit 94c7279

File tree

2,427 files changed

+49921
-15967
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,427 files changed

+49921
-15967
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.6", "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: 7 additions & 7 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"
@@ -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.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.9
398+
BWC_VERSION: 9.0.8
399399
retry:
400400
automatic:
401401
- 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.6", "9.1.6", "9.2.0", "9.3.0"]
542542
agents:
543543
provider: gcp
544544
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 6 additions & 6 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,7 +332,7 @@ 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

337337
- label: "{{matrix.image}} / 8.19.6 / packaging-tests-upgrade"
338338
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.6
@@ -350,8 +350,8 @@ steps:
350350
env:
351351
BWC_VERSION: 8.19.6
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.8 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
355355
timeout_in_minutes: 300
356356
matrix:
357357
setup:
@@ -364,7 +364,7 @@ steps:
364364
machineType: custom-16-32768
365365
buildDirectory: /dev/shm/bk
366366
env:
367-
BWC_VERSION: 9.0.9
367+
BWC_VERSION: 9.0.8
368368

369369
- label: "{{matrix.image}} / 9.1.6 / packaging-tests-upgrade"
370370
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.6

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 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"
@@ -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.8 / bwc
386+
command: .ci/scripts/run-gradle.sh -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.9
395+
BWC_VERSION: 9.0.8
396396
retry:
397397
automatic:
398398
- 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.6", "9.1.6", "9.2.0", "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.6", "9.1.6", "9.2.0", "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/generate-pr-performance-benchmark.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ steps:
4646
CONFIGURATION_NAME: ${GITHUB_PR_COMMENT_VAR_BENCHMARK}
4747
ENV_ID: ${env_id_baseline}
4848
REVISION: ${merge_base}
49+
BENCHMARK_TYPE: baseline
4950
- label: Trigger contender benchmark with ${GITHUB_PR_TRIGGERED_SHA:0:7}
5051
trigger: elasticsearch-performance-esbench-pr
5152
build:
@@ -56,6 +57,7 @@ steps:
5657
ENV_ID: ${env_id_contender}
5758
ES_REPO_URL: https://github.com/${GITHUB_PR_OWNER}/${GITHUB_PR_REPO}.git
5859
REVISION: ${GITHUB_PR_TRIGGERED_SHA}
60+
BENCHMARK_TYPE: contender
5961
- wait: ~
6062
- label: Update PR comment and Buildkite annotation
6163
command: |

‎.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: 2 additions & 2 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"
20+
- "8.18.8"
2121
- "8.19.6"
22-
- "9.0.9"
22+
- "9.0.8"
2323
- "9.1.6"
2424
- "9.2.0"
2525
- "9.3.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
BWC_VERSION:
2-
- "8.18.9"
32
- "8.19.6"
4-
- "9.0.9"
53
- "9.1.6"
64
- "9.2.0"
75
- "9.3.0"

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ build/
4646
**/.local*
4747
.vagrant/
4848
/logs/
49+
**/target/
4950

5051
# osx stuff
5152
.DS_Store

0 commit comments

Comments
 (0)