diff options
| author | Robert Guo <robert.guo@mongodb.com> | 2021-06-10 19:36:11 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-07-27 19:18:47 +0000 |
| commit | f52309886d2aac8d18f987830d1bddbd60332de5 (patch) | |
| tree | 958a3029714119c167a5120f1221d95cce62f734 /evergreen | |
| parent | 2dcea5045b0ddc807d361fc55a4a265c418ecd98 (diff) | |
| download | mongo-f52309886d2aac8d18f987830d1bddbd60332de5.tar.gz | |
SERVER-57580 combine task_path_suffix and use_multiversion into
require_multiversion
(cherry picked from commit c940646a2bda05b6e6ba1c84be9d3c52a6426559)
Diffstat (limited to 'evergreen')
| -rwxr-xr-x | evergreen/prelude.sh | 2 | ||||
| -rw-r--r-- | evergreen/resmoke_tests_execute.sh | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/evergreen/prelude.sh b/evergreen/prelude.sh index a44b69e7a0a..81bacd45325 100755 --- a/evergreen/prelude.sh +++ b/evergreen/prelude.sh @@ -1,5 +1,5 @@ if [[ "$0" == *"/evergreen/prelude.sh" ]]; then - echo "ERROR: do not execute this script. source it instead. ie: . prelude.sh" + echo "ERROR: do not execute this script. source it instead. i.e.: . prelude.sh" exit 1 fi set -o errexit diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh index 5031b478980..561feb9c620 100644 --- a/evergreen/resmoke_tests_execute.sh +++ b/evergreen/resmoke_tests_execute.sh @@ -92,13 +92,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then extra_args="$extra_args --mongodSetParameter \"{'jsHeapLimitMB':10}\"" fi - path_value="$PATH" - if [ ${variant_path_suffix} ]; then - path_value="$path_value:${variant_path_suffix}" - fi - if [ ${task_path_suffix} ]; then - path_value="$path_value:${task_path_suffix}" - fi + path_value="$PATH:/data/multiversion" # The "resmoke_wrapper" expansion is used by the 'burn_in_tests' task to wrap the resmoke.py # invocation. It doesn't set any environment variables and should therefore come last in |