From bdd514047ef94973f927bc2d3ff37a81107a1a23 Mon Sep 17 00:00:00 2001 From: Iulian Moraru Date: Fri, 13 May 2022 21:03:32 +0300 Subject: [PATCH] Backed out changeset fee2a1521dfe (bug 1769098) for causing python failures. CLOSED TREE --- build/gen_test_packages_manifest.py | 1 - .../gecko_taskgraph/test/test_util_chunking.py | 1 - taskcluster/gecko_taskgraph/util/chunking.py | 9 ++------- testing/condprofile/condprof/client.py | 7 +++---- testing/config/mozbase_requirements.txt | 7 ------- testing/mozharness/scripts/desktop_unittest.py | 12 ------------ 6 files changed, 5 insertions(+), 32 deletions(-) diff --git a/build/gen_test_packages_manifest.py b/build/gen_test_packages_manifest.py index e881c1df0915..afaae8c56ac3 100644 --- a/build/gen_test_packages_manifest.py +++ b/build/gen_test_packages_manifest.py @@ -114,7 +114,6 @@ def generate_package_data(args): if pkg_name is None: continue harness_requirements[harness].append(pkg_name) - harness_requirements[harness].append("target.condprof.tests.tar.gz") return harness_requirements diff --git a/taskcluster/gecko_taskgraph/test/test_util_chunking.py b/taskcluster/gecko_taskgraph/test/test_util_chunking.py index 62060394adf8..23154f0c8728 100644 --- a/taskcluster/gecko_taskgraph/test/test_util_chunking.py +++ b/taskcluster/gecko_taskgraph/test/test_util_chunking.py @@ -159,7 +159,6 @@ def mock_mozinfo(): "headless": headless, "tsan": tsan, "appname": "firefox", - "condprof": False, } return inner diff --git a/taskcluster/gecko_taskgraph/util/chunking.py b/taskcluster/gecko_taskgraph/util/chunking.py index 786db88dfbcf..1e7e5c0a24fe 100644 --- a/taskcluster/gecko_taskgraph/util/chunking.py +++ b/taskcluster/gecko_taskgraph/util/chunking.py @@ -11,7 +11,7 @@ import os from abc import ABCMeta, abstractmethod from manifestparser import TestManifest -from manifestparser.filters import chunk_by_runtime, tags +from manifestparser.filters import chunk_by_runtime from mozbuild.util import memoize from moztest.resolve import ( TEST_SUITES, @@ -56,7 +56,6 @@ 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" @@ -228,14 +227,10 @@ class DefaultLoader(BaseManifestLoader): 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, filters=filters, **mozinfo) + tests = m.active_tests(disabled=False, exists=False, **mozinfo) active = {chunk_by_runtime.get_manifest(t) for t in tests} skipped = manifests - active return {"active": list(active), "skipped": list(skipped)} diff --git a/testing/condprofile/condprof/client.py b/testing/condprofile/condprof/client.py index 53668e83084a..896f7caa5277 100644 --- a/testing/condprofile/condprof/client.py +++ b/testing/condprofile/condprof/client.py @@ -28,7 +28,7 @@ from condprof.changelog import Changelog 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-%(scenario)s" +INDEX_PATH = "gecko.v2.%(repo)s.latest.firefox.condprof-%(platform)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,7 +135,6 @@ 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, @@ -213,8 +212,8 @@ def get_profile( raise ProfileNotFoundError(url) -def read_changelog(platform, repo="mozilla-central", scenario="settled"): - params = {"platform": platform, "repo": repo, "scenario": scenario} +def read_changelog(platform, repo="mozilla-central"): + params = {"platform": platform, "repo": repo} changelog_url = CHANGELOG_LINK % params logger.info("Getting %s" % changelog_url) download_dir = tempfile.mkdtemp() diff --git a/testing/config/mozbase_requirements.txt b/testing/config/mozbase_requirements.txt index 7e6dcffcee78..3fd8dbf83f05 100644 --- a/testing/config/mozbase_requirements.txt +++ b/testing/config/mozbase_requirements.txt @@ -21,10 +21,3 @@ ../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 \ No newline at end of file diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py index f19a9840668d..027e41efc5ec 100755 --- a/testing/mozharness/scripts/desktop_unittest.py +++ b/testing/mozharness/scripts/desktop_unittest.py @@ -305,15 +305,6 @@ 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) @@ -654,9 +645,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM 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