From 320015abad9afbf8d9c124046489e612d4b57894 Mon Sep 17 00:00:00 2001 From: marianrai Date: Wed, 7 Aug 2019 20:01:05 +0300 Subject: [PATCH] Bug 1566849 - [meta] Video QoE testing for Fenix (#4555) * Created new craft method + decision task call + bug 1558456 logic * Created new craft method + decision task call + bug 1558456 logic --- automation/taskcluster/decision_task.py | 2 + automation/taskcluster/lib/tasks.py | 49 +++++++++++++++++++------ 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py index cacb1d96d..e2ae7e602 100644 --- a/automation/taskcluster/decision_task.py +++ b/automation/taskcluster/decision_task.py @@ -105,6 +105,8 @@ def raptor(is_staging): all_raptor_craft_functions = [ BUILDER.craft_raptor_tp6m_cold_task(for_suite=i) for i in range(1, 28) + ] + [ + BUILDER.craft_raptor_youtube_playback_task, ] for craft_function in all_raptor_craft_functions: args = (signing_task_id, mozharness_task_id, variant, gecko_revision) diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py index aee5808f0..f13b798eb 100644 --- a/automation/taskcluster/lib/tasks.py +++ b/automation/taskcluster/lib/tasks.py @@ -16,6 +16,11 @@ DEFAULT_APK_ARTIFACT_LOCATION = 'public/target.apk' _OFFICIAL_REPO_URL = 'https://github.com/mozilla-mobile/fenix' _DEFAULT_TASK_URL = 'https://queue.taskcluster.net/v1/task' GOOGLE_APPLICATION_CREDENTIALS = '.firebase_token.json' +# Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases +ARM_RAPTOR_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", +] class TaskBuilder(object): @@ -584,6 +589,21 @@ class TaskBuilder(object): ) return craft_function + def craft_raptor_youtube_playback_task(self, signing_task_id, mozharness_task_id, variant, gecko_revision, + force_run_on_64_bit_device=False): + return self._craft_raptor_task( + signing_task_id, + mozharness_task_id, + variant, + gecko_revision, + name_prefix='raptor youtube playback', + description='Raptor YouTube Playback on Fenix', + test_name='raptor-youtube-playback', + job_symbol='ytp', + group_symbol='Rap-fenix', + force_run_on_64_bit_device=force_run_on_64_bit_device, + ) + def _craft_raptor_task( self, signing_task_id, @@ -614,6 +634,23 @@ class TaskBuilder(object): apk_url = '{}/{}/artifacts/{}'.format(_DEFAULT_TASK_URL, signing_task_id, DEFAULT_APK_ARTIFACT_LOCATION) + command = [[ + "/builds/taskcluster/script.py", + "bash", + "./test-linux.sh", + "--cfg=mozharness/configs/raptor/android_hw_config.py", + "--test={}".format(test_name), + "--app=fenix", + "--binary=org.mozilla.fenix.performancetest", + "--activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity", + "--download-symbols=ondemand", + ]] + # Bug 1558456 - Stop tracking youtube-playback-test on motoG5 for >1080p cases + if variant.abi == 'arm': + params_query = '&'.join(ARM_RAPTOR_URL_PARAMS) + add_extra_params_option = "--test-url-params={}".format(params_query) + command[0].append(add_extra_params_option) + return self._craft_default_task_definition( worker_type=worker_type, provisioner_id='proj-autophone', @@ -633,17 +670,7 @@ class TaskBuilder(object): ('workspace/logs', 'logs'), ('workspace/build/blobber_upload_dir', 'test_info'), )], - "command": [[ - "/builds/taskcluster/script.py", - "bash", - "./test-linux.sh", - "--cfg=mozharness/configs/raptor/android_hw_config.py", - "--test={}".format(test_name), - "--app=fenix", - "--binary=org.mozilla.fenix.performancetest", - "--activity=org.mozilla.fenix.browser.BrowserPerformanceTestActivity", - "--download-symbols=ondemand", - ]], + "command": command, "env": { "EXTRA_MOZHARNESS_CONFIG": json.dumps({ "test_packages_url": "{}/{}/artifacts/public/build/en-US/target.test_packages.json".format(_DEFAULT_TASK_URL, mozharness_task_id),