derive executable OS ID from name

Author: gagik

.evergreen.yml

@@ -8276,7 +8276,7 @@ tasks:
           node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: build_linux_x64
+          executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
           node_js_version: ${node_js_version}
@@ -8296,7 +8296,7 @@ tasks:
           node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: build_linux_arm64
+          executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
           node_js_version: ${node_js_version}
@@ -8316,7 +8316,7 @@ tasks:
           node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: build_darwin
+          executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
           node_js_version: ${node_js_version}
@@ -8336,7 +8336,7 @@ tasks:
           node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: build_darwin_arm64
+          executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
           node_js_version: ${node_js_version}
@@ -8356,7 +8356,7 @@ tasks:
           node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: build_win32
+          executable_os_id: win32
       - func: run_e2e_tests
         vars:
           node_js_version: ${node_js_version}
@@ -15296,7 +15296,7 @@ buildvariants:
     run_on: macos-11-arm64
     tags: []
     expansions:
-      executable_os_id: "darwin-arm64"
+      executable_os_id: "darwin-x64"
       disable_openssl_shared_config_for_bundled_openssl: false
       node_js_version: "20.18.1"
       mongosh_server_test_version: "stable-enterprise"

.evergreen/evergreen.yml.in

@@ -583,7 +583,7 @@ const ALL_E2E_TEST_BUILD_VARIANTS =  [
     displayName: "MacOS Big Sur arm64",
     runOn: "macos-11-arm64",
     name: "darwin_arm64",
-    executableOsId: "darwin-arm64",
+    executableOsId: "darwin-x64",
     mVersion: "stable",
   },
   {
@@ -1818,8 +1818,11 @@ tasks:
   # E2E TESTS
   ###
   # Tests reuse the same compilation build variant, so we create those variations based on this.
-  <% for (const compileBuildVariant of ['build_linux_x64', 'build_linux_arm64', 'build_darwin', 'build_darwin_arm64', 'build_win32']) { %>
-  - name: e2e_tests<% out(compileBuildVariant ? `_${compileBuildVariant.replace('build_', '')}` : '') %>
+  <% for (const compileBuildVariant of ['build_linux_x64', 'build_linux_arm64', 'build_darwin', 'build_darwin_arm64', 'build_win32']) { 
+    const platformName = compileBuildVariant.replace('build_', '');
+    const executableOsId = platformName == 'darwin' ? 'darwin-x64' : platformName.replaceAll('_', '-');
+    %>
+  - name: e2e_tests_<% out(platformName) %>
     tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
     depends_on:
       - name: compile_artifact
@@ -1833,7 +1836,7 @@ tasks:
           node_js_version: ${node_js_version}
       - func: download_compiled_artifact
         vars:
-          executable_os_id: <% out(compileBuildVariant) %>
+          executable_os_id: <% out(executableOsId) %>
       - func: run_e2e_tests
         vars:
           node_js_version: ${node_js_version}