diff options
| -rw-r--r-- | buildscripts/resmokelib/cli.py | 2 | ||||
| -rw-r--r-- | buildscripts/resmokelib/parser.py | 2 | ||||
| -rw-r--r-- | buildscripts/resmokelib/testing/symbolizer_service.py | 4 | ||||
| -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 |
7 files changed, 11 insertions, 9 deletions
diff --git a/buildscripts/resmokelib/cli.py b/buildscripts/resmokelib/cli.py index fe3cdeeae65..1a72d6e6389 100644 --- a/buildscripts/resmokelib/cli.py +++ b/buildscripts/resmokelib/cli.py @@ -25,7 +25,7 @@ def main(argv): usage="Resmoke is MongoDB's correctness testing orchestrator.\n" "For more information, see the help message for each subcommand.\n" "For example: resmoke.py run -h\n" - "Note: bisect, setup-multiversion and symbolize subcommands have been moved to db-contrib-tool (https://github.com/10gen/db-contrib-tool#readme).\n" + "Note: bisect and setup-multiversion subcommands have been moved to db-contrib-tool (https://github.com/10gen/db-contrib-tool#readme).\n" ) try: metrics_client = get_mongo_metrics_client() diff --git a/buildscripts/resmokelib/parser.py b/buildscripts/resmokelib/parser.py index 80e647a9906..e09b76ec292 100644 --- a/buildscripts/resmokelib/parser.py +++ b/buildscripts/resmokelib/parser.py @@ -11,6 +11,7 @@ from buildscripts.resmokelib.hang_analyzer import HangAnalyzerPlugin from buildscripts.resmokelib.multiversion import MultiversionPlugin from buildscripts.resmokelib.powercycle import PowercyclePlugin from buildscripts.resmokelib.run import RunPlugin +from buildscripts.resmokelib.symbolizer import SymbolizerPlugin from buildscripts.resmokelib.undodb import UndoDbPlugin _PLUGINS = [ @@ -18,6 +19,7 @@ _PLUGINS = [ HangAnalyzerPlugin(), UndoDbPlugin(), PowercyclePlugin(), + SymbolizerPlugin(), GenerateFCVConstantsPlugin(), DiscoveryPlugin(), MultiversionPlugin(), diff --git a/buildscripts/resmokelib/testing/symbolizer_service.py b/buildscripts/resmokelib/testing/symbolizer_service.py index 86d190640e0..7f02d164919 100644 --- a/buildscripts/resmokelib/testing/symbolizer_service.py +++ b/buildscripts/resmokelib/testing/symbolizer_service.py @@ -318,8 +318,8 @@ class SymbolizerService: """ symbolizer_args = [ - "db-contrib-tool", - "symbolize", + "python", + "buildscripts/mongosymb.py", "--client-secret", _config.SYMBOLIZER_CLIENT_SECRET, "--client-id", 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}" |