CXX-3273 revert to using system-installed valgrind

.evergreen/config_generator/components/valgrind.py

@@ -1,7 +1,6 @@
 from config_generator.components.funcs.compile import Compile
 from config_generator.components.funcs.fetch_det import FetchDET
 from config_generator.components.funcs.install_c_driver import InstallCDriver
-from config_generator.components.funcs.install_valgrind import InstallValgrind
 from config_generator.components.funcs.install_uv import InstallUV
 from config_generator.components.funcs.run_kms_servers import RunKMSServers
 from config_generator.components.funcs.setup import Setup
@@ -68,7 +67,6 @@ def tasks():
 
             commands += [
                 Setup.call(),
-                InstallValgrind.call(),
                 StartMongod.call(mongodb_version=mongodb_version, topology=topology),
                 InstallCDriver.call(vars=icd_vars),
                 InstallUV.call(),

.evergreen/generated_configs/functions.yml

@@ -418,70 +418,6 @@ functions:
       type: setup
       params:
         file: expansions.uv.yml
-  install-valgrind:
-    - command: subprocess.exec
-      type: setup
-      params:
-        binary: bash
-        args:
-          - -c
-          - |
-            if [[ -n "$XDG_CACHE_DIR" ]]; then
-                cache_dir="$XDG_CACHE_DIR" # XDG Base Directory specification.
-            elif [[ -n "$LOCALAPPDATA" ]]; then
-                cache_dir="$LOCALAPPDATA" # Windows.
-            elif [[ -n "$USERPROFILE" ]]; then
-                cache_dir="$USERPROFILE/.cache" # Windows (fallback).
-            elif [[ -d "$HOME/Library/Caches" ]]; then
-                cache_dir="$HOME/Library/Caches" # MacOS.
-            elif [[ -n "$HOME" ]]; then
-                cache_dir="$HOME/.cache" # Linux-like.
-            elif [[ -d ~/.cache ]]; then
-                cache_dir="~/.cache" # Linux-like (fallback).
-            else
-                cache_dir="$(pwd)/.cache" # EVG task directory (fallback).
-            fi
-
-            mkdir -p "$cache_dir/mongo-cxx-driver" || exit
-            cache_dir="$(cd "$cache_dir/mongo-cxx-driver" && pwd)" || exit
-
-            printf "MONGO_CXX_DRIVER_CACHE_DIR: %s\n" "$cache_dir" >|expansions.set-cache-dir.yml
-    - command: expansions.update
-      type: setup
-      params:
-        file: expansions.set-cache-dir.yml
-    - command: subprocess.exec
-      type: setup
-      params:
-        binary: bash
-        args:
-          - -c
-          - |
-            set -o errexit
-            set -o pipefail
-
-            if [[ ! -n "${MONGO_CXX_DRIVER_CACHE_DIR}" ]]; then
-              echo "MONGO_CXX_DRIVER_CACHE_DIR is not defined!" 1>&2
-              exit 1
-            fi
-
-            valgrind_install_dir="${MONGO_CXX_DRIVER_CACHE_DIR}/valgrind-3.24.0"
-            mkdir -p "$valgrind_install_dir"
-
-            if ! command -v "$valgrind_install_dir/bin/valgrind" 2>/dev/null; then
-              env \
-                install_prefix="${MONGO_CXX_DRIVER_CACHE_DIR}/valgrind-3.24.0" \
-                mongo-cxx-driver/.evergreen/scripts/valgrind-installer.sh
-            fi
-
-            PATH="$valgrind_install_dir/bin:$PATH" command -V valgrind
-            PATH="$valgrind_install_dir/bin:$PATH" valgrind --version
-
-            printf "VALGRIND_INSTALL_DIR: %s\n" "$valgrind_install_dir/bin" >|expansions.valgrind.yml
-    - command: expansions.update
-      type: setup
-      params:
-        file: expansions.valgrind.yml
   install_c_driver:
     - command: expansions.update
       type: setup

.evergreen/generated_configs/tasks.yml

@@ -15715,7 +15715,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
@@ -15745,7 +15744,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
@@ -15775,7 +15773,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           mongodb_version: "4.0"
@@ -15804,7 +15801,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
@@ -15834,7 +15830,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
@@ -15864,7 +15859,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           mongodb_version: "8.0"
@@ -15893,7 +15887,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
@@ -15923,7 +15916,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
@@ -15953,7 +15945,6 @@ tasks:
           updates:
             - { key: build_type, value: Debug }
       - func: setup
-      - func: install-valgrind
       - func: start_mongod
         vars:
           mongodb_version: latest

.evergreen/scripts/test.sh

@@ -283,7 +283,7 @@ else
     export UBSAN_OPTIONS="print_stacktrace=1"
     export PATH="/opt/mongodbtoolchain/v4/bin:${PATH:-}" # llvm-symbolizer
   elif [[ "${TEST_WITH_VALGRIND:-}" == "ON" ]]; then
-    PATH="${VALGRIND_INSTALL_DIR:?}:${PATH:-}"
+    command -V valgrind
     valgrind --version
     run_test() {
       valgrind --leak-check=full --track-origins=yes --num-callers=50 --error-exitcode=1 --error-limit=no --read-var-info=yes --suppressions=../etc/memcheck.suppressions "$@" "${test_args[@]:?}"