TIG-2470 Change AutoRun syntax (mongodb#336)

roganamy · Apr 3, 2020 · 2ab79db · 2ab79db
1 parent ef834d1
commit 2ab79db
Show file tree

Hide file tree

Showing 21 changed files with 128 additions and 160 deletions.
diff --git a/src/python/gennylib/genny_auto_tasks.py b/src/python/gennylib/genny_auto_tasks.py
@@ -24,6 +24,20 @@ def __init__(self, required_dict, prepare_environment_with):
         self.required_dict = required_dict
         # A dictionary representing the yaml within the PrepareEnvironmentWith section of the workload AutoRun yaml
         self.prepare_environment_with = prepare_environment_with
+        AutoRunSpec._rename_prepare_environment(prepare_environment_with)
+
+    @staticmethod
+    def _rename_prepare_environment(prepare_environment_with: dict):
+        # Temporary limitation and workaround until we switch to the new f_run_dsi_workload
+        # (or similarly-named) evergreen function in TIG-2474.
+        if prepare_environment_with is None:
+            return
+        if "mongodb_setup" in prepare_environment_with:
+            prepare_environment_with["setup"] = prepare_environment_with["mongodb_setup"]
+            del(prepare_environment_with["mongodb_setup"])
+        if len(prepare_environment_with) > 1:
+            raise Exception(
+                f"Can only provide 'mongodb_setup' (or 'setup') in PrepareEnvironmentWith")
 
     @staticmethod
     def create_from_workload_yaml(workload_yaml):
@@ -40,10 +54,6 @@ def create_from_workload_yaml(workload_yaml):
         required_dict = None
         if 'Requires' in workload_yaml['AutoRun'] and isinstance(autorun['Requires'], dict):
             required_dict = autorun['Requires']
-            for module, config in required_dict.items():
-                if not isinstance(config, dict):
-                    required_dict = None
-                    break
 
         prepare_environment_with = None
         if 'PrepareEnvironmentWith' in autorun and isinstance(autorun['PrepareEnvironmentWith'], dict):
@@ -72,6 +82,7 @@ def get_prepare_environment_vars(self, prepare_environment_vars_template):
             prepare_environment_vars.append(curr)
         return prepare_environment_vars
 
+
 def to_snake_case(str):
     """
     Converts str to snake_case, useful for generating test id's
@@ -130,6 +141,13 @@ def modified_workload_files():
     return short_filenames
 
 
+def _simplified_env_dict(env_dict: dict) -> dict:
+    out = {}
+    for value in env_dict.values():
+        out.update(value)
+    return out
+
+
 def workload_should_autorun(autorun_spec, env_dict):
     """
     Check if the given workload's AutoRun conditions are met by the current environment
@@ -140,28 +158,15 @@ def workload_should_autorun(autorun_spec, env_dict):
     if autorun_spec is None or autorun_spec.required_dict is None:
         return False
 
-    for module, required_config in autorun_spec.required_dict.items():
-        if module not in env_dict:
+    simplified = _simplified_env_dict(env_dict)
+    for key, values in autorun_spec.required_dict.items():
+        if not isinstance(values, list):
+            raise Exception(f"Must give a list for key {key}")
+        if key not in simplified:
             return False
-        if not isinstance(required_config, dict):
+        if not any([simplified[key] == value for value in values]):
             return False
 
-        # True if set of config key-vaue pairs is subset of env_dict key-value pairs
-        # This will be false if the AutoRun yaml uses a list to represent multiple matching criteria, but it is efficient so we use it for a first-pass.
-        if not required_config.items() <= env_dict[module].items():
-            # Now have to check all k, v pairs individually
-            for key, autorun_val in required_config.items():
-                if key not in env_dict[module]:
-                    return False
-                if autorun_val == env_dict[module][key]:
-                    continue
-
-                # Values not exactly equal, but the AutoRun value could be a list of possibilities.
-                if not isinstance(autorun_val, list):
-                    return False
-                if env_dict[module][key] not in autorun_val:
-                    return False
-
     return True
 
 

diff --git a/src/python/tests/auto_tasks_test.py b/src/python/tests/auto_tasks_test.py
@@ -98,7 +98,7 @@ def test_construct_all_tasks_json_multiple_setups(self, mock_glob, mock_safe_loa
         mock_safe_load.return_value = {
             'AutoRun': {
                 'PrepareEnvironmentWith': {
-                    'setup': ['first', 'second']
+                    'mongodb_setup': ['first', 'second']
                 }
             }
         }
@@ -310,6 +310,7 @@ def test_workload_should_autorun(self):
             env_dict = tc[1]
             expected = tc[2]
 
-            autorun_spec = AutoRunSpec.create_from_workload_yaml(workload_yaml)
-            actual = workload_should_autorun(autorun_spec, env_dict)
-            self.assertEqual(expected, actual)
+            with self.subTest(tc):
+                autorun_spec = AutoRunSpec.create_from_workload_yaml(workload_yaml)
+                actual = workload_should_autorun(autorun_spec, env_dict)
+                self.assertEqual(expected, actual)
diff --git a/src/python/tests/fixtures/auto_tasks_fixtures.py b/src/python/tests/fixtures/auto_tasks_fixtures.py
@@ -5,14 +5,10 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': 'linux',
-                                'storageEngine': 'wiredTiger'
-                            },
-                            'runtime': {
-                                'build_variant': 'variant1',
-                                'is_patch': 'true'
-                            }
+                                'platform': ['linux'],
+                                'storageEngine': ['wiredTiger'],
+                                'build_variant': ['variant1'],
+                                'is_patch': ['true']
                         }
                     }
                 },
@@ -32,16 +28,14 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': 'linux'
-                            }
+                                'platform': ['linux']
                         }
                     }
                 },
                 {
                     'bootstrap': {
                         'platform': 'linux',
-                        'storageEngine': 'wiredTiger'
+                        'storageEngine': 'wiredTiger',
                     },
                     'runtime': {
                         'build_variant': 'variant1',
@@ -54,11 +48,26 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'runtime': {},
-                            'bootstrap': {}
+                                'platform': ['linux']
                         }
                     }
                 },
+                {
+                    'expansions': {
+                        'platform': 'linux',
+                        'storageEngine': 'wiredTiger',
+                        'build_variant': 'variant1',
+                        'is_patch': 'true'
+                    }
+                },
+                True
+            ),
+            (
+                {
+                    'AutoRun': {
+                        'Requires': {}
+                    }
+                },
                 {
                     'bootstrap': {
                         'platform': 'linux',
@@ -93,13 +102,9 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': ['osx', 'windows', 'linux']
-                            },
-                            'runtime': {
-                                'build_variant': 'variant1',
-                                'is_patch': 'true'
-                            }
+                                'platform': ['osx', 'windows', 'linux'],
+                                'build_variant': ['variant1'],
+                                'is_patch': ['true']
                         }
                     }
                 },
@@ -119,15 +124,11 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': ['osx', 'windows', 'debian']
-                            },
-                            'runtime': {
-                                'build_variant': 'variant1',
-                                'is_patch': 'true'
+                                'platform': ['osx', 'windows', 'debian'],
+                                'build_variant': ['variant1'],
+                                'is_patch': ['true']
                             }
                         }
-                    }
                 },
                 {
                     'bootstrap': {
@@ -145,13 +146,9 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': ['osx', 'windows', 'linux']
-                            },
-                            'runtime': {
-                                'build_variant': 'variant1',
-                                'is_patch': 'false'
-                            }
+                                'platform': ['osx', 'windows', 'linux'],
+                                'build_variant': ['variant1'],
+                                'is_patch': ['false']
                         }
                     }
                 },
@@ -171,16 +168,12 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': 'linux',
-                                'storageEngine': 'wiredTiger'
-                            },
-                            'runtime': {
-                                'build_variant': 'variant1',
-                                'is_patch': 'true'
+                                'platform': ['linux'],
+                                'storageEngine': ['wiredTiger'],
+                                'build_variant': ['variant1'],
+                                'is_patch': ['true']
                             }
                         }
-                    }
                 },
                 {
                     'bootstrap': {
@@ -198,19 +191,13 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': 'linux',
-                                'storageEngine': 'wiredTiger'
-                            },
-                            'runtime': {
-                                'build_variant': 'variant1',
-                                'is_patch': 'true'
-                            },
-                            'other': {
-                                'key': 'value'
+                                'platform': ['linux'],
+                                'storageEngine': ['wiredTiger'],
+                                'build_variant': ['variant1'],
+                                'is_patch': ['true'],
+                                'key': ['value']
                             }
                         }
-                    }
                 },
                 {
                     'bootstrap': {
@@ -228,11 +215,8 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': 'linux',
-                                'storageEngine': 'other'
-                            },
-
+                                'platform': ['linux'],
+                                'storageEngine': ['other']
                         }
                     }
                 },
@@ -252,8 +236,8 @@
                 {},
                 {
                     'bootstrap': {
-                        'platform': 'linux',
-                        'storageEngine': 'wiredTiger'
+                        'platform': ['linux'],
+                        'storageEngine': ['wiredTiger']
                     },
                     'runtime': {
                         'build_variant': 'variant1',
@@ -298,11 +282,9 @@
                 {
                     'AutoRun': {
                         'Requires': {
-                            'bootstrap': {
-                                'platform': 'linux',
-                                'storageEngine': 'wiredTiger'
-                            },
-                            'runtime': 'string-runtime'
+                                'platform': ['linux'],
+                                'storageEngine': ['wiredTiger'],
+                                'runtime': ['string-runtime']
                         }
                     }
                 },

diff --git a/src/workloads/docs/ParallelInsert.yml b/src/workloads/docs/ParallelInsert.yml
@@ -182,11 +182,10 @@ Actors:
 
 AutoRun:
   Requires:
-    bootstrap:
-      mongodb_setup:
-        - replica
-        - replica-noflowcontrol
+    mongodb_setup:
+    - replica
+    - replica-noflowcontrol
   PrepareEnvironmentWith:
-    setup:
+    mongodb_setup:
     - replica-delay-mixed
     - replica
diff --git a/src/workloads/execution/BackgroundValidateCmd.yml b/src/workloads/execution/BackgroundValidateCmd.yml
@@ -118,5 +118,4 @@ Actors:
 
 AutoRun:
   Requires:
-    bootstrap:
-      mongodb_setup: standalone
+    mongodb_setup: [standalone]
diff --git a/src/workloads/execution/CreateBigIndex.yml b/src/workloads/execution/CreateBigIndex.yml
@@ -90,5 +90,4 @@ Actors:
 
 AutoRun:
   Requires:
-    bootstrap:
-      mongodb_setup: single-replica
+    mongodb_setup: [single-replica]
diff --git a/src/workloads/execution/CreateIndex.yml b/src/workloads/execution/CreateIndex.yml
@@ -66,5 +66,4 @@ Actors:
 
 AutoRun:
   Requires:
-    bootstrap:
-      mongodb_setup: single-replica
+    mongodb_setup: [single-replica]
diff --git a/src/workloads/execution/CreateIndexSharded.yml b/src/workloads/execution/CreateIndexSharded.yml
@@ -110,7 +110,6 @@ Actors:
 
 AutoRun:
   Requires:
-    bootstrap:
-      mongodb_setup:
-        - shard
-        - shard-lite
+    mongodb_setup:
+    - shard
+    - shard-lite
diff --git a/src/workloads/execution/ExternalSort.yml b/src/workloads/execution/ExternalSort.yml
@@ -99,5 +99,4 @@ Actors:
 
 AutoRun:
   Requires:
-    bootstrap:
-      mongodb_setup: standalone
+    mongodb_setup: [standalone]
diff --git a/src/workloads/execution/UnionWith.yml b/src/workloads/execution/UnionWith.yml
@@ -286,8 +286,7 @@ Actors:
 
 AutoRun:
   Requires:
-    bootstrap:
-      mongodb_setup:
-        - standalone
-        - replica
-        - shard-lite
+    mongodb_setup:
+    - standalone
+    - replica
+    - shard-lite
diff --git a/src/workloads/execution/ValidateCmd.yml b/src/workloads/execution/ValidateCmd.yml
@@ -57,5 +57,4 @@ Actors:
 
 AutoRun:
   Requires:
-    bootstrap:
-      mongodb_setup: standalone
+    mongodb_setup: [standalone]