From 950acfb70444323bae116012014769177e7b1746 Mon Sep 17 00:00:00 2001
From: Trevor <trevorguidry6@gmail.com>
Date: Fri, 26 Jan 2024 20:38:03 -0600
Subject: [PATCH] SERVER-85798 fix build_patch_id (#18439)

GitOrigin-RevId: cbec817baa0eea96d060f78836ddd6fbb9a07c41
---
 etc/evergreen_yml_components/tasks/compile_tasks.yml | 2 ++
 etc/evergreen_yml_components/tasks/misc_tasks.yml    | 1 +
 evergreen/generate_buildid_debug_symbols_mapping.sh  | 5 +++++
 evergreen/record_mongodb_server_version.sh           | 5 +++++
 4 files changed, 13 insertions(+)

diff --git a/etc/evergreen_yml_components/tasks/compile_tasks.yml b/etc/evergreen_yml_components/tasks/compile_tasks.yml
index a8e4305a6cd..ecefd580cff 100644
--- a/etc/evergreen_yml_components/tasks/compile_tasks.yml
+++ b/etc/evergreen_yml_components/tasks/compile_tasks.yml
@@ -189,12 +189,14 @@ tasks:
   - command: subprocess.exec
     params:
       binary: bash
+      add_expansions_to_env: true
       args:
       - "./src/evergreen/record_mongodb_server_version.sh"
       - "./build/install/dist-test/bin/mongod"
       - "./version_info_mongod.txt"
   - command: s3.put
     params:
+      optional: true
       aws_key: ${aws_key}
       aws_secret: ${aws_secret}
       local_file: src/version_info_mongod.txt
diff --git a/etc/evergreen_yml_components/tasks/misc_tasks.yml b/etc/evergreen_yml_components/tasks/misc_tasks.yml
index 9c897a37a7e..62036918ca2 100644
--- a/etc/evergreen_yml_components/tasks/misc_tasks.yml
+++ b/etc/evergreen_yml_components/tasks/misc_tasks.yml
@@ -327,6 +327,7 @@ tasks:
   - command: subprocess.exec
     params:
       binary: bash
+      add_expansions_to_env: true
       args:
       - "./src/evergreen/generate_buildid_debug_symbols_mapping.sh"
 
diff --git a/evergreen/generate_buildid_debug_symbols_mapping.sh b/evergreen/generate_buildid_debug_symbols_mapping.sh
index 142614ce821..5260e1f77d8 100644
--- a/evergreen/generate_buildid_debug_symbols_mapping.sh
+++ b/evergreen/generate_buildid_debug_symbols_mapping.sh
@@ -6,6 +6,11 @@ cd src
 set -o errexit
 set -o verbose
 
+build_patch_id="${build_patch_id:-${reuse_compile_from}}"
+if [ -n "${build_patch_id}" ]; then
+  exit 0
+fi
+
 is_san_variant_arg=""
 if [[ -n "${san_options}" ]]; then
   is_san_variant_arg="--is-san-variant"
diff --git a/evergreen/record_mongodb_server_version.sh b/evergreen/record_mongodb_server_version.sh
index e7ad5785657..052d23d51b8 100755
--- a/evergreen/record_mongodb_server_version.sh
+++ b/evergreen/record_mongodb_server_version.sh
@@ -6,4 +6,9 @@ cd src
 set -o errexit
 set -o verbose
 
+build_patch_id="${build_patch_id:-${reuse_compile_from}}"
+if [ -n "${build_patch_id}" ]; then
+  exit 0
+fi
+
 "$1" --version > "$2"