tor-browser

commit b09c265119bbab348cf9a1662fe9c4d80cb20d93
parent 042c73176b6365220db3775baf1be950ad81ec55
Author: Marco Castelluccio <mcastelluccio@mozilla.com>
Date:   Wed, 26 Nov 2025 09:50:29 +0000

Bug 1996997 - Drop fallback on the old bugbug deployment. r=taskgraph-reviewers,jmaher

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

Diffstat:
M
taskcluster/gecko_taskgraph/test/test_optimize_strategies.py
 | 
15
---------------
M
taskcluster/gecko_taskgraph/util/bugbug.py
 | 
22
----------------------

2 files changed, 0 insertions(+), 37 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/test/test_optimize_strategies.py b/taskcluster/gecko_taskgraph/test/test_optimize_strategies.py
@@ -24,7 +24,6 @@ from gecko_taskgraph.optimize.mozlint import SkipUnlessMozlint
 from gecko_taskgraph.optimize.strategies import SkipUnlessMissing, SkipUnlessSchedules
 from gecko_taskgraph.util.backstop import BACKSTOP_PUSH_INTERVAL
 from gecko_taskgraph.util.bugbug import (
-    BUGBUG_BASE_FALLBACK_URL,
     BUGBUG_BASE_URL,
     BugbugTimeoutException,
     push_schedules,
@@ -373,13 +372,6 @@ def test_bugbug_timeout(monkeypatch, responses, params):
         json={"ready": False},
         status=202,
     )
-    fallback_url = BUGBUG_BASE_FALLBACK_URL + query
-    responses.add(
-        responses.GET,
-        fallback_url,
-        json={"ready": False},
-        status=202,
-    )
 
     # Make sure the test runs fast.
     monkeypatch.setattr(time, "sleep", lambda i: None)
@@ -398,13 +390,6 @@ def test_bugbug_fallback(monkeypatch, responses, params):
         json={"ready": False},
         status=202,
     )
-    fallback_url = BUGBUG_BASE_FALLBACK_URL + query
-    responses.add(
-        responses.GET,
-        fallback_url,
-        json={"ready": False},
-        status=202,
-    )
 
     opt = BugBugPushSchedules(0.5, fallback=FALLBACK)
 
diff --git a/taskcluster/gecko_taskgraph/util/bugbug.py b/taskcluster/gecko_taskgraph/util/bugbug.py
@@ -22,7 +22,6 @@ except ImportError:
     from time import time as monotonic
 
 BUGBUG_BASE_URL = "https://bugbug.moz.tools"
-BUGBUG_BASE_FALLBACK_URL = "https://bugbug.herokuapp.com"
 RETRY_TIMEOUT = 9 * 60  # seconds
 RETRY_INTERVAL = 10  # seconds
 
@@ -106,7 +105,6 @@ def push_schedules(branch, rev):
         return
 
     url = BUGBUG_BASE_URL + f"/push/{branch}/{rev}/schedules"
-    fallback_url = url.replace(BUGBUG_BASE_URL, BUGBUG_BASE_FALLBACK_URL)
     start = monotonic()
     session = get_session()
 
@@ -119,35 +117,17 @@ def push_schedules(branch, rev):
 
     attempts = timeout / RETRY_INTERVAL
     i = 0
-    success = False
     while i < attempts:
         r = session.get(url)
         r.raise_for_status()
 
         if r.status_code != 202:
-            success = True
             break
 
-        # Trigger the fallback deployment, but ignore it for now.
-        r = session.get(fallback_url)
-        r.raise_for_status()
-
         time.sleep(RETRY_INTERVAL)
         i += 1
     end = monotonic()
 
-    if not success:
-        i = 0
-        while i < attempts:
-            r = session.get(fallback_url)
-            r.raise_for_status()
-
-            if r.status_code != 202:
-                break
-
-            time.sleep(RETRY_INTERVAL)
-            i += 1
-
     _write_perfherder_data(
         lower_is_better={
             "bugbug_push_schedules_time": end - start,
@@ -198,8 +178,6 @@ def patch_schedules(base_rev, patch_content, mode="quick"):
     patch_hash = hashlib.md5(filtered_content.encode("utf-8")).hexdigest()
 
     url = BUGBUG_BASE_URL + f"/patch/{base_rev}/{patch_hash}/schedules"
-    # FIXME: Remove fallback once BugBug is fully migrated.
-    url = url.replace(BUGBUG_BASE_URL, BUGBUG_BASE_FALLBACK_URL)
 
     session = get_session()