Merge branch 'main' of github.com:elastic/elasticsearch into ml-fix-ccm-restart-bug

Author: jonathan-buttner

.buildkite/pipelines/cuvs-snapshot/run-tests.yml

@@ -3,11 +3,12 @@ steps:
     command: .buildkite/scripts/cuvs-snapshot/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints {{matrix.GRADLE_TASK}}
     timeout_in_minutes: 300
     agents:
-      provider: gcp
-      image: family/elasticsearch-ubuntu-2404-nvidia
-      machineType: g2-standard-32
-      buildDirectory: /dev/shm/bk
-      zones: us-central1-b,us-central1-c
+      provider: aws
+      imagePrefix: elasticsearch-aws-ubuntu-2204-nvidia
+      instanceType: g6.8xlarge
+      diskSizeGb: 350
+      diskType: gp3
+      diskName: /dev/sda1
     env:
       GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
     matrix:

.buildkite/pipelines/cuvs-snapshot/update-snapshot.yml

@@ -2,11 +2,12 @@ steps:
   - label: "Smoke test and update new cuVS snapshot"
     command: .buildkite/scripts/cuvs-snapshot/update-current-snapshot-version.sh
     agents:
-      provider: gcp
-      image: family/elasticsearch-ubuntu-2404-nvidia
-      machineType: g2-standard-16
-      zones: us-central1-b,us-central1-c
-      diskSizeGb: 150
+      provider: aws
+      imagePrefix: elasticsearch-aws-ubuntu-2204-nvidia
+      instanceType: g6.2xlarge
+      diskSizeGb: 350
+      diskType: gp3
+      diskName: /dev/sda1
   - wait: ~
   - trigger: "elasticsearch-cuvs-run-tests"
     build:

.buildkite/pipelines/intake.yml

@@ -65,7 +65,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
+            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

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

@@ -404,8 +404,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 9.1.8 / bwc
-        command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.8#bwcTest
+      - label: 9.1.9 / bwc
+        command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.9#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -414,7 +414,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 9.1.8
+          BWC_VERSION: 9.1.9
         retry:
           automatic:
             - exit_status: "-1"
@@ -538,7 +538,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
+            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

.buildkite/pipelines/periodic-packaging.yml

@@ -368,8 +368,8 @@ steps:
         env:
           BWC_VERSION: 9.0.8
 
-      - label: "{{matrix.image}} / 9.1.8 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.8
+      - label: "{{matrix.image}} / 9.1.9 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.9
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -382,7 +382,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 9.1.8
+          BWC_VERSION: 9.1.9
 
       - label: "{{matrix.image}} / 9.2.2 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.2

.buildkite/pipelines/periodic.template.yml

@@ -92,8 +92,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-              - openjdk23
-              - openjdk24
+              - openjdk25
             GRADLE_TASK:
               - checkPart1
               - checkPart2
@@ -118,7 +117,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-              - openjdk23
+              - openjdk25
             BWC_VERSION: $BWC_LIST
         agents:
           provider: gcp

.buildkite/pipelines/periodic.yml

@@ -401,8 +401,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 9.1.8 / bwc
-        command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.8#bwcTest
+      - label: 9.1.9 / bwc
+        command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.9#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -411,7 +411,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 9.1.8
+          BWC_VERSION: 9.1.9
         retry:
           automatic:
             - exit_status: "-1"
@@ -530,7 +530,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
+            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404
@@ -549,8 +549,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-              - openjdk23
-              - openjdk24
+              - openjdk25
             GRADLE_TASK:
               - checkPart1
               - checkPart2
@@ -575,8 +574,8 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-              - openjdk23
-            BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
+              - openjdk25
+            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

.buildkite/pipelines/pull-request/gpu.yml

@@ -10,11 +10,12 @@ steps:
         command: .buildkite/scripts/cuvs-snapshot/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-file-fingerprints {{matrix.GRADLE_TASK}}
         timeout_in_minutes: 300
         agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2404-nvidia
-          machineType: g2-standard-32
-          buildDirectory: /dev/shm/bk
-          zones: us-central1-b,us-central1-c
+          provider: aws
+          imagePrefix: elasticsearch-aws-ubuntu-2204-nvidia
+          instanceType: g6.8xlarge
+          diskSizeGb: 350
+          diskType: gp3
+          diskName: /dev/sda1
         env:
           GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
         matrix:

.buildkite/scripts/cuvs-snapshot/configure.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -euo pipefail
-
 if [[ -f /etc/profile.d/elastic-nvidia.sh ]]; then
   export JAVA_HOME="$HOME/.java/openjdk24"
   export PATH="$JAVA_HOME/bin:$PATH"
@@ -10,34 +8,35 @@ if [[ -f /etc/profile.d/elastic-nvidia.sh ]]; then
 
   export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}"
   source /etc/profile.d/elastic-nvidia.sh
-fi
-
-# Not running this before the tests results in an error when running the tests
-# No idea why...
-nvidia-smi
 
-CURRENT_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ELASTICSEARCH_REPO_DIR="$(cd "$CURRENT_SCRIPT_DIR/../../.." && pwd)"
-
-CUVS_SNAPSHOT_VERSION="${CUVS_SNAPSHOT_VERSION:-$(cat "$CURRENT_SCRIPT_DIR"/current-snapshot-version)}"
-CUVS_ARCHIVE="cuvs-$CUVS_SNAPSHOT_VERSION.tar.gz"
-CUVS_URL="https://storage.googleapis.com/elasticsearch-cuvs-snapshots/$CUVS_ARCHIVE"
+  # Not running this before the tests results in an error when running the tests
+  # No idea why...
+  if [[ "${BUILDKITE:-}" != "" && "${CI:-}" == "true" ]]; then
+    nvidia-smi
+  fi
+fi
 
-CUVS_WORKSPACE=${CUVS_WORKSPACE:-$(cd "$(mktemp -d)")}
-CUVS_DIR="$(pwd)/cuvs-$CUVS_SNAPSHOT_VERSION"
+LIBCUVS_GCS_BUCKET="elasticsearch-cuvs-snapshots"
 
-curl -O "$CUVS_URL"
-tar -xzf "$CUVS_ARCHIVE"
+LIBCUVS_DIR="/opt/libcuvs"
+sudo mkdir -p "$LIBCUVS_DIR"
+sudo chmod 777 "$LIBCUVS_DIR"
 
-CUVS_VERSION=$(cd "$CUVS_DIR/cuvs-java/target" && mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+CUVS_VERSION=$(grep 'cuvs_java' build-tools-internal/version.properties | awk '{print $3}')
 
-LD_LIBRARY_PATH=$(echo "$LD_LIBRARY_PATH" | tr ':' '\n' | grep -v "libcuvs/linux-x64" | tr '\n' ':' | sed 's/:$//')
-LD_LIBRARY_PATH="$CUVS_DIR/libcuvs/linux-x64:$LD_LIBRARY_PATH"
-export LD_LIBRARY_PATH
+LIBCUVS_VERSION_DIR="$LIBCUVS_DIR/$CUVS_VERSION"
 
-cd "$CUVS_DIR/cuvs-java/target"
-mvn install:install-file -Dfile="cuvs-java-$CUVS_VERSION.jar" -DartifactId=elastic-cuvs-java -DgeneratePom=true
+if [[ ! -d "$LIBCUVS_VERSION_DIR" ]]; then
+  mkdir -p $LIBCUVS_VERSION_DIR
+  cd "$LIBCUVS_VERSION_DIR"
+  CUVS_ARCHIVE="libcuvs-$CUVS_VERSION.tar.gz"
+  curl -fO "https://storage.googleapis.com/$LIBCUVS_GCS_BUCKET/libcuvs/$CUVS_ARCHIVE"
+  tar -xzf "$CUVS_ARCHIVE"
+  rm -f "$CUVS_ARCHIVE"
+  if [[ -d "$CUVS_VERSION" ]]; then
+    mv "$CUVS_VERSION/*" ./
+  fi
+  cd -
+fi
 
-cd "$ELASTICSEARCH_REPO_DIR"
-PLUGIN_GRADLE_FILE=x-pack/plugin/gpu/build.gradle
-sed -i "s|implementation 'com.nvidia.cuvs:elastic-cuvs-java:.*'|implementation 'com.nvidia.cuvs:elastic-cuvs-java:$CUVS_VERSION'|" "$PLUGIN_GRADLE_FILE"
+export LD_LIBRARY_PATH="$LIBCUVS_VERSION_DIR:${LD_LIBRARY_PATH:-}"