From a81186daff0cf5eca375df127198299cca425b3a Mon Sep 17 00:00:00 2001
From: gagik <me@gagik.co>
Date: Fri, 18 Oct 2024 17:03:34 +0200
Subject: [PATCH] use task_name again

---
 .evergreen.yml              | 134 ++++++++++++++++++------------------
 .evergreen/evergreen.yml.in |   4 +-
 .evergreen/run-e2e-tests.sh |   2 -
 3 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 077ab9025..88b9b8cfd 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -6621,7 +6621,7 @@ functions:
           AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
           AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
           DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl}
-          E2E_TASK_NAME: ${var_task_name}
+          E2E_TASK_NAME: ${task_name}
 
   ###
   # PACKAGING AND UPLOADING
@@ -11080,7 +11080,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_x64_fips"
+          task_name: "e2e_tests_darwin_x64_fips"
   - name: e2e_tests_darwin_x64
     tags: ["e2e-test"]
     depends_on:
@@ -11100,7 +11100,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_x64"
+          task_name: "e2e_tests_darwin_x64"
   - name: e2e_tests_darwin_x64_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11120,7 +11120,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_x64_70x_fips"
+          task_name: "e2e_tests_darwin_x64_70x_fips"
   - name: e2e_tests_darwin_x64_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11140,7 +11140,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_x64_70x"
+          task_name: "e2e_tests_darwin_x64_70x"
   - name: e2e_tests_darwin_x64_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11160,7 +11160,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_x64_60x_fips"
+          task_name: "e2e_tests_darwin_x64_60x_fips"
   - name: e2e_tests_darwin_x64_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11180,7 +11180,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_x64_60x"
+          task_name: "e2e_tests_darwin_x64_60x"
   - name: perf_tests_darwin_x64
     tags: ["perf-test"]
     depends_on:
@@ -11214,7 +11214,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_arm64_fips"
+          task_name: "e2e_tests_darwin_arm64_fips"
   - name: e2e_tests_darwin_arm64
     tags: ["e2e-test"]
     depends_on:
@@ -11234,7 +11234,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_arm64"
+          task_name: "e2e_tests_darwin_arm64"
   - name: e2e_tests_darwin_arm64_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11254,7 +11254,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_arm64_70x_fips"
+          task_name: "e2e_tests_darwin_arm64_70x_fips"
   - name: e2e_tests_darwin_arm64_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11274,7 +11274,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_arm64_70x"
+          task_name: "e2e_tests_darwin_arm64_70x"
   - name: e2e_tests_darwin_arm64_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11294,7 +11294,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_arm64_60x_fips"
+          task_name: "e2e_tests_darwin_arm64_60x_fips"
   - name: e2e_tests_darwin_arm64_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11314,7 +11314,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_darwin_arm64_60x"
+          task_name: "e2e_tests_darwin_arm64_60x"
   - name: perf_tests_darwin_arm64
     tags: ["perf-test"]
     depends_on:
@@ -11348,7 +11348,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_fips"
+          task_name: "e2e_tests_linux_x64_fips"
   - name: e2e_tests_linux_x64
     tags: ["e2e-test"]
     depends_on:
@@ -11368,7 +11368,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64"
+          task_name: "e2e_tests_linux_x64"
   - name: e2e_tests_linux_x64_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11388,7 +11388,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_70x_fips"
+          task_name: "e2e_tests_linux_x64_70x_fips"
   - name: e2e_tests_linux_x64_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11408,7 +11408,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_70x"
+          task_name: "e2e_tests_linux_x64_70x"
   - name: e2e_tests_linux_x64_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11428,7 +11428,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_60x_fips"
+          task_name: "e2e_tests_linux_x64_60x_fips"
   - name: e2e_tests_linux_x64_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11448,7 +11448,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_60x"
+          task_name: "e2e_tests_linux_x64_60x"
   - name: perf_tests_linux_x64
     tags: ["perf-test"]
     depends_on:
@@ -11482,7 +11482,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl11_fips"
+          task_name: "e2e_tests_linux_x64_openssl11_fips"
   - name: e2e_tests_linux_x64_openssl11
     tags: ["e2e-test"]
     depends_on:
@@ -11502,7 +11502,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl11"
+          task_name: "e2e_tests_linux_x64_openssl11"
   - name: e2e_tests_linux_x64_openssl11_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11522,7 +11522,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl11_70x_fips"
+          task_name: "e2e_tests_linux_x64_openssl11_70x_fips"
   - name: e2e_tests_linux_x64_openssl11_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11542,7 +11542,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl11_70x"
+          task_name: "e2e_tests_linux_x64_openssl11_70x"
   - name: e2e_tests_linux_x64_openssl11_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11562,7 +11562,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl11_60x_fips"
+          task_name: "e2e_tests_linux_x64_openssl11_60x_fips"
   - name: e2e_tests_linux_x64_openssl11_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11582,7 +11582,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl11_60x"
+          task_name: "e2e_tests_linux_x64_openssl11_60x"
   - name: perf_tests_linux_x64_openssl11
     tags: ["perf-test"]
     depends_on:
@@ -11616,7 +11616,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl3_fips"
+          task_name: "e2e_tests_linux_x64_openssl3_fips"
   - name: e2e_tests_linux_x64_openssl3
     tags: ["e2e-test"]
     depends_on:
@@ -11636,7 +11636,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl3"
+          task_name: "e2e_tests_linux_x64_openssl3"
   - name: e2e_tests_linux_x64_openssl3_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11656,7 +11656,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl3_70x_fips"
+          task_name: "e2e_tests_linux_x64_openssl3_70x_fips"
   - name: e2e_tests_linux_x64_openssl3_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11676,7 +11676,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl3_70x"
+          task_name: "e2e_tests_linux_x64_openssl3_70x"
   - name: e2e_tests_linux_x64_openssl3_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11696,7 +11696,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl3_60x_fips"
+          task_name: "e2e_tests_linux_x64_openssl3_60x_fips"
   - name: e2e_tests_linux_x64_openssl3_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11716,7 +11716,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_x64_openssl3_60x"
+          task_name: "e2e_tests_linux_x64_openssl3_60x"
   - name: perf_tests_linux_x64_openssl3
     tags: ["perf-test"]
     depends_on:
@@ -11750,7 +11750,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_fips"
+          task_name: "e2e_tests_linux_arm64_fips"
   - name: e2e_tests_linux_arm64
     tags: ["e2e-test"]
     depends_on:
@@ -11770,7 +11770,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64"
+          task_name: "e2e_tests_linux_arm64"
   - name: e2e_tests_linux_arm64_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11790,7 +11790,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_70x_fips"
+          task_name: "e2e_tests_linux_arm64_70x_fips"
   - name: e2e_tests_linux_arm64_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11810,7 +11810,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_70x"
+          task_name: "e2e_tests_linux_arm64_70x"
   - name: e2e_tests_linux_arm64_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11830,7 +11830,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_60x_fips"
+          task_name: "e2e_tests_linux_arm64_60x_fips"
   - name: e2e_tests_linux_arm64_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11850,7 +11850,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_60x"
+          task_name: "e2e_tests_linux_arm64_60x"
   - name: perf_tests_linux_arm64
     tags: ["perf-test"]
     depends_on:
@@ -11884,7 +11884,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl11_fips"
+          task_name: "e2e_tests_linux_arm64_openssl11_fips"
   - name: e2e_tests_linux_arm64_openssl11
     tags: ["e2e-test"]
     depends_on:
@@ -11904,7 +11904,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl11"
+          task_name: "e2e_tests_linux_arm64_openssl11"
   - name: e2e_tests_linux_arm64_openssl11_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11924,7 +11924,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl11_70x_fips"
+          task_name: "e2e_tests_linux_arm64_openssl11_70x_fips"
   - name: e2e_tests_linux_arm64_openssl11_70x
     tags: ["e2e-test"]
     depends_on:
@@ -11944,7 +11944,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl11_70x"
+          task_name: "e2e_tests_linux_arm64_openssl11_70x"
   - name: e2e_tests_linux_arm64_openssl11_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -11964,7 +11964,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl11_60x_fips"
+          task_name: "e2e_tests_linux_arm64_openssl11_60x_fips"
   - name: e2e_tests_linux_arm64_openssl11_60x
     tags: ["e2e-test"]
     depends_on:
@@ -11984,7 +11984,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl11_60x"
+          task_name: "e2e_tests_linux_arm64_openssl11_60x"
   - name: perf_tests_linux_arm64_openssl11
     tags: ["perf-test"]
     depends_on:
@@ -12018,7 +12018,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl3_fips"
+          task_name: "e2e_tests_linux_arm64_openssl3_fips"
   - name: e2e_tests_linux_arm64_openssl3
     tags: ["e2e-test"]
     depends_on:
@@ -12038,7 +12038,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl3"
+          task_name: "e2e_tests_linux_arm64_openssl3"
   - name: e2e_tests_linux_arm64_openssl3_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12058,7 +12058,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl3_70x_fips"
+          task_name: "e2e_tests_linux_arm64_openssl3_70x_fips"
   - name: e2e_tests_linux_arm64_openssl3_70x
     tags: ["e2e-test"]
     depends_on:
@@ -12078,7 +12078,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl3_70x"
+          task_name: "e2e_tests_linux_arm64_openssl3_70x"
   - name: e2e_tests_linux_arm64_openssl3_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12098,7 +12098,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl3_60x_fips"
+          task_name: "e2e_tests_linux_arm64_openssl3_60x_fips"
   - name: e2e_tests_linux_arm64_openssl3_60x
     tags: ["e2e-test"]
     depends_on:
@@ -12118,7 +12118,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_arm64_openssl3_60x"
+          task_name: "e2e_tests_linux_arm64_openssl3_60x"
   - name: perf_tests_linux_arm64_openssl3
     tags: ["perf-test"]
     depends_on:
@@ -12152,7 +12152,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_ppc64le_fips"
+          task_name: "e2e_tests_linux_ppc64le_fips"
   - name: e2e_tests_linux_ppc64le
     tags: ["e2e-test"]
     depends_on:
@@ -12172,7 +12172,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_ppc64le"
+          task_name: "e2e_tests_linux_ppc64le"
   - name: e2e_tests_linux_ppc64le_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12192,7 +12192,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_ppc64le_70x_fips"
+          task_name: "e2e_tests_linux_ppc64le_70x_fips"
   - name: e2e_tests_linux_ppc64le_70x
     tags: ["e2e-test"]
     depends_on:
@@ -12212,7 +12212,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_ppc64le_70x"
+          task_name: "e2e_tests_linux_ppc64le_70x"
   - name: e2e_tests_linux_ppc64le_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12232,7 +12232,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_ppc64le_60x_fips"
+          task_name: "e2e_tests_linux_ppc64le_60x_fips"
   - name: e2e_tests_linux_ppc64le_60x
     tags: ["e2e-test"]
     depends_on:
@@ -12252,7 +12252,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_ppc64le_60x"
+          task_name: "e2e_tests_linux_ppc64le_60x"
   - name: perf_tests_linux_ppc64le
     tags: ["perf-test"]
     depends_on:
@@ -12286,7 +12286,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_s390x_fips"
+          task_name: "e2e_tests_linux_s390x_fips"
   - name: e2e_tests_linux_s390x
     tags: ["e2e-test"]
     depends_on:
@@ -12306,7 +12306,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_s390x"
+          task_name: "e2e_tests_linux_s390x"
   - name: e2e_tests_linux_s390x_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12326,7 +12326,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_s390x_70x_fips"
+          task_name: "e2e_tests_linux_s390x_70x_fips"
   - name: e2e_tests_linux_s390x_70x
     tags: ["e2e-test"]
     depends_on:
@@ -12346,7 +12346,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_s390x_70x"
+          task_name: "e2e_tests_linux_s390x_70x"
   - name: e2e_tests_linux_s390x_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12366,7 +12366,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_s390x_60x_fips"
+          task_name: "e2e_tests_linux_s390x_60x_fips"
   - name: e2e_tests_linux_s390x_60x
     tags: ["e2e-test"]
     depends_on:
@@ -12386,7 +12386,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_linux_s390x_60x"
+          task_name: "e2e_tests_linux_s390x_60x"
   - name: perf_tests_linux_s390x
     tags: ["perf-test"]
     depends_on:
@@ -12420,7 +12420,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_win32_fips"
+          task_name: "e2e_tests_win32_fips"
   - name: e2e_tests_win32
     tags: ["e2e-test"]
     depends_on:
@@ -12440,7 +12440,7 @@ tasks:
           mongosh_server_test_version: "stable-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_win32"
+          task_name: "e2e_tests_win32"
   - name: e2e_tests_win32_70x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12460,7 +12460,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_win32_70x_fips"
+          task_name: "e2e_tests_win32_70x_fips"
   - name: e2e_tests_win32_70x
     tags: ["e2e-test"]
     depends_on:
@@ -12480,7 +12480,7 @@ tasks:
           mongosh_server_test_version: "7.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_win32_70x"
+          task_name: "e2e_tests_win32_70x"
   - name: e2e_tests_win32_60x_fips
     tags: ["e2e-test"]
     depends_on:
@@ -12500,7 +12500,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: "1"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_win32_60x_fips"
+          task_name: "e2e_tests_win32_60x_fips"
   - name: e2e_tests_win32_60x
     tags: ["e2e-test"]
     depends_on:
@@ -12520,7 +12520,7 @@ tasks:
           mongosh_server_test_version: "6.0.x-enterprise"
           mongosh_test_e2e_force_fips: ""
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_win32_60x"
+          task_name: "e2e_tests_win32_60x"
   - name: perf_tests_win32
     tags: ["perf-test"]
     depends_on:
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index c970315ff..271179944 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -520,7 +520,7 @@ functions:
           AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
           AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
           DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl}
-          E2E_TASK_NAME: ${var_task_name}
+          E2E_TASK_NAME: ${task_name}
 
   ###
   # PACKAGING AND UPLOADING
@@ -1232,7 +1232,7 @@ tasks:
           mongosh_server_test_version: "<% out(mVersion) %>-enterprise"
           mongosh_test_e2e_force_fips: "<% out(fipsVariant === 'fips' ? '1' : '') %>"
           disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
-          var_task_name: "e2e_tests_<% out(executableOsId.replace(/-/g, '_')) %><% out(mVersion === 'stable' ? '' : '_' + mVersion.replace(/[^a-zA-Z0-9]/g, '')) %><% out(fipsVariant === 'fips' ? '_fips' : '') %>"
+          task_name: "e2e_tests_<% out(executableOsId.replace(/-/g, '_')) %><% out(mVersion === 'stable' ? '' : '_' + mVersion.replace(/[^a-zA-Z0-9]/g, '')) %><% out(fipsVariant === 'fips' ? '_fips' : '') %>"
   <% } } %>
   - name: perf_tests_<% out(executableOsId.replace(/-/g, '_')) %>
     tags: ["perf-test"]
diff --git a/.evergreen/run-e2e-tests.sh b/.evergreen/run-e2e-tests.sh
index f91708b6f..48308bd25 100755
--- a/.evergreen/run-e2e-tests.sh
+++ b/.evergreen/run-e2e-tests.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 set -e
-echo "e2e test task_name:"
-echo $E2E_TASK_NAME
 export NODE_JS_VERSION=${NODE_JS_VERSION}
 export E2E_TASK_NAME=${E2E_TASK_NAME}