DEVPROD-18316Allow fuzzer tasks to use the no_multiversion_generate_tasks tag

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 3.4.0 - 2025-06-12
+* Allow fuzzer tasks to use the `no_multiversion_generate_tasks` tag
+
 ## 3.3.0 - 2025-06-10
 * Generate tasks for suites that run via bazel
 

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mongo-task-generator"
 description = "Dynamically split evergreen tasks into subtasks for testing the 10gen/mongo project."
 license = "Apache-2.0"
-version = "3.3.0"
+version = "3.4.0"
 repository = "https://github.com/mongodb/mongo-task-generator"
 authors = ["DevProd Correctness Team <[email protected]>"]
 edition = "2018"

src/services/config_extraction.rs

@@ -183,6 +183,9 @@ impl ConfigExtractionService for ConfigExtractionServiceImpl {
             .evg_config_utils
             .lookup_build_variant_expansion(UNIQUE_GEN_SUFFIX_EXPANSION, build_variant);
 
+        let task_tags = self.evg_config_utils.get_task_tags(task_def);
+        let require_multiversion_setup = task_tags.contains(MULTIVERSION);
+        let no_multiversion_generate_tasks = task_tags.contains(NO_MULTIVERSION_GENERATE_TASKS);
         let suite = evg_config_utils.find_suite_name(task_def).to_string();
 
         let bazel_target = self
@@ -213,9 +216,9 @@ impl ConfigExtractionService for ConfigExtractionServiceImpl {
             should_shuffle: evg_config_utils
                 .lookup_required_param_bool(task_def, SHOULD_SHUFFLE_TESTS)?,
             timeout_secs: evg_config_utils.lookup_required_param_u64(task_def, IDLE_TIMEOUT)?,
-            require_multiversion_setup: evg_config_utils
-                .get_task_tags(task_def)
-                .contains(MULTIVERSION),
+            require_multiversion_setup,
+            require_multiversion_generate_tasks: require_multiversion_setup
+                && !no_multiversion_generate_tasks,
             multiversion_generate_tasks: self
                 .multiversion_service
                 .filter_multiversion_generate_tasks(

src/task_types/fuzzer_tasks.rs

@@ -60,6 +60,8 @@ pub struct FuzzerGenTaskParams {
     pub timeout_secs: u64,
     /// Requires downloading multiversion binaries.
     pub require_multiversion_setup: bool,
+    /// Should multiversion generate tasks exist for this.
+    pub require_multiversion_generate_tasks: bool,
     /// Location of generated task configuration.
     pub config_location: String,
     /// List of tasks generated sub-tasks should depend on.
@@ -224,7 +226,7 @@ impl GenFuzzerService for GenFuzzerServiceImpl {
     ) -> Result<Box<dyn GeneratedSuite>> {
         let task_name = &params.task_name;
         let mut sub_tasks: Vec<EvgTask> = vec![];
-        if params.is_multiversion() {
+        if params.require_multiversion_generate_tasks {
             event!(
                 Level::INFO,
                 task_name = task_name.as_str(),
@@ -519,33 +521,82 @@ mod tests {
     }
 
     #[test]
-    fn test_build_multiversion_fuzzer_sub_task() {
-        let display_name = "my_task";
-        let sub_task_index = 42;
+    fn test_build_multiversion_fuzzer_sub_tasks() {
+        let num_tasks = 10;
+        let multiversion_generate_tasks = Some(vec![
+            MultiversionGenerateTaskConfig {
+                suite_name: "suite1_last_lts".to_string(),
+                old_version: "last-lts".to_string(),
+                bazel_target: None,
+            },
+            MultiversionGenerateTaskConfig {
+                suite_name: "suite1_last_continuous".to_string(),
+                old_version: "last-continuous".to_string(),
+                bazel_target: None,
+            },
+        ]);
         let params = FuzzerGenTaskParams {
-            task_name: "some task".to_string(),
+            task_name: "some_task".to_string(),
             require_multiversion_setup: true,
             dependencies: vec!["archive_dist_test_debug".to_string()],
+            multiversion_generate_tasks,
+            require_multiversion_generate_tasks: true,
+            num_tasks,
             ..Default::default()
         };
 
-        let sub_task = build_fuzzer_sub_task(display_name, sub_task_index, &params, None, None);
+        let gen_fuzzer_service = GenFuzzerServiceImpl::new();
+        let suite = gen_fuzzer_service.generate_fuzzer_task(&params).unwrap();
 
-        assert_eq!(sub_task.name, "my_task_42");
-        assert!(sub_task.commands.is_some());
-        let commands = sub_task.commands.unwrap();
+        assert_eq!(suite.display_name(), "some_task".to_string());
         assert_eq!(
-            get_evg_fn_name(&commands[0]),
-            Some("git get project no modules")
+            suite.sub_tasks().len(),
+            20 // 2 multiversion configs * 10 sub-tasks each
         );
-        assert_eq!(get_evg_fn_name(&commands[2]), Some("do setup"));
-        assert_eq!(get_evg_fn_name(&commands[4]), Some("do multiversion setup"));
-        assert_eq!(get_evg_fn_name(&commands[6]), Some("run jstestfuzz"));
-        assert_eq!(get_evg_fn_name(&commands[7]), Some("run generated tests"));
-        assert_eq!(
-            sub_task.depends_on.unwrap()[0].name,
-            "archive_dist_test_debug"
-        )
+        for sub_task in suite.sub_tasks() {
+            assert!(sub_task.evg_task.commands.is_some());
+            let commands = sub_task.evg_task.commands.unwrap();
+            assert_eq!(
+                get_evg_fn_name(&commands[0]),
+                Some("git get project no modules")
+            );
+            assert_eq!(get_evg_fn_name(&commands[2]), Some("do setup"));
+            assert_eq!(get_evg_fn_name(&commands[4]), Some("do multiversion setup"));
+            assert_eq!(get_evg_fn_name(&commands[6]), Some("run jstestfuzz"));
+            assert_eq!(get_evg_fn_name(&commands[7]), Some("run generated tests"));
+        }
+    }
+
+    #[test]
+    fn test_build_multiversion_no_generate_fuzzer_sub_task() {
+        let num_tasks = 10;
+
+        let params = FuzzerGenTaskParams {
+            task_name: "some_task".to_string(),
+            require_multiversion_setup: true,
+            dependencies: vec!["archive_dist_test_debug".to_string()],
+            require_multiversion_generate_tasks: false,
+            num_tasks,
+            ..Default::default()
+        };
+
+        let gen_fuzzer_service = GenFuzzerServiceImpl::new();
+        let suite = gen_fuzzer_service.generate_fuzzer_task(&params).unwrap();
+
+        assert_eq!(suite.display_name(), "some_task".to_string());
+        assert_eq!(suite.sub_tasks().len(), num_tasks as usize);
+        for sub_task in suite.sub_tasks() {
+            assert!(sub_task.evg_task.commands.is_some());
+            let commands = sub_task.evg_task.commands.unwrap();
+            assert_eq!(
+                get_evg_fn_name(&commands[0]),
+                Some("git get project no modules")
+            );
+            assert_eq!(get_evg_fn_name(&commands[2]), Some("do setup"));
+            assert_eq!(get_evg_fn_name(&commands[4]), Some("do multiversion setup"));
+            assert_eq!(get_evg_fn_name(&commands[6]), Some("run jstestfuzz"));
+            assert_eq!(get_evg_fn_name(&commands[7]), Some("run generated tests"));
+        }
     }
 
     #[test]

tests/data/evergreen.yml

@@ -4056,6 +4056,19 @@ tasks:
       //buildscripts/resmokeconfig:multiversion_sanity_check_last_lts_new_old_new: last_lts
       //buildscripts/resmokeconfig:multiversion_sanity_check_last_lts_old_new_new: last_lts
 
+- <<: *jstestfuzz_template
+  name: multiversion_fuzzer_no_generate_gen
+  tags: ["aggfuzzer", "multiversion", "no_multiversion_generate_tasks", "require_npm", "random_name"]
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      <<: *jstestfuzz_config_vars
+      num_files: 5
+      num_tasks: 5
+      suite: generational_fuzzer
+      resmoke_args: "--mongodSetParameters='{logComponentVerbosity: {command: 2}}'"
+      npm_command: agg-expr-fuzzer
+
 - <<: *gen_task_template
   name: replica_sets_jscore_multiversion_gen
   tags: ["multiversion", "multiversion_passthrough"]