From 00ee798d10c96831f906e75475f0cddae2ecae6d Mon Sep 17 00:00:00 2001 From: "Ben Hearsum (he/him)" Date: Mon, 16 Dec 2024 10:01:16 -0500 Subject: [PATCH] refactor: move taskcluster root url definitions to their own file (#223) This allows them to be imported without depending on any of the imports that `util/integration.py` does. (This is going to become a problem in https://github.com/mozilla-releng/fxci-config/pull/210, when I'm adding a `taskgraph` import there.) --- .../transforms/firefoxci_artifact.py | 6 ++---- .../fxci_config_taskgraph/transforms/integration_test.py | 8 ++------ taskcluster/fxci_config_taskgraph/util/constants.py | 2 ++ taskcluster/fxci_config_taskgraph/util/integration.py | 3 +-- taskcluster/scripts/fetch-firefoxci-artifacts.py | 2 +- taskcluster/test/test_transforms_firefoxci_artifact.py | 7 ++----- taskcluster/test/test_transforms_integration_test.py | 7 ++----- 7 files changed, 12 insertions(+), 23 deletions(-) create mode 100644 taskcluster/fxci_config_taskgraph/util/constants.py diff --git a/taskcluster/fxci_config_taskgraph/transforms/firefoxci_artifact.py b/taskcluster/fxci_config_taskgraph/transforms/firefoxci_artifact.py index 96d2bbd0..8cfc399b 100644 --- a/taskcluster/fxci_config_taskgraph/transforms/firefoxci_artifact.py +++ b/taskcluster/fxci_config_taskgraph/transforms/firefoxci_artifact.py @@ -9,10 +9,8 @@ from taskgraph.transforms.base import TransformSequence -from fxci_config_taskgraph.util.integration import ( - STAGING_ROOT_URL, - find_tasks, -) +from fxci_config_taskgraph.util.constants import STAGING_ROOT_URL +from fxci_config_taskgraph.util.integration import find_tasks transforms = TransformSequence() diff --git a/taskcluster/fxci_config_taskgraph/transforms/integration_test.py b/taskcluster/fxci_config_taskgraph/transforms/integration_test.py index cbccb383..8957ee57 100644 --- a/taskcluster/fxci_config_taskgraph/transforms/integration_test.py +++ b/taskcluster/fxci_config_taskgraph/transforms/integration_test.py @@ -9,12 +9,8 @@ from taskgraph.transforms.base import TransformSequence -from fxci_config_taskgraph.util.integration import ( - FIREFOXCI_ROOT_URL, - STAGING_ROOT_URL, - find_tasks, - get_taskcluster_client, -) +from fxci_config_taskgraph.util.constants import FIREFOXCI_ROOT_URL, STAGING_ROOT_URL +from fxci_config_taskgraph.util.integration import find_tasks, get_taskcluster_client transforms = TransformSequence() diff --git a/taskcluster/fxci_config_taskgraph/util/constants.py b/taskcluster/fxci_config_taskgraph/util/constants.py new file mode 100644 index 00000000..81bfe07b --- /dev/null +++ b/taskcluster/fxci_config_taskgraph/util/constants.py @@ -0,0 +1,2 @@ +FIREFOXCI_ROOT_URL = "https://firefox-ci-tc.services.mozilla.com" +STAGING_ROOT_URL = "https://stage.taskcluster.nonprod.cloudops.mozgcp.net" diff --git a/taskcluster/fxci_config_taskgraph/util/integration.py b/taskcluster/fxci_config_taskgraph/util/integration.py index 0cd1661a..e9e57a9c 100644 --- a/taskcluster/fxci_config_taskgraph/util/integration.py +++ b/taskcluster/fxci_config_taskgraph/util/integration.py @@ -8,8 +8,7 @@ import requests import taskcluster -FIREFOXCI_ROOT_URL = "https://firefox-ci-tc.services.mozilla.com" -STAGING_ROOT_URL = "https://stage.taskcluster.nonprod.cloudops.mozgcp.net" +from fxci_config_taskgraph.util.constants import FIREFOXCI_ROOT_URL @cache diff --git a/taskcluster/scripts/fetch-firefoxci-artifacts.py b/taskcluster/scripts/fetch-firefoxci-artifacts.py index d83c6ea9..a25bc863 100644 --- a/taskcluster/scripts/fetch-firefoxci-artifacts.py +++ b/taskcluster/scripts/fetch-firefoxci-artifacts.py @@ -8,7 +8,7 @@ import requests import taskcluster -from fxci_config_taskgraph.util.integration import FIREFOXCI_ROOT_URL, STAGING_ROOT_URL +from fxci_config_taskgraph.util.constants import FIREFOXCI_ROOT_URL, STAGING_ROOT_URL def get_firefoxci_credentials() -> dict[str, str]: diff --git a/taskcluster/test/test_transforms_firefoxci_artifact.py b/taskcluster/test/test_transforms_firefoxci_artifact.py index dede2d56..67cd5dfd 100644 --- a/taskcluster/test/test_transforms_firefoxci_artifact.py +++ b/taskcluster/test/test_transforms_firefoxci_artifact.py @@ -10,11 +10,8 @@ from taskgraph.util.templates import merge from fxci_config_taskgraph.transforms.firefoxci_artifact import transforms -from fxci_config_taskgraph.util.integration import ( - FIREFOXCI_ROOT_URL, - STAGING_ROOT_URL, - find_tasks, -) +from fxci_config_taskgraph.util.constants import FIREFOXCI_ROOT_URL, STAGING_ROOT_URL +from fxci_config_taskgraph.util.integration import find_tasks @pytest.fixture diff --git a/taskcluster/test/test_transforms_integration_test.py b/taskcluster/test/test_transforms_integration_test.py index 4a07f938..5f40316f 100644 --- a/taskcluster/test/test_transforms_integration_test.py +++ b/taskcluster/test/test_transforms_integration_test.py @@ -10,11 +10,8 @@ from taskgraph.util.templates import merge from fxci_config_taskgraph.transforms.integration_test import transforms -from fxci_config_taskgraph.util.integration import ( - FIREFOXCI_ROOT_URL, - STAGING_ROOT_URL, - find_tasks, -) +from fxci_config_taskgraph.util.constants import FIREFOXCI_ROOT_URL, STAGING_ROOT_URL +from fxci_config_taskgraph.util.integration import find_tasks @pytest.fixture