SERVER-61355 Remove setup-multiversion from the mongo repo

4 files changed, 10 insertions, 11 deletions

diff --git a/buildscripts/resmokelib/cli.py b/buildscripts/resmokelib/cli.py
index 6743e62043b..2cb85721e9e 100644
--- a/buildscripts/resmokelib/cli.py
+++ b/buildscripts/resmokelib/cli.py
@@ -18,6 +18,6 @@ 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 subcommand has 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"
     )
     subcommand.execute()
diff --git a/buildscripts/resmokelib/parser.py b/buildscripts/resmokelib/parser.py
index 92452c68225..70ec736ab95 100644
--- a/buildscripts/resmokelib/parser.py
+++ b/buildscripts/resmokelib/parser.py
@@ -8,7 +8,6 @@ from buildscripts.resmokelib.generate_fcv_constants import GenerateFCVConstantsP
 from buildscripts.resmokelib.hang_analyzer import HangAnalyzerPlugin
 from buildscripts.resmokelib.powercycle import PowercyclePlugin
 from buildscripts.resmokelib.run import RunPlugin
-from buildscripts.resmokelib.setup_multiversion import SetupMultiversionPlugin
 from buildscripts.resmokelib.symbolizer import SymbolizerPlugin
 from buildscripts.resmokelib.undodb import UndoDbPlugin
 
@@ -16,7 +15,6 @@ _PLUGINS = [
     RunPlugin(),
     HangAnalyzerPlugin(),
     UndoDbPlugin(),
-    SetupMultiversionPlugin(),
     PowercyclePlugin(),
     SymbolizerPlugin(),
     GenerateFCVConstantsPlugin(),
diff --git a/evergreen/compiled_binaries_get.sh b/evergreen/compiled_binaries_get.sh
index fc4507173d1..3468e36510b 100755
--- a/evergreen/compiled_binaries_get.sh
+++ b/evergreen/compiled_binaries_get.sh
@@ -7,6 +7,7 @@ set -o errexit
 set -o verbose
 
 activate_venv
+$python -m pip --disable-pip-version-check install "db-contrib-tool==0.1.6"
 
 rm -rf /data/install dist-test/bin
 
@@ -36,10 +37,10 @@ fi
 
 # This is primarily for tests for infrastructure which don't always need the latest
 # binaries.
-$python buildscripts/resmoke.py setup-multiversion \
+db-contrib-tool setup-repro-env \
   --installDir /data/install \
   --linkDir dist-test/bin \
   --edition $edition \
   --platform $platform \
   --architecture $architecture \
-  --useLatest master
+  master
diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh
index c6f51c9ef11..606657a8d22 100644
--- a/evergreen/multiversion_setup.sh
+++ b/evergreen/multiversion_setup.sh
@@ -7,6 +7,7 @@ set -o errexit
 set -o verbose
 
 activate_venv
+$python -m pip --disable-pip-version-check install "db-contrib-tool==0.1.6"
 
 rm -rf /data/install /data/multiversion
 
@@ -14,13 +15,13 @@ edition="${multiversion_edition}"
 platform="${multiversion_platform}"
 architecture="${multiversion_architecture}"
 
-$python buildscripts/resmoke.py setup-multiversion \
+db-contrib-tool setup-repro-env \
   --installDir /data/install \
   --linkDir /data/multiversion \
   --edition $edition \
   --platform $platform \
   --architecture $architecture \
-  --useLatest 4.0
+  4.0
 
 # The platform and architecture for how some of the binaries are reported in
 # https://downloads.mongodb.org/full.json changed between MongoDB 4.0 and MongoDB 4.2.
@@ -39,13 +40,13 @@ if [ ! -z "${multiversion_architecture_42_or_later}" ]; then
   architecture="${multiversion_architecture_42_or_later}"
 fi
 
-$python buildscripts/resmoke.py setup-multiversion \
+db-contrib-tool setup-repro-env \
   --installDir /data/install \
   --linkDir /data/multiversion \
   --edition $edition \
   --platform $platform \
   --architecture $architecture \
-  --useLatest 4.2
+  4.2
 
 # The platform and architecture for how some of the binaries are reported in
 # https://downloads.mongodb.org/full.json changed between MongoDB 4.2 and MongoDB 4.4.
@@ -75,12 +76,11 @@ if [[ -n "${last_continuous_evg_version_id}" ]]; then
   last_continuous_arg="${last_continuous_evg_version_id}"
 fi
 
-$python buildscripts/resmoke.py setup-multiversion \
+db-contrib-tool setup-repro-env \
   --installDir /data/install \
   --linkDir /data/multiversion \
   --edition $edition \
   --platform $platform \
   --architecture $architecture \
-  --useLatest \
   $last_lts_arg \
   $last_continuous_arg 4.4 5.1