DEVPROD-11978 pass --skipTestsCoveredByMoreComplexSuites flag to resmoke when generating tasks in a patch build. (#83)

Author: kauboy26

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.7.18 - 2024-10-11
+* DEVPROD-11978 use --skipTestsCoveredByMoreComplexSuites when generating tasks in a patch build.
+
 ## 0.7.17 - 2024-10-09
 * DEVPROD-11914 Update shrub-rs dependency that includes github.generate_token command
 

Cargo.lock

@@ -2,7 +2,7 @@
 name = "mongo-task-generator"
 description = "Dynamically split evergreen tasks into subtasks for testing the mongodb/mongo project."
 license = "Apache-2.0"
-version = "0.7.17"
+version = "0.7.18"
 repository = "https://github.com/mongodb/mongo-task-generator"
 authors = ["Decision Automation Group <[email protected]>"]
 edition = "2018"

Cargo.toml

@@ -136,6 +136,8 @@ pub struct ExecutionConfiguration<'a> {
     pub config_location: &'a str,
     /// Should burn_in tasks be generated.
     pub gen_burn_in: bool,
+    /// True if the generator should skip tests covered by more complex suites.
+    pub skip_covered_tests: bool,
     /// Command to execute burn_in_tests.
     pub burn_in_tests_command: &'a str,
     /// S3 endpoint to get test stats from.
@@ -163,7 +165,10 @@ impl Dependencies {
     /// A set of dependencies to run against.
     pub fn new(execution_config: ExecutionConfiguration) -> Result<Self> {
         let fs_service = Arc::new(FsServiceImpl::new());
-        let discovery_service = Arc::new(ResmokeProxy::new(execution_config.resmoke_command));
+        let discovery_service = Arc::new(ResmokeProxy::new(
+            execution_config.resmoke_command,
+            execution_config.skip_covered_tests,
+        ));
         let multiversion_service = Arc::new(MultiversionServiceImpl::new(
             discovery_service.get_multiversion_config()?,
         )?);

src/lib.rs

@@ -31,6 +31,27 @@ struct EvgExpansions {
     pub task_name: String,
     /// ID of Evergreen version running.
     pub version_id: String,
+    /// True if the patch is a patch build.
+    #[serde(default, deserialize_with = "deserialize_bool_string")]
+    pub is_patch: bool,
+    /// True if we should NOT skip tests covered by more complex suites.
+    #[serde(default, deserialize_with = "deserialize_bool_string")]
+    pub run_covered_tests: bool,
+}
+
+// The boolean YAML fields `is_patch` and `run_covered_tests` are set to the
+// string "true" rather than a boolean `true`. Therefore we need a custom
+// deserializer to convert from the string "true" to the boolean `true`, and
+// in all other cases return `false`.
+fn deserialize_bool_string<'de, D>(deserializer: D) -> Result<bool, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let s: &str = serde::Deserialize::deserialize(deserializer)?;
+    match s {
+        "true" => Ok(true),
+        _ => Ok(false),
+    }
 }
 
 impl EvgExpansions {
@@ -136,6 +157,7 @@ async fn main() {
         generating_task: &evg_expansions.task_name,
         config_location: &evg_expansions.config_location(),
         gen_burn_in: args.burn_in,
+        skip_covered_tests: evg_expansions.is_patch && !evg_expansions.run_covered_tests,
         burn_in_tests_command: &args.burn_in_tests_command,
         s3_test_stats_endpoint: &args.s3_test_stats_endpoint,
     };

src/main.rs

@@ -41,6 +41,8 @@ pub struct ResmokeProxy {
     resmoke_cmd: String,
     /// Script to invoke resmoke.
     resmoke_script: Vec<String>,
+    /// True if the generator should skip tests already run in more complex suites.
+    skip_covered_tests: bool,
 }
 
 impl ResmokeProxy {
@@ -49,13 +51,15 @@ impl ResmokeProxy {
     /// # Arguments
     ///
     /// * `resmoke_cmd` - Command to invoke resmoke.
-    pub fn new(resmoke_cmd: &str) -> Self {
+    /// * `skip_covered_tests` - Whether the generator should skip tests run in more complex suites.
+    pub fn new(resmoke_cmd: &str, skip_covered_tests: bool) -> Self {
         let cmd_parts: Vec<_> = resmoke_cmd.split(' ').collect();
         let cmd = cmd_parts[0];
         let script = cmd_parts[1..].iter().map(|s| s.to_string()).collect();
         Self {
             resmoke_cmd: cmd.to_string(),
             resmoke_script: script,
+            skip_covered_tests,
         }
     }
 }
@@ -85,6 +89,14 @@ impl TestDiscovery for ResmokeProxy {
         let mut cmd = vec![&*self.resmoke_cmd];
         cmd.append(&mut self.resmoke_script.iter().map(|s| s.as_str()).collect());
         cmd.append(&mut vec!["test-discovery", "--suite", suite_name]);
+
+        // When running in a patch build, we use the --skipTestsCoveredByMoreComplexSuites
+        // flag to tell Resmoke to exclude any tests in the given suite that will
+        // also be run on a more complex suite.
+        if self.skip_covered_tests {
+            cmd.append(&mut vec!["--skipTestsCoveredByMoreComplexSuites"]);
+        }
+
         let start = Instant::now();
         let cmd_output = run_command(&cmd).unwrap();