Skip to content

Commit af74770

Browse files
arteamarteam
committed
Merge remote-tracking branch 'origin/main' into remove-snapshot-failures
2 parents e3c9fc1 + 4bbedb8 commit af74770

File tree

2,416 files changed

+59507
-22975
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,416 files changed

+59507
-22975
lines changed

‎.backportrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "8.x", "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", "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" : {
66
"^v9.0.0$" : "main",
7-
"^v8.16.0$" : "8.x",
7+
"^v8.17.0$" : "8.x",
88
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
99
}
1010
}

‎.buildkite/hooks/pre-command‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ export COMPOSE_HTTP_TIMEOUT
1616
JOB_BRANCH="$BUILDKITE_BRANCH"
1717
export JOB_BRANCH
1818

19-
GRADLEW="./gradlew --parallel --scan --build-cache --no-watch-fs -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/"
19+
GRADLEW="./gradlew --console=plain --parallel --scan --build-cache --no-watch-fs -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/"
2020
export GRADLEW
2121

22-
GRADLEW_BAT="./gradlew.bat --parallel --scan --build-cache --no-watch-fs -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/"
22+
GRADLEW_BAT="./gradlew.bat --console=plain --parallel --scan --build-cache --no-watch-fs -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/"
2323
export GRADLEW_BAT
2424

2525
export $(cat .ci/java-versions.properties | grep '=' | xargs)

‎.buildkite/pipelines/intake.template.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ steps:
7575
- trigger: elasticsearch-dra-workflow
7676
label: Trigger DRA snapshot workflow
7777
async: true
78+
branches: "main 8.* 7.17"
7879
build:
7980
branch: "$BUILDKITE_BRANCH"
8081
commit: "$BUILDKITE_COMMIT"

‎.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.15.3", "8.16.0", "9.0.0"]
59+
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

‎.buildkite/pipelines/lucene-snapshot/run-tests.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ steps:
5656
matrix:
5757
setup:
5858
BWC_VERSION:
59-
- 7.17.13
6059
- 8.9.1
6160
- 8.10.0
6261
agents:

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ steps:
272272
env:
273273
BWC_VERSION: 8.14.3
274274

275-
- label: "{{matrix.image}} / 8.15.3 / packaging-tests-upgrade"
276-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.3
275+
- label: "{{matrix.image}} / 8.15.4 / packaging-tests-upgrade"
276+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.4
277277
timeout_in_minutes: 300
278278
matrix:
279279
setup:
@@ -286,7 +286,7 @@ steps:
286286
machineType: custom-16-32768
287287
buildDirectory: /dev/shm/bk
288288
env:
289-
BWC_VERSION: 8.15.3
289+
BWC_VERSION: 8.15.4
290290

291291
- label: "{{matrix.image}} / 8.16.0 / packaging-tests-upgrade"
292292
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.0
@@ -304,6 +304,22 @@ steps:
304304
env:
305305
BWC_VERSION: 8.16.0
306306

307+
- label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
308+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0
309+
timeout_in_minutes: 300
310+
matrix:
311+
setup:
312+
image:
313+
- rocky-8
314+
- ubuntu-2004
315+
agents:
316+
provider: gcp
317+
image: family/elasticsearch-{{matrix.image}}
318+
machineType: custom-16-32768
319+
buildDirectory: /dev/shm/bk
320+
env:
321+
BWC_VERSION: 8.17.0
322+
307323
- label: "{{matrix.image}} / 9.0.0 / packaging-tests-upgrade"
308324
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.0
309325
timeout_in_minutes: 300

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ steps:
287287
- signal_reason: agent_stop
288288
limit: 3
289289

290-
- label: 8.15.3 / bwc
291-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.3#bwcTest
290+
- label: 8.15.4 / bwc
291+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.4#bwcTest
292292
timeout_in_minutes: 300
293293
agents:
294294
provider: gcp
@@ -297,7 +297,7 @@ steps:
297297
buildDirectory: /dev/shm/bk
298298
preemptible: true
299299
env:
300-
BWC_VERSION: 8.15.3
300+
BWC_VERSION: 8.15.4
301301
retry:
302302
automatic:
303303
- exit_status: "-1"
@@ -325,6 +325,25 @@ steps:
325325
- signal_reason: agent_stop
326326
limit: 3
327327

328+
- label: 8.17.0 / bwc
329+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.0#bwcTest
330+
timeout_in_minutes: 300
331+
agents:
332+
provider: gcp
333+
image: family/elasticsearch-ubuntu-2004
334+
machineType: n1-standard-32
335+
buildDirectory: /dev/shm/bk
336+
preemptible: true
337+
env:
338+
BWC_VERSION: 8.17.0
339+
retry:
340+
automatic:
341+
- exit_status: "-1"
342+
limit: 3
343+
signal_reason: none
344+
- signal_reason: agent_stop
345+
limit: 3
346+
328347
- label: 9.0.0 / bwc
329348
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.0#bwcTest
330349
timeout_in_minutes: 300
@@ -410,7 +429,7 @@ steps:
410429
setup:
411430
ES_RUNTIME_JAVA:
412431
- openjdk21
413-
BWC_VERSION: ["8.15.3", "8.16.0", "9.0.0"]
432+
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
414433
agents:
415434
provider: gcp
416435
image: family/elasticsearch-ubuntu-2004
@@ -452,7 +471,7 @@ steps:
452471
ES_RUNTIME_JAVA:
453472
- openjdk21
454473
- openjdk23
455-
BWC_VERSION: ["8.15.3", "8.16.0", "9.0.0"]
474+
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
456475
agents:
457476
provider: gcp
458477
image: family/elasticsearch-ubuntu-2004
@@ -554,7 +573,7 @@ steps:
554573
image: family/elasticsearch-ubuntu-2004
555574
machineType: n2-standard-8
556575
buildDirectory: /dev/shm/bk
557-
if: build.branch == "main" || build.branch == "7.17"
576+
if: build.branch == "main" || build.branch == "8.x" || build.branch == "7.17"
558577
- label: check-branch-consistency
559578
command: .ci/scripts/run-gradle.sh branchConsistency
560579
timeout_in_minutes: 15

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
steps:
66
- label: "{{matrix.image}} / docker / packaging-tests-unix"
77
key: "packaging-tests-unix-docker"
8-
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.docker
8+
command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.docker-cloud-ess
99
timeout_in_minutes: 300
1010
matrix:
1111
setup:

‎.buildkite/pull-requests.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"admin",
99
"write"
1010
],
11+
"allowed_list": ["elastic-renovate-prod[bot]"],
1112
"set_commit_status": false,
1213
"build_on_commit": true,
1314
"build_on_comment": true,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@ if [[ "$BRANCH" == "main" ]]; then
2222
fi
2323

2424
ES_VERSION=$(grep elasticsearch build-tools-internal/version.properties | sed "s/elasticsearch *= *//g")
25+
echo "ES_VERSION=$ES_VERSION"
2526

2627
VERSION_SUFFIX=""
2728
if [[ "$WORKFLOW" == "snapshot" ]]; then
2829
VERSION_SUFFIX="-SNAPSHOT"
2930
fi
3031

3132
BEATS_BUILD_ID="$(./.ci/scripts/resolve-dra-manifest.sh beats "$RM_BRANCH" "$ES_VERSION" "$WORKFLOW")"
33+
echo "BEATS_BUILD_ID=$BEATS_BUILD_ID"
34+
3235
ML_CPP_BUILD_ID="$(./.ci/scripts/resolve-dra-manifest.sh ml-cpp "$RM_BRANCH" "$ES_VERSION" "$WORKFLOW")"
36+
echo "ML_CPP_BUILD_ID=$ML_CPP_BUILD_ID"
3337

3438
LICENSE_KEY_ARG=""
3539
BUILD_SNAPSHOT_ARG=""

0 commit comments

Comments
 (0)