SERVER-57580 combine task_path_suffix and use_multiversion into

require_multiversion

(cherry picked from commit c940646a2bda05b6e6ba1c84be9d3c52a6426559)

1 files changed, 22 insertions, 24 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 04dda899233..ac3e303e062 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -3036,7 +3036,7 @@ tasks:
       suite: initial_sync_multiversion_fuzzer
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
       name: initial_sync_multiversion_fuzzer
-      task_path_suffix: "/data/multiversion"
+      require_multiversion: true
 
 ## initial sync generational fuzzer ##
 - <<: *jstestfuzz_template
@@ -3066,7 +3066,7 @@ tasks:
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
       npm_command: agg-fuzzer
       name: aggregation_multiversion_fuzzer
-      task_path_suffix: "/data/multiversion"
+      require_multiversion: true
 
 ## Standalone generational fuzzer for multiversion aggregation expressions ##
 - <<: *jstestfuzz_template
@@ -3082,7 +3082,7 @@ tasks:
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
       npm_command: agg-expr-fuzzer
       name: aggregation_expression_multiversion_fuzzer
-      task_path_suffix: "/data/multiversion"
+      require_multiversion: true
 
 ## Standalone generational fuzzer for checking optimized and unoptimized expression equivalence
 - <<: *jstestfuzz_template
@@ -3194,7 +3194,7 @@ tasks:
       suite: generational_fuzzer
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
       name: update_fuzzer
-      task_path_suffix: "/data/multiversion"
+      require_multiversion: true
 
 ## jstestfuzz replication update generational fuzzer ##
 - <<: *jstestfuzz_template
@@ -3210,7 +3210,7 @@ tasks:
       suite: generational_fuzzer_replication
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
       name: update_fuzzer_replication
-      task_path_suffix: "/data/multiversion"
+      require_multiversion: true
 
 ## rollback multiversion fuzzer ##
 - <<: *jstestfuzz_template
@@ -3228,7 +3228,7 @@ tasks:
       # index build commit quorum.
       resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}, enableIndexBuildCommitQuorum: false}'"
       name: rollback_multiversion_fuzzer
-      task_path_suffix: "/data/multiversion"
+      require_multiversion: true
 
 ## rollback generational fuzzer ##
 - <<: *jstestfuzz_template
@@ -3566,8 +3566,7 @@ tasks:
       resmoke_args: "--storageEngine=wiredTiger --mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
       suite: jstestfuzz_replication
       is_jstestfuzz: true
-      use_multiversion: /data/multiversion
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
       npm_command: jstestfuzz
 
 ## jstestfuzz initial sync replica set ##
@@ -3623,8 +3622,7 @@ tasks:
       resmoke_args: "--storageEngine=wiredTiger --mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
       suite: jstestfuzz_sharded
       is_jstestfuzz: true
-      use_multiversion: /data/multiversion
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
       npm_command: jstestfuzz
 
 ## jstestfuzz sharded cluster causal consistency ##
@@ -3752,7 +3750,7 @@ tasks:
     vars:
       suite: replica_sets_jscore_passthrough
       resmoke_args: --storageEngine=wiredTiger --includeWithAnyTags=multiversion_sanity_check
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
 
 - name: replica_sets_jscore_multiversion_passthrough_gen
   tags: ["multiversion_passthrough"]
@@ -3761,7 +3759,7 @@ tasks:
     vars:
       suite: replica_sets_jscore_passthrough
       resmoke_args: --storageEngine=wiredTiger
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
 
 # Check that the mutational fuzzer can parse JS files modified in a patch build.
 - name: lint_fuzzer_sanity_patch
@@ -3992,7 +3990,7 @@ tasks:
     vars:
       suite: change_streams
       resmoke_args: --storageEngine=wiredTiger
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
 
 - <<: *task_template
   name: change_streams_update_v1_oplog
@@ -4057,7 +4055,7 @@ tasks:
     vars:
       suite: change_streams_sharded_collections_passthrough
       resmoke_args: --storageEngine=wiredTiger
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
 
 - <<: *task_template
   name: change_streams_whole_db_passthrough
@@ -4782,14 +4780,14 @@ tasks:
   - func: "generate resmoke tasks"
     vars:
       resmoke_args: "--storageEngine=wiredTiger"
-      use_multiversion: /data/multiversion
+      require_multiversion: true
 
 - name: multiversion_gen
   commands:
   - func: "generate resmoke tasks"
     vars:
       resmoke_args: "--storageEngine=wiredTiger"
-      use_multiversion: /data/multiversion
+      require_multiversion: true
 
 # Tests the runFeatureFlagMultiversionTest helper.
 # This requires the 'featureFlagToaster' and 'featureFlagSpoon' parameters to be set to true on
@@ -4799,7 +4797,7 @@ tasks:
   - func: "generate resmoke tasks"
     vars:
       resmoke_args: "--storageEngine=wiredTiger"
-      use_multiversion: /data/multiversion
+      require_multiversion: true
 
 - name: unittest_shell_hang_analyzer_gen
   commands:
@@ -4879,7 +4877,7 @@ tasks:
     vars:
       suite: sharded_collections_jscore_passthrough
       resmoke_args: --storageEngine=wiredTiger
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
 
 - <<: *task_template
   name: sharding_jscore_passthrough
@@ -4898,7 +4896,7 @@ tasks:
     vars:
       suite: sharding_jscore_passthrough
       resmoke_args: --storageEngine=wiredTiger
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
 
 - name: sharding_api_version_jscore_passthrough_gen
   tags: ["sharding", "jscore"]
@@ -5101,7 +5099,7 @@ tasks:
     vars:
       suite: concurrency_replication
       resmoke_args: --storageEngine=wiredTiger
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
 
 - name: concurrency_replication_causal_consistency_gen
   tags: ["concurrency", "repl", "large", "non_live_record"]
@@ -5184,7 +5182,7 @@ tasks:
     vars:
       suite: concurrency_sharded_replication
       resmoke_args: --storageEngine=wiredTiger
-      task_path_suffix: /data/multiversion
+      require_multiversion: true
 
 - name: concurrency_sharded_replication_with_balancer_gen
   tags: ["concurrency", "common", "read_concern_maj", "large", "sharded"]
@@ -5499,7 +5497,7 @@ tasks:
   - func: "generate randomized multiversion tasks"
     vars:
       resmoke_args: --storageEngine=wiredTiger --tagFile=generated_resmoke_config/multiversion_exclude_tags.yml
-      use_multiversion: /data/multiversion
+      require_multiversion: true
       suite: replica_sets_multiversion
 
 - <<: *task_template
@@ -5525,7 +5523,7 @@ tasks:
     vars:
       use_large_distro: "true"
       resmoke_args: --storageEngine=wiredTiger --tagFile=generated_resmoke_config/multiversion_exclude_tags.yml
-      use_multiversion: /data/multiversion
+      require_multiversion: true
       suite: sharding_multiversion
 
 - name: sharding_max_mirroring_gen
@@ -5592,7 +5590,7 @@ tasks:
   - func: "generate explicit multiversion tasks"
     vars:
       use_large_distro: "true"
-      use_multiversion: /data/multiversion
+      require_multiversion: true
       resmoke_args: --tagFile=generated_resmoke_config/multiversion_exclude_tags.yml
 
 - name: sharding_update_v1_oplog_gen