From be15c8f3f1a47c43bbb8a5df31f2bc23e9996218 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Thu, 27 Apr 2023 13:43:59 +0000 Subject: [PATCH] Bug 1823453 - Use a custom prefix for test packages in release artifact mappings. r=taskgraph-reviewers,bhearsum Differential Revision: https://phabricator.services.mozilla.com/D176533 --- .../gecko_taskgraph/manifests/firefox_candidates.yml | 8 ++++++++ taskcluster/gecko_taskgraph/manifests/firefox_nightly.yml | 8 ++++++++ taskcluster/gecko_taskgraph/util/scriptworker.py | 6 +++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/taskcluster/gecko_taskgraph/manifests/firefox_candidates.yml b/taskcluster/gecko_taskgraph/manifests/firefox_candidates.yml index e8d7061c786a..1d8c75b02178 100644 --- a/taskcluster/gecko_taskgraph/manifests/firefox_candidates.yml +++ b/taskcluster/gecko_taskgraph/manifests/firefox_candidates.yml @@ -129,11 +129,13 @@ mapping: description: "Mixture of reftests, mochitests, UI and others, commonly bundled together in a test suite" pretty_name: firefox-${version}.common.tests.tar.gz checksums_path: ${path_platform}/${locale}/firefox-${version}.common.tests.tar.gz + prefix: public/cidata target.cppunittest.tests.tar.gz: <<: *default description: "C++ unittests related in-tree test infrastructure" pretty_name: firefox-${version}.cppunittest.tests.tar.gz checksums_path: ${path_platform}/${locale}/firefox-${version}.cppunittest.tests.tar.gz + prefix: public/cidata target.crashreporter-symbols.zip: <<: *default description: "Crashreporter symbols to be consumed by Socorro" @@ -149,6 +151,7 @@ mapping: description: "Results for running the mochitest testing framework via Javascript function calls" pretty_name: firefox-${version}.mochitest.tests.tar.gz checksums_path: ${path_platform}/${locale}/firefox-${version}.mochitest.tests.tar.gz + prefix: public/cidata target.mozinfo.json: <<: *default description: "Various compile and moz_app flags baked together in a json file" @@ -159,16 +162,19 @@ mapping: description: "Results for running the reftest testing framework via display of two Web pages comparison" pretty_name: firefox-${version}.reftest.tests.tar.gz checksums_path: ${path_platform}/${locale}/firefox-${version}.reftest.tests.tar.gz + prefix: public/cidata target.talos.tests.tar.gz: <<: *default description: "Results for running the talos testing framework to measure performance" pretty_name: firefox-${version}.talos.tests.tar.gz checksums_path: ${path_platform}/${locale}/firefox-${version}.talos.tests.tar.gz + prefix: public/cidata target.awsy.tests.tar.gz: <<: *default description: "Results for running the awsy testing framework to track memory usage" pretty_name: firefox-${version}.awsy.tests.tar.gz checksums_path: ${path_platform}/${locale}/firefox-${version}.awsy.tests.tar.gz + prefix: public/cidata target.test_packages.json: <<: *default description: "File containing metadata about all other files and testing harnesses specifics" @@ -179,11 +185,13 @@ mapping: description: "Results for running the webplatform testing framework to cover standard Web platform features" pretty_name: firefox-${version}.web-platform.tests.tar.gz checksums_path: ${path_platform}/${locale}/firefox-${version}.web-platform.tests.tar.gz + prefix: public/cidata target.xpcshell.tests.tar.gz: <<: *default description: "Results for running the xpcshell testing framework to enable XPConnect console application" pretty_name: firefox-${version}.xpcshell.tests.tar.gz checksums_path: ${path_platform}/${locale}/firefox-${version}.xpcshell.tests.tar.gz + prefix: public/cidata target_info.txt: <<: *default description: "File containing the buildID" diff --git a/taskcluster/gecko_taskgraph/manifests/firefox_nightly.yml b/taskcluster/gecko_taskgraph/manifests/firefox_nightly.yml index d2e4f6adf024..0222957383ec 100644 --- a/taskcluster/gecko_taskgraph/manifests/firefox_nightly.yml +++ b/taskcluster/gecko_taskgraph/manifests/firefox_nightly.yml @@ -135,11 +135,13 @@ mapping: description: "Mixture of reftests, mochitests, UI and others, commonly bundled together in a test suite" pretty_name: firefox-${version}.${locale}.${filename_platform}.common.tests.tar.gz checksums_path: firefox-${version}.${locale}.${filename_platform}.common.tests.tar.gz + prefix: public/cidata target.cppunittest.tests.tar.gz: <<: *default description: "C++ unittests related in-tree test infrastructure" pretty_name: firefox-${version}.${locale}.${filename_platform}.cppunittest.tests.tar.gz checksums_path: firefox-${version}.${locale}.${filename_platform}.cppunittest.tests.tar.gz + prefix: public/cidata target.crashreporter-symbols.zip: <<: *default description: "Crashreporter symbols to be consumed by Socorro" @@ -158,6 +160,7 @@ mapping: description: "Results for running the mochitest testing framework via Javascript function calls" pretty_name: firefox-${version}.${locale}.${filename_platform}.mochitest.tests.tar.gz checksums_path: firefox-${version}.${locale}.${filename_platform}.mochitest.tests.tar.gz + prefix: public/cidata target.mozinfo.json: <<: *default description: "Various compile and moz_app flags baked together in a json file" @@ -168,16 +171,19 @@ mapping: description: "Results for running the reftest testing framework via display of two Web pages comparison" pretty_name: firefox-${version}.${locale}.${filename_platform}.reftest.tests.tar.gz checksums_path: firefox-${version}.${locale}.${filename_platform}.reftest.tests.tar.gz + prefix: public/cidata target.talos.tests.tar.gz: <<: *default description: "Results for running the talos testing framework to measure performance" pretty_name: firefox-${version}.${locale}.${filename_platform}.talos.tests.tar.gz checksums_path: firefox-${version}.${locale}.${filename_platform}.talos.tests.tar.gz + prefix: public/cidata target.awsy.tests.tar.gz: <<: *default description: "Results for running the awsy testing framework to track memory usage" pretty_name: firefox-${version}.${locale}.${filename_platform}.awsy.tests.tar.gz checksums_path: firefox-${version}.${locale}.${filename_platform}.awsy.tests.tar.gz + prefix: public/cidata target.test_packages.json: <<: *default description: "File containing metadata about all other files and testing harnesses specifics" @@ -193,11 +199,13 @@ mapping: description: "Results for running the webplatform testing framework to cover standard Web platform features" pretty_name: firefox-${version}.${locale}.${filename_platform}.web-platform.tests.tar.gz checksums_path: firefox-${version}.${locale}.${filename_platform}.web-platform.tests.tar.gz + prefix: public/cidata target.xpcshell.tests.tar.gz: <<: *default description: "Results for running the xpcshell testing framework to enable XPConnect console application" pretty_name: firefox-${version}.${locale}.${filename_platform}.xpcshell.tests.tar.gz checksums_path: firefox-${version}.${locale}.${filename_platform}.xpcshell.tests.tar.gz + prefix: public/cidata target_info.txt: <<: *default description: "File containing the buildID" diff --git a/taskcluster/gecko_taskgraph/util/scriptworker.py b/taskcluster/gecko_taskgraph/util/scriptworker.py index 9a5c44617215..73030852a29b 100644 --- a/taskcluster/gecko_taskgraph/util/scriptworker.py +++ b/taskcluster/gecko_taskgraph/util/scriptworker.py @@ -479,7 +479,7 @@ def generate_beetmover_upstream_artifacts( paths.append( os.path.join( - base_artifact_prefix, + file_config.get("prefix", base_artifact_prefix), jsone.render(file_config["source_path_modifier"], kwargs), jsone.render(filename, kwargs), ) @@ -639,7 +639,7 @@ def generate_beetmover_artifact_map(config, job, **kwargs): # Key must be artifact path, to avoid trampling duplicates, such # as public/build/target.apk and public/build/en-US/target.apk key = os.path.join( - base_artifact_prefix, + file_config.get("prefix", base_artifact_prefix), file_config["source_path_modifier"], filename, ) @@ -788,7 +788,7 @@ def generate_beetmover_partials_artifact_map(config, job, partials_info, **kwarg # Key must be artifact path, to avoid trampling duplicates, such # as public/build/target.apk and public/build/en-US/target.apk key = os.path.join( - base_artifact_prefix, + file_config.get("prefix", base_artifact_prefix), file_config["source_path_modifier"], filename, )