Bug 1472298 - add raptor-speedometer-geckoview for android-hw-g5 test platforms, r=gbrown,rwood.

Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1482344 added workdir to the test_description_schema but
did not make it optinally_keyed_by test-platform. Since the Bitbar tests use different Docker images with
different layouts, we need the ability to set the workdir by test-platorm.
This commit is contained in:
Bob Clary 2018-09-11 14:17:46 -04:00
Родитель 6944c19eea
Коммит 6089bedddf
4 изменённых файлов: 48 добавлений и 2 удалений

Просмотреть файл

@ -1,11 +1,15 @@
job-defaults:
max-run-time: 1800
suite: raptor
workdir: /home/cltbld
workdir:
by-test-platform:
android-hw-g5.*: /builds/worker
default: /home/cltbld
tier:
by-test-platform:
windows10-64-ccov/.*: 3
linux64-ccov/.*: 3
android-hw-g5.*: 3
default: 2
virtualization:
by-test-platform:
@ -23,6 +27,8 @@ job-defaults:
- raptor/windows_vm_config.py
linux64-ccov/opt:
- raptor/linux64_config_taskcluster.py
android-hw-g5.*:
- raptor/android_hw_config.py
default:
- raptor/linux_config.py
@ -57,6 +63,21 @@ raptor-speedometer-firefox:
extra-options:
- --test=raptor-speedometer
raptor-speedometer-geckoview:
description: "Raptor Speedometer on Geckoview"
try-name: raptor-speedometer-geckoview
treeherder-symbol: Rap(sp)
target: geckoview_example.apk
run-on-projects:
by-test-platform:
android-hw-g5.*: ['try', 'mozilla-central']
max-run-time: 1500
mozharness:
extra-options:
- --test=raptor-speedometer
- --app=geckoview
- --binary=org.mozilla.geckoview_example
raptor-speedometer-chrome:
description: "Raptor Speedometer on Chrome"
try-name: raptor-speedometer-chrome

Просмотреть файл

@ -147,7 +147,9 @@ test_description_schema = Schema({
basestring),
# base work directory used to set up the task.
Optional('workdir'): basestring,
Optional('workdir'): optionally_keyed_by(
'test-platform',
Any(basestring, 'default')),
# the name by which this test suite is addressed in try syntax; defaults to
# the test-name. This will translate to the `unittest_try_name` or
@ -688,6 +690,7 @@ def handle_keyed_by(config, tests):
'mozharness.extra-options',
'mozharness.requires-signed-builds',
'mozharness.script',
'workdir',
'worker-type',
'virtualization',
]

Просмотреть файл

@ -0,0 +1,21 @@
import os
config = {
"log_name": "raptor",
"title": os.uname()[1].lower().split('.')[0],
"default_actions": [
"clobber",
"download-and-extract",
"populate-webroot",
"install-chrome",
"create-virtualenv",
"install",
"run-tests",
],
"tooltool_cache": "/builds/tooltool_cache",
"download_tooltool": True,
"download_minidump_stackwalk": True,
"minidump_stackwalk_path": "linux64-minidump_stackwalk",
"tooltool_servers": ['https://tooltool.mozilla-releng.net/'],
"minidump_tooltool_manifest_path": "config/tooltool-manifests/linux64/releng.manifest",
}

Просмотреть файл

@ -133,6 +133,7 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin):
self.test = None
self.gecko_profile = self.config.get('gecko_profile')
self.gecko_profile_interval = self.config.get('gecko_profile_interval')
self.test_packages_url = self.config.get('test_packages_url')
# We accept some configuration options from the try commit message in the
# format mozharness: <options>. Example try commit message: mozharness: