SERVER-57580 combine task_path_suffix and use_multiversion into

require_multiversion

(cherry picked from commit c940646a2bda05b6e6ba1c84be9d3c52a6426559)

1 files changed, 5 insertions, 9 deletions

diff --git a/buildscripts/ciconfig/evergreen.py b/buildscripts/ciconfig/evergreen.py
index e4e517a9647..877acf42026 100644
--- a/buildscripts/ciconfig/evergreen.py
+++ b/buildscripts/ciconfig/evergreen.py
@@ -164,11 +164,6 @@ class Task(object):
         return self.find_func_command("do multiversion setup")
 
     @property
-    def is_multiversion_task(self):
-        """Return True if a multiversion path is found."""
-        return self.multiversion_setup_command is not None or self.multiversion_path is not None
-
-    @property
     def generated_task_name(self):
         """
         Get basename of the tasks generated by this _gen task.
@@ -192,15 +187,16 @@ class Task(object):
         return suite_name
 
     @property
-    def multiversion_path(self):
+    def require_multiversion(self):
         """Get the multiversion path if task uses multiversion setup, or None."""
+        command_obj = None
         if self.is_run_tests_task:
-            return self.run_tests_command.get("vars", {}).get("task_path_suffix")
+            command_obj = self.run_tests_command
 
         if self.is_generate_resmoke_task:
-            return self.generate_resmoke_tasks_command.get("vars", {}).get("use_multiversion")
+            command_obj = self.generate_resmoke_tasks_command
 
-        return None
+        return command_obj.get("vars", {}).get("require_multiversion")
 
     @property
     def resmoke_args(self):