diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /tools/tryselect | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/tryselect')
| -rw-r--r-- | tools/tryselect/selectors/perf.py | 2 | ||||
| -rw-r--r-- | tools/tryselect/selectors/release.py | 2 | ||||
| -rw-r--r-- | tools/tryselect/task_config.py | 2 | ||||
| -rw-r--r-- | tools/tryselect/tasks.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/tryselect/selectors/perf.py b/tools/tryselect/selectors/perf.py index e8a6e6f9cc..96416829f7 100644 --- a/tools/tryselect/selectors/perf.py +++ b/tools/tryselect/selectors/perf.py @@ -198,7 +198,7 @@ class PerfParser(CompareParser): "tests. If the Activity, Binary Path, or Intents required " "change at all relative to the existing GeckoView, and Fenix " "tasks, then you will need to make fixes in the associated " - "taskcluster files (e.g. taskcluster/ci/test/browsertime-mobile.yml). " + "taskcluster files (e.g. taskcluster/kinds/test/browsertime-mobile.yml). " "Alternatively, set MOZ_FIREFOX_ANDROID_APK_OUTPUT to a path to " "an APK, and then run the command with --browsertime-upload-apk " "firefox-android. This option will only copy the APK for browsertime, see " diff --git a/tools/tryselect/selectors/release.py b/tools/tryselect/selectors/release.py index fae85469ba..5ec88a989c 100644 --- a/tools/tryselect/selectors/release.py +++ b/tools/tryselect/selectors/release.py @@ -126,7 +126,7 @@ def run( } ) - with open(os.path.join(vcs.path, "taskcluster/ci/config.yml")) as f: + with open(os.path.join(vcs.path, "taskcluster/config.yml")) as f: migration_configs = yaml.safe_load(f) for migration in migrations: migration_config = migration_configs["merge-automation"]["behaviors"][migration] diff --git a/tools/tryselect/task_config.py b/tools/tryselect/task_config.py index 58e8beeda4..0bf9731eee 100644 --- a/tools/tryselect/task_config.py +++ b/tools/tryselect/task_config.py @@ -610,7 +610,7 @@ class WorkerOverrides(TryConfig): if worker_suffixes: root = build.topsrcdir - root = os.path.join(root, "taskcluster", "ci") + root = os.path.join(root, "taskcluster") graph_config = load_graph_config(root) for worker_suffix in worker_suffixes: alias, suffix = worker_suffix.split("=", 1) diff --git a/tools/tryselect/tasks.py b/tools/tryselect/tasks.py index 701d1c1ade..46abd3546b 100644 --- a/tools/tryselect/tasks.py +++ b/tools/tryselect/tasks.py @@ -78,7 +78,7 @@ def generate_tasks(params=None, full=False, disable_target_task_filter=False): "target_tasks_method": target_tasks_method, }, ) - root = os.path.join(build.topsrcdir, "taskcluster", "ci") + root = os.path.join(build.topsrcdir, "taskcluster") taskgraph.fast = True generator = TaskGraphGenerator(root_dir=root, parameters=params) |