From fc8c91616c5b4fdcdc6a005e05c2fd2881e571b5 Mon Sep 17 00:00:00 2001 From: Gregory Mierzwinski Date: Fri, 16 Oct 2020 06:16:34 -0400 Subject: [PATCH] Bug 1671415 - Remove 2019 youtube-playback tests. (#15918) * Bug 1671415 - Remove 2019 youtube-playback tests. * Run tests in PR. * Undo testing changes. --- taskcluster/ci/browsertime/kind.yml | 16 +-- taskcluster/ci/raptor/kind.yml | 98 --------------- .../fenix_taskgraph/transforms/browsertime.py | 4 + .../fenix_taskgraph/transforms/raptor.py | 114 ------------------ 4 files changed, 8 insertions(+), 224 deletions(-) delete mode 100644 taskcluster/ci/raptor/kind.yml delete mode 100644 taskcluster/fenix_taskgraph/transforms/raptor.py diff --git a/taskcluster/ci/browsertime/kind.yml b/taskcluster/ci/browsertime/kind.yml index a9fc5191e..04fbd2d21 100644 --- a/taskcluster/ci/browsertime/kind.yml +++ b/taskcluster/ci/browsertime/kind.yml @@ -71,6 +71,7 @@ job-defaults: path: workspace/build/blobber_upload_dir type: directory run-visual-metrics: True + chimera: True run: using: run-task checkout: false @@ -233,22 +234,11 @@ jobs: treeherder: symbol: 'Btime(tp6m-28-c)' - youtube-playback: - test-name: youtube-playback - run-visual-metrics: False - treeherder: - symbol: 'Btime(ytp)' - args: - by-abi: - # Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases - armeabi-v7a: - - '--test-url-params=exclude=1,2,9,10,17,18,21,22,26,28,30,32,39,40,47,48,55,56,63,64,71,72,79,80,83,84,89,90,95,96' - default: [] - youtube-playback-av1-sfr: description: "Raptor YouTube Playback AV1 SFR on Fenix" test-name: youtube-playback-av1-sfr run-visual-metrics: False + chimera: False treeherder: symbol: 'Btime(ytp-av1-sfr)' @@ -256,12 +246,14 @@ jobs: description: "Raptor YouTube Playback H264 SFR on Fenix" test-name: youtube-playback-h264-sfr run-visual-metrics: False + chimera: False treeherder: symbol: Btime(ytp-h264-sfr) youtube-playback-vp9-sfr: description: "Raptor YouTube Playback VP9 SFR on Fenix" run-visual-metrics: False + chimera: False test-name: youtube-playback-vp9-sfr treeherder: symbol: Btime(ytp-vp9-sfr) diff --git a/taskcluster/ci/raptor/kind.yml b/taskcluster/ci/raptor/kind.yml deleted file mode 100644 index 961bff746..000000000 --- a/taskcluster/ci/raptor/kind.yml +++ /dev/null @@ -1,98 +0,0 @@ ---- -loader: taskgraph.loader.transform:loader -transforms: - - fenix_taskgraph.transforms.raptor:transforms - - fenix_taskgraph.transforms.notify:transforms - - taskgraph.transforms.job:transforms - - taskgraph.transforms.task:transforms - -kind-dependencies: - - signing - - toolchain - -only-for-build-types: - - nightly - -only-for-abis: - - armeabi-v7a - - arm64-v8a - -job-defaults: - attributes: - nightly: true - retrigger: true - dependencies: - geckoview-nightly: geckoview-nightly - notify: - by-level: - '3': - email: - content: This calls for an action of the Performance team. Use the link to view it on Treeherder. - link: - text: Treeherder Job - href: 'https://treeherder.mozilla.org/#/jobs?repo={product_name}&revision={head_rev}&searchStr={task_name}' - on-reasons: [failed] - subject: '[{product_name}] Raptor job "{task_name}" failed' - to-addresses: [perftest-alerts@mozilla.com] - default: {} - run-on-tasks-for: [] - treeherder: - kind: test - tier: 1 - platform: - by-abi: - arm64-v8a: android-hw-p2-8-0-android-aarch64/opt - armeabi-v7a: android-hw-g5-7-0-arm7-api-16/opt - worker-type: - by-abi: - armeabi-v7a: t-bitbar-gw-perf-g5 - arm64-v8a: t-bitbar-gw-perf-p2 - worker: - max-run-time: 3600 - env: - GECKO_HEAD_REPOSITORY: "https://hg.mozilla.org/mozilla-central" - MOZ_AUTOMATION: "1" - MOZ_HIDE_RESULTS_TABLE: "1" - MOZ_NO_REMOTE: "1" - MOZ_NODE_PATH: "/usr/local/bin/node" - MOZHARNESS_CONFIG: "raptor/android_hw_config.py" - MOZHARNESS_SCRIPT: "raptor_script.py" - NEED_XVFB: "false" - NO_FAIL_ON_TEST_ERRORS: "1" - XPCOM_DEBUG_BREAK: "warn" - artifacts: - - name: public/logs/ - path: workspace/logs - type: directory - - - name: public/test_info/ - path: workspace/build/blobber_upload_dir - type: directory - run: - using: run-task - checkout: false - run-as-root: true - command: - - 'bash' - - './test-linux.sh' - - '--cfg=mozharness/configs/raptor/android_hw_config.py' - - '--app=fenix' - - '--binary=org.mozilla.fenix' - - '--activity=org.mozilla.fenix.IntentReceiverActivity' - - '--download-symbols=ondemand' - - '--no-conditioned-profile' - fetches: - toolchain: - - linux64-minidump-stackwalk - -jobs: - youtube-playback: - test-name: raptor-youtube-playback - treeherder: - symbol: 'Rap(ytp)' - args: - by-abi: - # Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases - armeabi-v7a: - - '--test-url-params=exclude=1,2,9,10,17,18,21,22,26,28,30,32,39,40,47,48,55,56,63,64,71,72,79,80,83,84,89,90,95,96' - default: [] diff --git a/taskcluster/fenix_taskgraph/transforms/browsertime.py b/taskcluster/fenix_taskgraph/transforms/browsertime.py index 27bc2e52a..ba11e6f82 100644 --- a/taskcluster/fenix_taskgraph/transforms/browsertime.py +++ b/taskcluster/fenix_taskgraph/transforms/browsertime.py @@ -98,6 +98,10 @@ def build_browsertime_task(config, tasks): task["run"]["command"].append("--browsertime-no-ffwindowrecorder") task["attributes"]["run-visual-metrics"] = True + # Setup chimera for combined warm+cold testing + if task.pop("chimera", False): + task["run"]["command"].append("--chimera") + # taskcluster is merging task attributes with the default ones # resulting the --cold extra option in the ytp warm tasks if 'youtube-playback' in task["name"]: diff --git a/taskcluster/fenix_taskgraph/transforms/raptor.py b/taskcluster/fenix_taskgraph/transforms/raptor.py deleted file mode 100644 index d087e9c87..000000000 --- a/taskcluster/fenix_taskgraph/transforms/raptor.py +++ /dev/null @@ -1,114 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -""" -Apply some defaults and minor modifications to the jobs defined in the build -kind. -""" - -from __future__ import absolute_import, print_function, unicode_literals - -import copy -import json - -from taskgraph.transforms.base import TransformSequence -from taskgraph.util.treeherder import inherit_treeherder_from_dep -from taskgraph.util.schema import resolve_keyed_by - -transforms = TransformSequence() - - -@transforms.add -def add_variants(config, tasks): - only_types = config.config["only-for-build-types"] - only_abis = config.config["only-for-abis"] - - tests = list(tasks) - - for dep_task in config.kind_dependencies_tasks: - build_type = dep_task.attributes.get("build-type", '') - if build_type not in only_types: - continue - - for abi, apk_metadata in dep_task.attributes["apks"].items(): - if abi not in only_abis: - continue - apk_path = apk_metadata["name"] - for test in tests: - test = copy.deepcopy(test) - attributes = copy.deepcopy(dep_task.attributes) - attributes.update(test.get("attributes", {})) - attributes["abi"] = abi - attributes["apk"] = apk_path - test["attributes"] = attributes - test["primary-dependency"] = dep_task - yield test - - -@transforms.add -def build_raptor_task(config, tasks): - for task in tasks: - signing = task.pop("primary-dependency") - task["dependencies"]["signing"] = signing.label - build_type = task["attributes"]["build-type"] - abi = task["attributes"]["abi"] - apk = task["attributes"]["apk"] - - test_name = task.pop("test-name") - - task["name"] = "{}-{}-{}".format(task["name"], build_type, abi) - task["description"] = "{}-{}".format(build_type, abi) - - for key in ("args", "treeherder.platform", "worker-type"): - resolve_keyed_by(task, key, item_name=task["name"], **{"abi": abi}) - - task["treeherder"] = inherit_treeherder_from_dep(task, signing) - - extra_config = { - "installer_url": "".format(apk), - "test_packages_url": "", - } - env = task["worker"]["env"] - env["EXTRA_MOZHARNESS_CONFIG"] = { - "artifact-reference": json.dumps(extra_config, sort_keys=True) - } - env["GECKO_HEAD_REV"] = "default" - env["MOZILLA_BUILD_URL"] = {"artifact-reference": "".format(apk)} - env["MOZHARNESS_URL"] = { - "artifact-reference": "" - } - env["TASKCLUSTER_WORKER_TYPE"] = task["worker-type"] - - worker = task["worker"] - worker.setdefault("mounts", []).append( - { - "content": { - "url": "https://hg.mozilla.org/mozilla-central/raw-file/default/taskcluster/scripts/tester/test-linux.sh" - }, - "file": "./test-linux.sh", - } - ) - task["run"]["command"].append("--test={}".format(test_name)) - task["run"]["command"].extend(task.pop("args", [])) - - yield task - - -@transforms.add -def fill_email_data(config, tasks): - product_name = config.graph_config['taskgraph']['repositories']['mobile']['name'] - format_kwargs = { - "product_name": product_name.lower(), - "head_rev": config.params["head_rev"], - } - - for task in tasks: - format_kwargs["task_name"] = task["name"] - - resolve_keyed_by(task, 'notify', item_name=task["name"], level=config.params["level"]) - email = task["notify"].get("email") - if email: - email["link"]["href"] = email["link"]["href"].format(**format_kwargs) - email["subject"] = email["subject"].format(**format_kwargs) - - yield task