Bug 1850604 - Only expire variants on trunk. r=ahal,taskgraph-reviewers, a=dmeehan a=pascalc

Differential Revision: https://phabricator.services.mozilla.com/D187054

taskcluster/gecko_taskgraph/test/conftest.py

@@ -79,6 +79,21 @@ def fake_loader(kind, path, config, parameters, loaded_tasks):
         yield task
 
 
+class FakeTransform:
+    transforms = []
+    params = {}
+
+    def __init__(self):
+        pass
+
+    @classmethod
+    def get(self, field, default):
+        try:
+            return getattr(self, field)
+        except AttributeError:
+            return default
+
+
 class FakeKind(Kind):
     def _get_loader(self):
         return fake_loader
@@ -89,9 +104,10 @@ class FakeKind(Kind):
 
     @staticmethod
     def create(name, extra_config, graph_config):
-        config = {
-            "transforms": [],
-        }
+        if name == "fullfake":
+            config = FakeTransform()
+        else:
+            config = {"transforms": []}
         if extra_config:
             config.update(extra_config)
         return FakeKind(name, "/fake", config, graph_config)
@@ -188,3 +204,17 @@ def run_transform():
         return xform(kind.config, tasks)
 
     return inner
+
+
+@pytest.fixture
+def run_full_config_transform():
+
+    graph_config = fake_load_graph_config("/root")
+    kind = FakeKind.create("fullfake", {}, graph_config)
+
+    def inner(xform, tasks):
+        if isinstance(tasks, dict):
+            tasks = [tasks]
+        return xform(kind.config, tasks)
+
+    return inner

taskcluster/gecko_taskgraph/test/test_transforms_test.py

@@ -34,7 +34,7 @@ def make_test_task():
     return inner
 
 
-def test_split_variants(monkeypatch, run_transform, make_test_task):
+def test_split_variants(monkeypatch, run_full_config_transform, make_test_task):
     # mock out variant definitions
     monkeypatch.setattr(
         test_transforms.variant,
@@ -87,7 +87,9 @@ def test_split_variants(monkeypatch, run_transform, make_test_task):
             }
         )
 
-    run_split_variants = partial(run_transform, test_transforms.variant.split_variants)
+    run_split_variants = partial(
+        run_full_config_transform, test_transforms.variant.split_variants
+    )
 
     # test no variants
     input_task = make_test_task(

taskcluster/gecko_taskgraph/transforms/test/variant.py

@@ -51,6 +51,16 @@ def split_variants(config, tasks):
     def find_expired_variants(variants):
         expired = []
 
+        # do not expire on esr/beta/release
+        if config.params.get("release_type", "") in [
+            "release",
+            "beta",
+        ]:
+            return []
+
+        if "esr" in config.params.get("release_type", ""):
+            return []
+
         today = datetime.datetime.today()
         for variant in variants: