Merge branch '8.x' into backport/8.x/pr-118474

not-napoleon · Dec 16, 2024 · e33cbb3 · e33cbb3
2 parents 82946f8 + 7846d8d
commit e33cbb3
Show file tree

Hide file tree

Showing 265 changed files with 7,046 additions and 1,434 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -56,7 +56,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.27", "8.16.2", "8.17.0", "8.18.0"]
+            BWC_VERSION: ["7.17.27", "8.16.2", "8.17.1", "8.18.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.template.yml b/.buildkite/pipelines/periodic-packaging.template.yml
@@ -12,11 +12,13 @@ steps:
               - opensuse-leap-15
               - oraclelinux-7
               - oraclelinux-8
+              - oraclelinux-9
               - sles-12
               - sles-15
               - ubuntu-1804
               - ubuntu-2004
               - ubuntu-2204
+              - ubuntu-2404
               - rocky-8
               - rocky-9
               - rhel-7

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -13,11 +13,13 @@ steps:
               - opensuse-leap-15
               - oraclelinux-7
               - oraclelinux-8
+              - oraclelinux-9
               - sles-12
               - sles-15
               - ubuntu-1804
               - ubuntu-2004
               - ubuntu-2204
+              - ubuntu-2404
               - rocky-8
               - rocky-9
               - rhel-7
@@ -593,8 +595,8 @@ steps:
         env:
           BWC_VERSION: 8.16.2
 
-      - label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0
+      - label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -607,7 +609,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.17.0
+          BWC_VERSION: 8.17.1
 
       - label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0

diff --git a/.buildkite/pipelines/periodic-platform-support.yml b/.buildkite/pipelines/periodic-platform-support.yml
@@ -12,11 +12,13 @@ steps:
               - opensuse-leap-15
               - oraclelinux-7
               - oraclelinux-8
+              - oraclelinux-9
               - sles-12
               - sles-15
               - ubuntu-1804
               - ubuntu-2004
               - ubuntu-2204
+              - ubuntu-2404
               - rocky-8
               - rocky-9
               - rhel-7

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -667,8 +667,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.17.0 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.0#bwcTest
+      - label: 8.17.1 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.1#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -677,7 +677,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 8.17.0
+          BWC_VERSION: 8.17.1
         retry:
           automatic:
             - exit_status: "-1"
@@ -771,7 +771,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk17
-            BWC_VERSION: ["7.17.27", "8.16.2", "8.17.0", "8.18.0"]
+            BWC_VERSION: ["7.17.27", "8.16.2", "8.17.1", "8.18.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -819,7 +819,7 @@ steps:
               - openjdk21
               - openjdk22
               - openjdk23
-            BWC_VERSION: ["7.17.27", "8.16.2", "8.17.0", "8.18.0"]
+            BWC_VERSION: ["7.17.27", "8.16.2", "8.17.1", "8.18.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/pull-request/packaging-tests-unix.yml b/.buildkite/pipelines/pull-request/packaging-tests-unix.yml
@@ -15,11 +15,13 @@ steps:
               - opensuse-leap-15
               - oraclelinux-7
               - oraclelinux-8
+              - oraclelinux-9
               - sles-12
               - sles-15
               - ubuntu-1804
               - ubuntu-2004
               - ubuntu-2204
+              - ubuntu-2404
               - rocky-8
               - rocky-9
               - rhel-7

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -34,5 +34,5 @@ BWC_VERSION:
   - "8.14.3"
   - "8.15.5"
   - "8.16.2"
-  - "8.17.0"
+  - "8.17.1"
   - "8.18.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,5 +1,5 @@
 BWC_VERSION:
   - "7.17.27"
   - "8.16.2"
-  - "8.17.0"
+  - "8.17.1"
   - "8.18.0"
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
@@ -24,7 +24,7 @@ public enum DockerBase {
     // Chainguard based wolfi image with latest jdk
     // This is usually updated via renovatebot
     // spotless:off
-    WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:32f06b169bb4b0f257fbb10e8c8379f06d3ee1355c89b3327cb623781a29590e",
+    WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:1b51ff6dba78c98d3e02b0cd64a8ce3238c7a40408d21e3af12a329d44db6f23",
         "-wolfi",
         "apk"
     ),

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.18.0
-lucene            = 9.12.0
+lucene            = 9.12.1
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 23+37@3c5b90190c68498b986a97f276efd28a

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.12.0
-:lucene_version_path:   9_12_0
+:lucene_version:        9.12.1
+:lucene_version_path:   9_12_1
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

diff --git a/docs/changelog/104683.yaml b/docs/changelog/104683.yaml
diff --git a/docs/changelog/112881.yaml b/docs/changelog/112881.yaml
diff --git a/docs/changelog/112989.yaml b/docs/changelog/112989.yaml
diff --git a/docs/changelog/113194.yaml b/docs/changelog/113194.yaml
diff --git a/docs/changelog/113713.yaml b/docs/changelog/113713.yaml
diff --git a/docs/changelog/113920.yaml b/docs/changelog/113920.yaml
diff --git a/docs/changelog/114334.yaml b/docs/changelog/114334.yaml
diff --git a/docs/changelog/114482.yaml b/docs/changelog/114482.yaml
diff --git a/docs/changelog/114484.yaml b/docs/changelog/114484.yaml
diff --git a/docs/changelog/114620.yaml b/docs/changelog/114620.yaml
diff --git a/docs/changelog/114665.yaml b/docs/changelog/114665.yaml
diff --git a/docs/changelog/114681.yaml b/docs/changelog/114681.yaml
diff --git a/docs/changelog/114739.yaml b/docs/changelog/114739.yaml
diff --git a/docs/changelog/114742.yaml b/docs/changelog/114742.yaml
diff --git a/docs/changelog/114819.yaml b/docs/changelog/114819.yaml
diff --git a/docs/changelog/114855.yaml b/docs/changelog/114855.yaml
diff --git a/docs/changelog/114862.yaml b/docs/changelog/114862.yaml
diff --git a/docs/changelog/114869.yaml b/docs/changelog/114869.yaml
diff --git a/docs/changelog/114899.yaml b/docs/changelog/114899.yaml
diff --git a/docs/changelog/114924.yaml b/docs/changelog/114924.yaml
diff --git a/docs/changelog/114934.yaml b/docs/changelog/114934.yaml
diff --git a/docs/changelog/114964.yaml b/docs/changelog/114964.yaml
diff --git a/docs/changelog/115041.yaml b/docs/changelog/115041.yaml
diff --git a/docs/changelog/115091.yaml b/docs/changelog/115091.yaml
diff --git a/docs/changelog/115102.yaml b/docs/changelog/115102.yaml
diff --git a/docs/changelog/115142.yaml b/docs/changelog/115142.yaml
diff --git a/docs/changelog/115266.yaml b/docs/changelog/115266.yaml
diff --git a/docs/changelog/115359.yaml b/docs/changelog/115359.yaml
diff --git a/docs/changelog/115414.yaml b/docs/changelog/115414.yaml
diff --git a/docs/changelog/115585.yaml b/docs/changelog/115585.yaml
diff --git a/docs/changelog/115640.yaml b/docs/changelog/115640.yaml
diff --git a/docs/changelog/115655.yaml b/docs/changelog/115655.yaml
diff --git a/docs/changelog/115678.yaml b/docs/changelog/115678.yaml