From 5801874b4d9d6dd3fd6f15ff531c2e610eaa57bf Mon Sep 17 00:00:00 2001 From: gagik Date: Thu, 14 Nov 2024 15:41:27 +0100 Subject: [PATCH] Use correct expansions --- .evergreen.yml | 150 ++++++++++++++++++------------------ .evergreen/evergreen.yml.in | 6 +- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index 4a2580320..8737f736a 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -7735,9 +7735,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "arg_parser" mongosh_run_only_in_package: "arg-parser" task_name: ${task_name} @@ -7753,9 +7753,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "async_rewriter2" mongosh_run_only_in_package: "async-rewriter2" task_name: ${task_name} @@ -7771,9 +7771,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "autocomplete" mongosh_run_only_in_package: "autocomplete" task_name: ${task_name} @@ -7789,9 +7789,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "browser_repl" mongosh_run_only_in_package: "browser-repl" task_name: ${task_name} @@ -7807,9 +7807,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "browser_runtime_core" mongosh_run_only_in_package: "browser-runtime-core" task_name: ${task_name} @@ -7825,9 +7825,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "browser_runtime_electron" mongosh_run_only_in_package: "browser-runtime-electron" task_name: ${task_name} @@ -7843,9 +7843,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "build" mongosh_run_only_in_package: "build" task_name: ${task_name} @@ -7861,9 +7861,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "cli_repl" mongosh_run_only_in_package: "cli-repl" task_name: ${task_name} @@ -7879,9 +7879,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "connectivity_tests" mongosh_run_only_in_package: "connectivity-tests" task_name: ${task_name} @@ -7897,9 +7897,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "e2e_tests" mongosh_run_only_in_package: "e2e-tests" task_name: ${task_name} @@ -7915,9 +7915,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "editor" mongosh_run_only_in_package: "editor" task_name: ${task_name} @@ -7933,9 +7933,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "errors" mongosh_run_only_in_package: "errors" task_name: ${task_name} @@ -7951,9 +7951,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "history" mongosh_run_only_in_package: "history" task_name: ${task_name} @@ -7969,9 +7969,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "i18n" mongosh_run_only_in_package: "i18n" task_name: ${task_name} @@ -7987,9 +7987,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "java_shell" mongosh_run_only_in_package: "java-shell" task_name: ${task_name} @@ -8005,9 +8005,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "js_multiline_to_singleline" mongosh_run_only_in_package: "js-multiline-to-singleline" task_name: ${task_name} @@ -8023,9 +8023,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "logging" mongosh_run_only_in_package: "logging" task_name: ${task_name} @@ -8041,9 +8041,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "mongosh" mongosh_run_only_in_package: "mongosh" task_name: ${task_name} @@ -8059,9 +8059,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "node_runtime_worker_thread" mongosh_run_only_in_package: "node-runtime-worker-thread" task_name: ${task_name} @@ -8077,9 +8077,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "service_provider_core" mongosh_run_only_in_package: "service-provider-core" task_name: ${task_name} @@ -8095,9 +8095,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "service_provider_node_driver" mongosh_run_only_in_package: "service-provider-node-driver" task_name: ${task_name} @@ -8113,9 +8113,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "shell_api" mongosh_run_only_in_package: "shell-api" task_name: ${task_name} @@ -8131,9 +8131,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "shell_evaluator" mongosh_run_only_in_package: "shell-evaluator" task_name: ${task_name} @@ -8149,9 +8149,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "snippet_manager" mongosh_run_only_in_package: "snippet-manager" task_name: ${task_name} @@ -8167,9 +8167,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "types" mongosh_run_only_in_package: "types" task_name: ${task_name} diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index 16a52c218..3f7b4461c 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -1141,9 +1141,9 @@ tasks: node_js_version: ${nVersion} - func: test vars: - mongosh_server_test_version: ${mVersion} - node_js_version: ${nVersion} - mongosh_skip_node_version_check: ${skipNodeVersionCheck} + mongosh_server_test_version: ${mongosh_server_test_version} + node_js_version: ${node_js_version} + mongosh_skip_node_version_check: ${mongosh_skip_node_version_check} mongosh_test_id: "<% out(id) %>" mongosh_run_only_in_package: "<% out(packageName) %>" task_name: ${task_name}