Skip to content

Commit 979e82d

Browse files
mamazzolmamazzol
authored
Merge branch '9.1' into backport/9.1/pr-137585
2 parents 60f8d43 + e8280ea commit 979e82d

File tree

91 files changed

+503
-317
lines changed

Some content is hidden

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

91 files changed

+503
-317
lines changed

‎.backportrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"targetBranchChoices" : [ "main", "9.1", "9.0", "8.19", "8.18", "8.17", "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" : {
6-
"^v9.1.7$" : "main",
6+
"^v9.1.8$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.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"]
68+
BWC_VERSION: ["8.19.8", "9.1.8"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: ["9.1.0", "9.1.1", "9.1.2", "9.1.3", "9.1.4", "9.1.5", "9.1.6"]
13+
FWC_VERSION: ["9.1.0", "9.1.1", "9.1.2", "9.1.3", "9.1.4", "9.1.5", "9.1.6", "9.1.7"]
1414
env:
1515
FWC_VERSION: "{{matrix.FWC_VERSION}}"

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

Lines changed: 7 additions & 7 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"
@@ -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"
@@ -477,7 +477,7 @@ steps:
477477
timeout_in_minutes: 300
478478
matrix:
479479
setup:
480-
BWC_VERSION: ["8.19.7", "9.1.7"]
480+
BWC_VERSION: ["8.19.8", "9.1.8"]
481481
agents:
482482
provider: gcp
483483
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ steps:
334334
env:
335335
BWC_VERSION: 8.18.8
336336

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

353353
- label: "{{matrix.image}} / 9.0.8 / packaging-tests-upgrade"
354354
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
@@ -366,8 +366,8 @@ steps:
366366
env:
367367
BWC_VERSION: 9.0.8
368368

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

385385
- group: packaging-tests-windows
386386
steps:

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 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"
@@ -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"
@@ -492,7 +492,7 @@ steps:
492492
setup:
493493
ES_RUNTIME_JAVA:
494494
- openjdk21
495-
BWC_VERSION: ["8.19.7", "9.1.7"]
495+
BWC_VERSION: ["8.19.8", "9.1.8"]
496496
agents:
497497
provider: gcp
498498
image: family/elasticsearch-ubuntu-2404
@@ -538,7 +538,7 @@ steps:
538538
ES_RUNTIME_JAVA:
539539
- openjdk21
540540
- openjdk23
541-
BWC_VERSION: ["8.19.7", "9.1.7"]
541+
BWC_VERSION: ["8.19.8", "9.1.8"]
542542
agents:
543543
provider: gcp
544544
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ BWC_VERSION:
1818
- "8.16.6"
1919
- "8.17.10"
2020
- "8.18.8"
21-
- "8.19.7"
21+
- "8.19.8"
2222
- "9.0.8"
23-
- "9.1.7"
23+
- "9.1.8"

‎.ci/snapshotBwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
BWC_VERSION:
2-
- "8.19.7"
3-
- "9.1.7"
2+
- "8.19.8"
3+
- "9.1.8"

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 9.1.7
1+
elasticsearch = 9.1.8
22
lucene = 10.2.2
33

44
bundled_jdk_vendor = openjdk

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Extract Elasticsearch artifact
2626
################################################################################
2727
28-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:dea9b73186c5565a5bfa820a68f63ff497fdc9f06a0afc777159d819c5f01dc4 AS builder
28+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:4d8871dbc3525d92a71b1f76145d4d9101d01951e9500040f30f16ac73bf36d8 AS builder
2929
3030
# Install required packages to extract the Elasticsearch distribution
3131
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -104,7 +104,7 @@ WORKDIR /usr/share/elasticsearch/config
104104
# Add entrypoint
105105
################################################################################
106106

107-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:dea9b73186c5565a5bfa820a68f63ff497fdc9f06a0afc777159d819c5f01dc4
107+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:4d8871dbc3525d92a71b1f76145d4d9101d01951e9500040f30f16ac73bf36d8
108108

109109
RUN <%= retry.loop(package_manager,
110110
"export DEBIAN_FRONTEND=noninteractive && \n" +

0 commit comments

Comments
 (0)