Skip to content

Commit e4fc8f8

Browse files
prwhelanprwhelan
authored
Merge branch 'main' into 1793
2 parents d75928c + 0d8271f commit e4fc8f8

File tree

1,596 files changed

+55357
-30102
lines changed

Some content is hidden

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

1,596 files changed

+55357
-30102
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.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
68+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 10 additions & 10 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.10 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.10#bwcTest
369+
- label: 8.19.11 / bwc
370+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.11#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.10
379+
BWC_VERSION: 8.19.11
380380
retry:
381381
automatic:
382382
- exit_status: "-1"
@@ -404,8 +404,8 @@ steps:
404404
- signal_reason: agent_stop
405405
limit: 3
406406

407-
- label: 9.1.10 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.10#bwcTest
407+
- label: 9.1.11 / bwc
408+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.11#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.10
417+
BWC_VERSION: 9.1.11
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.4 / bwc
427-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.4#bwcTest
426+
- label: 9.2.5 / bwc
427+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.5#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.4
436+
BWC_VERSION: 9.2.5
437437
retry:
438438
automatic:
439439
- exit_status: "-1"
@@ -557,7 +557,7 @@ steps:
557557
timeout_in_minutes: 300
558558
matrix:
559559
setup:
560-
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
560+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
561561
agents:
562562
provider: gcp
563563
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ steps:
336336
env:
337337
BWC_VERSION: 8.18.8
338338

339-
- label: "{{matrix.image}} / 8.19.10 / packaging-tests-upgrade"
340-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.10
339+
- label: "{{matrix.image}} / 8.19.11 / packaging-tests-upgrade"
340+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.11
341341
timeout_in_minutes: 300
342342
matrix:
343343
setup:
@@ -350,7 +350,7 @@ steps:
350350
machineType: custom-16-32768
351351
buildDirectory: /dev/shm/bk
352352
env:
353-
BWC_VERSION: 8.19.10
353+
BWC_VERSION: 8.19.11
354354

355355
- label: "{{matrix.image}} / 9.0.8 / packaging-tests-upgrade"
356356
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
@@ -368,8 +368,8 @@ steps:
368368
env:
369369
BWC_VERSION: 9.0.8
370370

371-
- label: "{{matrix.image}} / 9.1.10 / packaging-tests-upgrade"
372-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.10
371+
- label: "{{matrix.image}} / 9.1.11 / packaging-tests-upgrade"
372+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.11
373373
timeout_in_minutes: 300
374374
matrix:
375375
setup:
@@ -382,10 +382,10 @@ steps:
382382
machineType: custom-16-32768
383383
buildDirectory: /dev/shm/bk
384384
env:
385-
BWC_VERSION: 9.1.10
385+
BWC_VERSION: 9.1.11
386386

387-
- label: "{{matrix.image}} / 9.2.4 / packaging-tests-upgrade"
388-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.4
387+
- label: "{{matrix.image}} / 9.2.5 / packaging-tests-upgrade"
388+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.5
389389
timeout_in_minutes: 300
390390
matrix:
391391
setup:
@@ -398,7 +398,7 @@ steps:
398398
machineType: custom-16-32768
399399
buildDirectory: /dev/shm/bk
400400
env:
401-
BWC_VERSION: 9.2.4
401+
BWC_VERSION: 9.2.5
402402

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

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ steps:
415415
- exit_status: "1"
416416
limit: 1
417417

418-
- label: 8.19.10 / bwc
419-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.10#bwcTest
418+
- label: 8.19.11 / bwc
419+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.11#bwcTest
420420
timeout_in_minutes: 300
421421
agents:
422422
provider: gcp
@@ -425,7 +425,7 @@ steps:
425425
buildDirectory: /dev/shm/bk
426426
preemptible: true
427427
env:
428-
BWC_VERSION: 8.19.10
428+
BWC_VERSION: 8.19.11
429429
retry:
430430
automatic:
431431
- exit_status: "-1"
@@ -457,8 +457,8 @@ steps:
457457
- exit_status: "1"
458458
limit: 1
459459

460-
- label: 9.1.10 / bwc
461-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.10#bwcTest
460+
- label: 9.1.11 / bwc
461+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.11#bwcTest
462462
timeout_in_minutes: 300
463463
agents:
464464
provider: gcp
@@ -467,7 +467,7 @@ steps:
467467
buildDirectory: /dev/shm/bk
468468
preemptible: true
469469
env:
470-
BWC_VERSION: 9.1.10
470+
BWC_VERSION: 9.1.11
471471
retry:
472472
automatic:
473473
- exit_status: "-1"
@@ -478,8 +478,8 @@ steps:
478478
- exit_status: "1"
479479
limit: 1
480480

481-
- label: 9.2.4 / bwc
482-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.4#bwcTest
481+
- label: 9.2.5 / bwc
482+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.5#bwcTest
483483
timeout_in_minutes: 300
484484
agents:
485485
provider: gcp
@@ -488,7 +488,7 @@ steps:
488488
buildDirectory: /dev/shm/bk
489489
preemptible: true
490490
env:
491-
BWC_VERSION: 9.2.4
491+
BWC_VERSION: 9.2.5
492492
retry:
493493
automatic:
494494
- exit_status: "-1"
@@ -625,7 +625,7 @@ steps:
625625
setup:
626626
ES_RUNTIME_JAVA:
627627
- openjdk21
628-
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
628+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
629629
agents:
630630
provider: gcp
631631
image: family/elasticsearch-ubuntu-2404
@@ -692,7 +692,7 @@ steps:
692692
setup:
693693
ES_RUNTIME_JAVA:
694694
- openjdk21
695-
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
695+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
696696
agents:
697697
provider: gcp
698698
image: family/elasticsearch-ubuntu-2404
@@ -749,7 +749,7 @@ steps:
749749
ES_RUNTIME_JAVA:
750750
- openjdk21
751751
- openjdk25
752-
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
752+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
753753
agents:
754754
provider: gcp
755755
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pull-requests.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"admin",
99
"write"
1010
],
11-
"allowed_list": ["elastic-renovate-prod[bot]"],
11+
"allowed_list": ["elastic-renovate-prod[bot]", "github-actions[bot]"],
1212
"set_commit_status": false,
1313
"build_on_commit": true,
1414
"build_on_comment": true,

‎.buildkite/scripts/dra-update-staging.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source .buildkite/scripts/branches.sh
66

77
for BRANCH in "${BRANCHES[@]}"; do
88
# Don't publish main branch to staging
9-
if [[ "$BRANCH" == "main" ]]; then
9+
if [[ "$BRANCH" == "main" || "$BRANCH" == "7.17" ]]; then
1010
continue
1111
fi
1212

‎.ci/bwcVersions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ BWC_VERSION:
1818
- "8.16.6"
1919
- "8.17.10"
2020
- "8.18.8"
21-
- "8.19.10"
21+
- "8.19.11"
2222
- "9.0.8"
23-
- "9.1.10"
24-
- "9.2.4"
23+
- "9.1.11"
24+
- "9.2.5"
2525
- "9.3.0"
2626
- "9.4.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BWC_VERSION:
2-
- "8.19.10"
3-
- "9.1.10"
4-
- "9.2.4"
2+
- "8.19.11"
3+
- "9.1.11"
4+
- "9.2.5"
55
- "9.3.0"
66
- "9.4.0"

‎.github/updatecli/values.d/ironbank.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
config:
22
- path: distribution/docker/src/docker/iron_bank
3-
dockerfile: ../Dockerfile
3+
dockerfile: ../dockerfiles/ironbank/Dockerfile
4+
5+
pull_request:
6+
labels:
7+
- ":Delivery/Tooling"
8+
- ":Delivery/Packaging"
9+
- "auto-merge-without-approval"
10+
- "dependencies"
11+
- ">non-issue"
12+

‎.github/updatecli/values.d/scm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ scm:
22
enabled: true
33
owner: elastic
44
repository: elasticsearch
5-
branch: main
5+
branch: "main" # this value is overwritten by the GH workflow to match current branch
66
commitusingapi: true
77
# begin updatecli-compose policy values
88
user: elasticmachine

0 commit comments

Comments
 (0)