From 0e7e09a48f9fe38ef017c87016df5ad403354d07 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 19 Dec 2024 14:06:10 +0100 Subject: [PATCH 1/2] Require tc-admin 4.0.2 First release with https://github.com/taskcluster/tc-admin/pull/278 --- requirements/base.in | 2 +- requirements/base.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index c837f934..fff5c848 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,4 +1,4 @@ -tc-admin>=3.3.1 +tc-admin>=4.0.2 taskcluster attrs # http://www.attrs.org/en/stable/backward-compatibility.html mozilla-repo-urls diff --git a/requirements/base.txt b/requirements/base.txt index 9b63f64c..7cc88797 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:9439d42fa1b173594e393bc7a143ac26cffe5ad6 +# SHA1:5428978ea2dc6dc1c4142793053ba03fa77517ad # # This file is autogenerated by pip-compile-multi # To update, run: From 5f08921e6d79edb1db55a1dd7c37bbcc6e6840cf Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 19 Dec 2024 14:10:26 +0100 Subject: [PATCH 2/2] ci: check `tc-admin diff` exit code Avoid optimizing out all tasks when the diff fails. --- taskcluster/fxci_config_taskgraph/optimizations.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/taskcluster/fxci_config_taskgraph/optimizations.py b/taskcluster/fxci_config_taskgraph/optimizations.py index e06947fb..e9c4b2eb 100644 --- a/taskcluster/fxci_config_taskgraph/optimizations.py +++ b/taskcluster/fxci_config_taskgraph/optimizations.py @@ -29,9 +29,12 @@ def _get_modified_worker_pools(self) -> set[str]: ] env = os.environ.copy() if "TASKCLUSTER_PROXY_URL" in env: + # Force tc-admin diff to look at fxci even when we're running on stage del env["TASKCLUSTER_PROXY_URL"] env["TASKCLUSTER_ROOT_URL"] = FIREFOXCI_ROOT_URL proc = subprocess.run(cmd, stdout=subprocess.PIPE, text=True, env=env) + if proc.returncode not in (0, 2): + proc.check_returncode() lines = [line for line in proc.stdout.splitlines() if line.startswith("!")] worker_pools = set()