Revert some of the changes made while testing bug fixes, add nvidia-smi command, add run-gradle script

Author: brianseeders

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

@@ -10,10 +10,9 @@ if [[ -f /etc/profile.d/elastic-nvidia.sh ]]; then
   source /etc/profile.d/elastic-nvidia.sh
 fi
 
-CUVS_WORKSPACE=/opt/elastic-cuvs
-sudo rm -rf "$CUVS_WORKSPACE/cuvs"
-sudo mkdir "$CUVS_WORKSPACE"
-sudo chmod 777 "$CUVS_WORKSPACE"
+# 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)"
@@ -22,30 +21,19 @@ CUVS_SNAPSHOT_VERSION="${CUVS_SNAPSHOT_VERSION:-$(cat "$CURRENT_SCRIPT_DIR"/curr
 CUVS_ARCHIVE="cuvs-$CUVS_SNAPSHOT_VERSION.tar.gz"
 CUVS_URL="https://storage.googleapis.com/elasticsearch-cuvs-snapshots/$CUVS_ARCHIVE"
 
-# CUVS_WORKSPACE=${CUVS_WORKSPACE:-$(cd "$(mktemp -d)" && pwd)}
-cd "$CUVS_WORKSPACE"
-CUVS_DIR="$CUVS_WORKSPACE"/cuvs
-mkdir -p "$CUVS_DIR"
-
-CUVS_SNAPSHOT_DIR="$CUVS_WORKSPACE/cuvs-$CUVS_SNAPSHOT_VERSION"
+CUVS_WORKSPACE=${CUVS_WORKSPACE:-$(cd "$(mktemp -d)")}
+CUVS_DIR="$(pwd)/cuvs-$CUVS_SNAPSHOT_VERSION"
 
 curl -O "$CUVS_URL"
 tar -xzf "$CUVS_ARCHIVE"
 
-mv "$CUVS_SNAPSHOT_DIR"/cuvs "$CUVS_WORKSPACE/"
-
-CUVS_VERSION=$(cd "$CUVS_DIR/java/cuvs-java/target" && mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-
-LD_LIBRARY_PATH=$(echo "$LD_LIBRARY_PATH" | tr ':' '\n' | grep -v "cuvs/" | tr '\n' ':' | sed 's/:$//')
-LD_LIBRARY_PATH="\
-${CUVS_DIR}/cpp/build/install/lib:\
-${CUVS_DIR}/cpp/build/_deps/rapids_logger-build:\
-${CUVS_DIR}/cpp/build/_deps/rmm-build:\
-$LD_LIBRARY_PATH"
+CUVS_VERSION=$(cd "$CUVS_DIR/cuvs-java/target" && mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 
+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
 
-cd "$CUVS_DIR/java/cuvs-java/target"
+cd "$CUVS_DIR/cuvs-java/target"
 mvn install:install-file -Dfile="cuvs-java-$CUVS_VERSION.jar"
 
 cd "$ELASTICSEARCH_REPO_DIR"

.buildkite/scripts/cuvs-snapshot/current-snapshot-version

@@ -1 +1 @@
-e58b147d
+c987afa2

.buildkite/scripts/cuvs-snapshot/run-gradle.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source .buildkite/scripts/cuvs-snapshot/configure.sh
+
+cd "$WORKSPACE"
+
+.ci/scripts/run-gradle.sh "$@"

.buildkite/scripts/cuvs-snapshot/update-current-snapshot-version.sh

@@ -2,7 +2,6 @@
 
 set -euo pipefail
 
-WORKSPACE="${WORKSPACE:-$(pwd)}"
 SNAPSHOT_VERSION_FILE=.buildkite/scripts/cuvs-snapshot/current-snapshot-version
 PLUGIN_GRADLE_FILE=x-pack/plugin/gpu/build.gradle
 BRANCH_TO_UPDATE="${BRANCH_TO_UPDATE:-${BUILDKITE_BRANCH:-cuvs-snapshot}}"
@@ -20,9 +19,6 @@ fi
 echo "--- Configuring libcuvs/cuvs-java"
 source .buildkite/scripts/cuvs-snapshot/configure.sh
 
-echo JAVA_HOME=$JAVA_HOME;
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH;
-
 if [[ "${SKIP_TESTING:-}" != "true" ]]; then
   echo "--- Testing snapshot before updating"
   ./gradlew -Druntime.java=24 :x-pack:plugin:gpu:yamlRestTest -S
@@ -34,7 +30,7 @@ echo "$CUVS_SNAPSHOT_VERSION" > "$SNAPSHOT_VERSION_FILE"
 
 CURRENT_SHA="$(gh api "/repos/elastic/elasticsearch/contents/$SNAPSHOT_VERSION_FILE?ref=$BRANCH_TO_UPDATE" | jq -r .sha)" || true
 
-gh api -X PUT "/repos/elastic/elasticsearch/contents/$SNAPSHOT_VERSION_FILE" \
+echo gh api -X PUT "/repos/elastic/elasticsearch/contents/$SNAPSHOT_VERSION_FILE" \
   -f branch="$BRANCH_TO_UPDATE" \
   -f message="Update cuvs snapshot version to $CUVS_VERSION" \
   -f content="$(base64 -w 0 "$WORKSPACE/$SNAPSHOT_VERSION_FILE")" \