summaryrefslogtreecommitdiff
path: root/evergreen
diff options
context:
space:
mode:
authorMikhail Shchatko <mikhail.shchatko@mongodb.com>2023-05-04 07:30:33 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-05-04 08:37:15 +0000
commitb7cd217d0124e3c766038d9e2dd6b2ad7c2a5a6d (patch)
treead783ec291d9d0711101526ac99c6f25262d9dce /evergreen
parent3f9a346c19b65d8e110080bd8109cdf7be103cc1 (diff)
downloadmongo-b7cd217d0124e3c766038d9e2dd6b2ad7c2a5a6d.tar.gz
SERVER-76651 Switch to using db-contrib-tool symbolize command in resmoke
Diffstat (limited to 'evergreen')
-rwxr-xr-xevergreen/compiled_binaries_get.sh2
-rw-r--r--evergreen/multiversion_setup.sh3
-rw-r--r--evergreen/prelude_db_contrib_tool.sh6
-rw-r--r--evergreen/resmoke_tests_execute.sh1
4 files changed, 6 insertions, 6 deletions
diff --git a/evergreen/compiled_binaries_get.sh b/evergreen/compiled_binaries_get.sh
index 9b36354fb52..0a03489eafd 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_venv
+setup_db_contrib_tool
rm -rf /data/install /data/multiversion
diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh
index 37093a678e7..0c4ff926645 100644
--- a/evergreen/multiversion_setup.sh
+++ b/evergreen/multiversion_setup.sh
@@ -7,8 +7,7 @@ set -o errexit
set -o verbose
activate_venv
-
-setup_db_contrib_tool_venv
+setup_db_contrib_tool
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 8e9ad1a3995..388400a8bd2 100644
--- a/evergreen/prelude_db_contrib_tool.sh
+++ b/evergreen/prelude_db_contrib_tool.sh
@@ -1,11 +1,11 @@
-function setup_db_contrib_tool_venv {
+function setup_db_contrib_tool {
- mkdir ${workdir}/pipx
+ mkdir -p ${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.0" || exit 1
+ pipx install "db-contrib-tool==0.6.2" || exit 1
}
diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh
index 37dc3773e71..135143a03b2 100644
--- a/evergreen/resmoke_tests_execute.sh
+++ b/evergreen/resmoke_tests_execute.sh
@@ -14,6 +14,7 @@ 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}"