Bug 1823453 - Expire test packages more quickly. r=aryx,taskgraph-reviewers,jmaher

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

python/mozbuild/mozbuild/artifacts.py

@@ -172,7 +172,7 @@ class ArtifactJob(object):
         self._tests_re = None
         if download_tests:
             self._tests_re = re.compile(
-                r"public/build/(en-US/)?target\.common\.tests\.(zip|tar\.gz)$"
+                r"public/cidata/(en-US/)?target\.common\.tests\.(zip|tar\.gz)$"
             )
         self._maven_zip_re = None
         if download_maven_zip:

taskcluster/gecko_taskgraph/transforms/artifact.py

@@ -68,7 +68,7 @@ def set_artifact_expiration(config, jobs):
                     )
             if "artifacts" in job["worker"]:
                 plat = platform.lower()
-                if "plain" in plat or "ccov" in plat or "rusttest" in plat:
+                if "plain" in plat or "rusttest" in plat:
                     art_dict = None
                 elif (
                     plat == "toolchain-wasm32-wasi-compiler-rt-trunk"
@@ -77,6 +77,8 @@ def set_artifact_expiration(config, jobs):
                     or plat == "android-geckoview-docs"
                 ):
                     art_dict = None
+                elif "ccov" in plat:
+                    art_dict = {}
                 elif plat.startswith("win"):
                     art_dict = manifest["win"]
                 elif plat.startswith("linux"):
@@ -101,6 +103,8 @@ def set_artifact_expiration(config, jobs):
                     artifact_dest = "cidata/{}"
 
                 if art_dict is not None:
+                    art_dict.update(manifest["*"])
+
                     for art_name in art_dict.keys():
                         # The 'artifacts' key of a job is a list at this stage.
                         # So, must append a new dict to the list

taskcluster/gecko_taskgraph/transforms/artifacts.yml

@@ -1,4 +1,23 @@
 ---
+'*':
+    target.awsy.tests.tar.gz: short
+    target.common.tests.tar.gz: short
+    target.condprof.tests.tar.gz: short
+    target.cppunittest.tests.tar.gz: short
+    target.fuzztest.tests.tar.gz: short
+    target.generated-files.tar.gz: short
+    target.gtest.tests.tar.gz: short
+    target.jittest.tests.tar.gz: short
+    target.jsreftest.tests.tar.gz: short
+    target.mochitest.tests.tar.gz: short
+    target.perftests.tests.tar.gz: short
+    target.raptor.tests.tar.gz: short
+    target.reftest.tests.tar.gz: short
+    target.talos.tests.tar.gz: short
+    target.updater-dep.tests.tar.gz: short
+    target.web-platform.tests.tar.gz: short
+    target.xpcshell.tests.tar.gz: short
+
 win:
     target.crashreporter-symbols-full.tar.zst: shortest
     sccache.log: shortest

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -1484,6 +1484,8 @@ items from that key's value."
                 platforms = yaml.safe_load(artfile.read())
                 for artifact in platforms[main_platform]:
                     arts.append(artifact)
+                for artifact in platforms["*"]:
+                    arts.append(artifact)
         except FileNotFoundError:
             self.fatal("Could not read artifacts.yml; file not found. Exiting.")
         except PermissionError:

testing/mozharness/mozharness/mozilla/testing/testbase.py

@@ -461,7 +461,9 @@ You can set this by specifying --test-url URL
                 self.info("Extracting everything from web-platform archive")
                 unpack_dirs = None
 
-            url = self.query_build_dir_url(file_name)
+            url = self.query_build_dir_url(file_name).replace(
+                "public/build/", "public/cidata/"
+            )
             self.download_unpack(url, target_dir, extract_dirs=unpack_dirs)
 
     def _download_test_zip(self, extract_dirs=None):