tor-browser

commit 914af540c0361f1aa21d668cb8a56ed80112850e
parent 172b7fa7a9518648caec7f93524e05a1252731d5
Author: Cristina Horotan <chorotan@mozilla.com>
Date:   Mon,  6 Oct 2025 15:37:02 +0300

Revert "Bug 1992386 - set task expiration policy by level. r=taskgraph-reviewers,bhearsum" for causing python failures

This reverts commit bb3d84f3e03c5e78154937a3517ab50056b37732.

Diffstat:
M
taskcluster/config.yml
 | 
6
+++---
M
taskcluster/gecko_taskgraph/config.py
 | 
4
+---
M
taskcluster/gecko_taskgraph/transforms/job/common.py
 | 
2
+-
M
taskcluster/gecko_taskgraph/transforms/task.py
 | 
9
+++------

4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/taskcluster/config.yml b/taskcluster/config.yml
@@ -961,14 +961,14 @@ mac-signing:
                       - "/"  # The .app
 
 expiration-policy:
-    by-level:
-        '1':
+    by-project:
+        try:
             default: 28 days
             shortest: 7 days
             short: 14 days
             medium: 28 days
             long: 28 days
-        '3':
+        autoland:
             default: 1 year
             shortest: 14 days
             short: 3 months
diff --git a/taskcluster/gecko_taskgraph/config.py b/taskcluster/gecko_taskgraph/config.py
@@ -125,8 +125,6 @@ graph_config_schema = Schema(
                 Length(min=1),
             ),
         },
-        Required("expiration-policy"): optionally_keyed_by(
-            "project", "level", {str: str}
-        ),
+        Required("expiration-policy"): optionally_keyed_by("project", {str: str}),
     }
 )
diff --git a/taskcluster/gecko_taskgraph/transforms/job/common.py b/taskcluster/gecko_taskgraph/transforms/job/common.py
@@ -215,6 +215,6 @@ def get_expiration(config, policy="default"):
     expires = evaluate_keyed_by(
         config.graph_config["expiration-policy"],
         "artifact expiration",
-        {"project": config.params["project"], "level": config.params["level"]},
+        {"project": config.params["project"]},
     )[policy]
     return expires
diff --git a/taskcluster/gecko_taskgraph/transforms/task.py b/taskcluster/gecko_taskgraph/transforms/task.py
@@ -2138,12 +2138,9 @@ def set_task_and_artifact_expiry(config, jobs):
     cap = "28 days" if is_try(config.params) else None
     cap_from_now = fromNow(cap, now) if cap else None
     if cap:
-        expiration_policy = evaluate_keyed_by(
-            config.graph_config["expiration-policy"],
-            "task expiration",
-            {"project": config.params["project"], "level": config.params["level"]},
-        )
-        for policy, expires in expiration_policy.items():
+        for policy, expires in config.graph_config["expiration-policy"]["by-project"][
+            "try"
+        ].items():
             if fromNow(expires, now) > cap_from_now:
                 raise Exception(
                     f'expiration-policy "{policy}" is larger than {cap} '