diff options
| author | Mikhail Shchatko <mikhail.shchatko@mongodb.com> | 2023-05-08 10:37:08 +0300 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-08 08:15:37 +0000 |
| commit | dcebc8d16931e364e8a1fdf390dfff1dad6cf119 (patch) | |
| tree | c497f319e82f01ae1d18310658b8c7e026aa2fe3 /evergreen | |
| parent | 73013a50d60d58c9525df3e1e5b3c6ace21cb7f6 (diff) | |
| download | mongo-dcebc8d16931e364e8a1fdf390dfff1dad6cf119.tar.gz | |
Revert "SERVER-76651 Switch to using db-contrib-tool symbolize command in resmoke"
This reverts commit b7cd217d0124e3c766038d9e2dd6b2ad7c2a5a6d.
Diffstat (limited to 'evergreen')
| -rwxr-xr-x | evergreen/compiled_binaries_get.sh | 2 | ||||
| -rw-r--r-- | evergreen/multiversion_setup.sh | 3 | ||||
| -rw-r--r-- | evergreen/prelude_db_contrib_tool.sh | 6 | ||||
| -rw-r--r-- | evergreen/resmoke_tests_execute.sh | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/evergreen/compiled_binaries_get.sh b/evergreen/compiled_binaries_get.sh index 0a03489eafd..9b36354fb52 100755 --- a/evergreen/compiled_binaries_get.sh +++ b/evergreen/compiled_binaries_get.sh @@ -8,7 +8,7 @@ set -o verbose # activate_venv will make sure we are using python 3 activate_venv -setup_db_contrib_tool +setup_db_contrib_tool_venv rm -rf /data/install /data/multiversion diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh index 0c4ff926645..37093a678e7 100644 --- a/evergreen/multiversion_setup.sh +++ b/evergreen/multiversion_setup.sh @@ -7,7 +7,8 @@ set -o errexit set -o verbose activate_venv -setup_db_contrib_tool + +setup_db_contrib_tool_venv export PIPX_HOME="${workdir}/pipx" export PIPX_BIN_DIR="${workdir}/pipx/bin" diff --git a/evergreen/prelude_db_contrib_tool.sh b/evergreen/prelude_db_contrib_tool.sh index 388400a8bd2..8e9ad1a3995 100644 --- a/evergreen/prelude_db_contrib_tool.sh +++ b/evergreen/prelude_db_contrib_tool.sh @@ -1,11 +1,11 @@ -function setup_db_contrib_tool { +function setup_db_contrib_tool_venv { - mkdir -p ${workdir}/pipx + mkdir ${workdir}/pipx export PIPX_HOME="${workdir}/pipx" export PIPX_BIN_DIR="${workdir}/pipx/bin" export PATH="$PATH:$PIPX_BIN_DIR" python -m pip --disable-pip-version-check install "pip==21.0.1" "wheel==0.37.0" || exit 1 python -m pip --disable-pip-version-check install "pipx" || exit 1 - pipx install "db-contrib-tool==0.6.2" || exit 1 + pipx install "db-contrib-tool==0.6.0" || exit 1 } diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh index 135143a03b2..37dc3773e71 100644 --- a/evergreen/resmoke_tests_execute.sh +++ b/evergreen/resmoke_tests_execute.sh @@ -14,7 +14,6 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then # activate the virtualenv if it has been set up activate_venv - setup_db_contrib_tool if [[ -f "patch_test_tags.tgz" ]]; then tags_build_variant="${build_variant}" |