Bug 1769098 - initial work to allow taskcluster/mozbase/mozharness to support conditioned profiles. r=ahal

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

Author: jmaher

build/gen_test_packages_manifest.py

@@ -109,11 +109,13 @@ def generate_package_data(args):
     harness_requirements = dict([(k, [tests_common]) for k in ALL_HARNESSES])
     harness_requirements["jittest"].append(jsshell)
     harness_requirements["jsreftest"].append(args.reftest)
+    harness_requirements["common"].append("target.condprof.tests.tar.gz")
     for harness in PACKAGE_SPECIFIED_HARNESSES + OPTIONAL_PACKAGES:
         pkg_name = getattr(args, harness, None)
         if pkg_name is None:
             continue
         harness_requirements[harness].append(pkg_name)
+        harness_requirements[harness].append("target.condprof.tests.tar.gz")
     return harness_requirements
 
 

taskcluster/gecko_taskgraph/test/test_util_chunking.py

@@ -159,6 +159,7 @@ def inner(
             "headless": headless,
             "tsan": tsan,
             "appname": "firefox",
+            "condprof": False,
         }
 
     return inner

taskcluster/gecko_taskgraph/util/chunking.py

@@ -11,7 +11,7 @@
 from abc import ABCMeta, abstractmethod
 
 from manifestparser import TestManifest
-from manifestparser.filters import chunk_by_runtime
+from manifestparser.filters import chunk_by_runtime, tags
 from mozbuild.util import memoize
 from moztest.resolve import (
     TEST_SUITES,
@@ -56,6 +56,7 @@ def guess_mozinfo_from_task(task):
             for key in setting["runtime"].keys()
         ),
         "headless": "-headless" in task["test-name"],
+        "condprof": "conditioned_profile" in setting["runtime"].keys(),
         "tsan": setting["build"].get("tsan", False),
         "xorigin": any("xorigin" in key for key in setting["runtime"].keys()),
         "socketprocess_networking": "socketprocess_networking"
@@ -227,10 +228,14 @@ def get_manifests(self, suite, mozinfo):
 
         manifests = {chunk_by_runtime.get_manifest(t) for t in tests}
 
+        filters = None
+        if mozinfo["condprof"]:
+            filters = [tags(["condprof"])]
+
         # Compute  the active tests.
         m = TestManifest()
         m.tests = tests
-        tests = m.active_tests(disabled=False, exists=False, **mozinfo)
+        tests = m.active_tests(disabled=False, exists=False, filters=filters, **mozinfo)
         active = {chunk_by_runtime.get_manifest(t) for t in tests}
         skipped = manifests - active
         return {"active": list(active), "skipped": list(skipped)}

testing/condprofile/condprof/client.py

@@ -28,7 +28,7 @@
 
 TC_SERVICE = "https://firefox-ci-tc.services.mozilla.com"
 ROOT_URL = TC_SERVICE + "/api/index"
-INDEX_PATH = "gecko.v2.%(repo)s.latest.firefox.condprof-%(platform)s"
+INDEX_PATH = "gecko.v2.%(repo)s.latest.firefox.condprof-%(platform)s-%(scenario)s"
 PUBLIC_DIR = "artifacts/public/condprof"
 TC_LINK = ROOT_URL + "/v1/task/" + INDEX_PATH + "/" + PUBLIC_DIR + "/"
 ARTIFACT_NAME = "profile-%(platform)s-%(scenario)s-%(customization)s.tgz"
@@ -135,6 +135,7 @@ def get_profile(
     If task_id is provided, will grab the profile from that task. when not
     provided (default) will grab the latest profile.
     """
+
     # XXX assert values
     params = {
         "platform": platform,
@@ -212,8 +213,8 @@ def onerror(error):
         raise ProfileNotFoundError(url)
 
 
-def read_changelog(platform, repo="mozilla-central"):
-    params = {"platform": platform, "repo": repo}
+def read_changelog(platform, repo="mozilla-central", scenario="settled"):
+    params = {"platform": platform, "repo": repo, "scenario": scenario}
     changelog_url = CHANGELOG_LINK % params
     logger.info("Getting %s" % changelog_url)
     download_dir = tempfile.mkdtemp()

testing/config/mozbase_requirements.txt

@@ -21,3 +21,10 @@
 ../mozbase/mozscreenshot
 ../mozbase/moztest
 ../mozbase/mozversion
+
+../condprofile
+aiohttp==3.7.4.post0
+https://pypi.pub.build.mozilla.org/pub/arsenic-19.1-py3-none-any.whl
+requests==2.22.0
+pyyaml==5.1.2
+structlog==15.2.0

testing/mozharness/scripts/desktop_unittest.py

@@ -305,6 +305,15 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
                     "help": "do not run tests with fission enabled.",
                 },
             ],
+            [
+                ["--conditioned-profile"],
+                {
+                    "action": "store_true",
+                    "default": False,
+                    "dest": "conditioned_profile",
+                    "help": "run tests with a conditioned profile",
+                },
+            ],
         ]
         + copy.deepcopy(testing_config_options)
         + copy.deepcopy(code_coverage_config_options)
@@ -645,6 +654,9 @@ def _query_abs_base_cmd(self, suite_category, suite):
             if c["crash_as_pass"]:
                 base_cmd.append("--crash-as-pass")
 
+            if c["conditioned_profile"]:
+                base_cmd.append("--conditioned-profile")
+
             # set pluginsPath
             abs_res_plugins_dir = os.path.join(abs_res_dir, "plugins")
             str_format_values["test_plugin_path"] = abs_res_plugins_dir