Backed out changeset 4f6b7bbed562, 39eb529d58ec, 85f75a951f93, 05714f5e19e6, 46e29447f7f3, 13dd3d769943, 9c36a34674a1 (bug 1281004) for merge conflicts with central

--HG--
extra : histedit_source : 23c65677a4ae11204913d1721cbb2a0388577805%2C8dedaf8e3a3a88ba46afbcc91a12172da6de9900
This commit is contained in:
Gregory Szorc 2016-07-06 18:24:25 -07:00
parent 05efa7019c
commit c2ebe57e1e
36 changed files with 368 additions and 49 deletions

View File

@ -12,3 +12,10 @@ builds:
types:
opt:
task: tasks/builds/mulet_linux.yml
tests:
mochitest:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_mochitests.yml
chunks: 5

View File

@ -38,6 +38,12 @@ flags:
- firefox-ui-functional-local-e10s
- firefox-ui-functional-remote
- firefox-ui-functional-remote-e10s
- gaia-build
- gaia-build-unit
- gaia-js-integration
- gaia-linter
- gaia-unit
- gaia-unit-oop
- gtest
- jittests
- jsreftest

View File

@ -359,6 +359,8 @@ tests:
task: tasks/tests/fx_linux64_marionette_e10s_opt.yml
mochitest:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_mochitests.yml
tasks/builds/opt_linux64.yml:
task: tasks/tests/fx_linux64_mochitest_plain_opt.yml
tasks/builds/dbg_linux64.yml:
@ -549,6 +551,8 @@ tests:
task: tasks/tests/fx_linux64_mochitest_clipboard_e10s_opt.yml
reftest:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_reftests.yml
tasks/builds/opt_linux64.yml:
task: tasks/tests/fx_linux64_reftest_opt.yml
tasks/builds/dbg_linux64.yml:

View File

@ -28,6 +28,32 @@ builds:
debug:
task: tasks/builds/b2g_nexus_5l_debug.yml
tests:
gaia-build:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_build_test.yml
gaia-build-unit:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_build_unit.yml
gaia-js-integration:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_gaia_js_integration_tests.yml
gaia-linter:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_linter.yml
gaia-unit:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_gaia_unit.yml
gaia-unit-oop:
allowed_build_tasks:
tasks/builds/mulet_linux.yml:
task: tasks/tests/mulet_gaia_unit_oop.yml
post-build:
simulator:
allowed_build_tasks:

View File

@ -0,0 +1,31 @@
---
$inherits:
from: 'tasks/docker_test.yml'
task:
scopes:
- 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
- 'docker-worker:cache:level-{{level}}-{{project}}-dotcache'
- 'docker-worker:capability:device:loopbackVideo'
- 'docker-worker:capability:device:loopbackAudio'
payload:
cache:
# So pip installs are cached...
level-{{level}}-{{project}}-dotcache: /home/worker/.cache
level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
capabilities:
devices:
loopbackVideo: true
loopbackAudio: true
env:
NEED_XVFB: true
GECKO_HEAD_REPOSITORY: '{{{head_repository}}}'
GECKO_HEAD_REV: '{{{head_rev}}}'
GAIA_HEAD_REPOSITORY: '{{{gaia_head_repository}}}'
GAIA_BASE_REPOSITORY: '{{{gaia_base_repository}}}'
GAIA_REF: '{{{gaia_ref}}}'
GAIA_REV: '{{{gaia_rev}}}'
artifacts:
'public/build':
type: directory
path: '/home/worker/artifacts/'
expires: '{{#from_now}}1 year{{/from_now}}'

View File

@ -4,14 +4,13 @@ $inherits:
task:
payload:
command:
- --test-suite=cppunittest
- --test-suite={{suite}}
metadata:
name: '[TC] Android 4.3 API15+ cppunit test'
description: cppunit run
extra:
suite:
name: cppunittest
flavor: cppunittest
treeherder:
groupSymbol: tc
symbol: Cpp

View File

@ -3,6 +3,9 @@ $inherits:
from: 'tasks/tests/fx_android-api-15_generic.yml'
task:
workerType: desktop-test-xlarge
payload:
command:
- --test-suite={{suite}}{{chunk}}
metadata:
name: '[TC] Android 4.3 API15+ crashtest-{{chunk}}'
description: Crashtest run {{chunk}}
@ -10,8 +13,7 @@ task:
chunks:
total: 4
suite:
name: crashtest
flavor: crashtest
name: crashtest-{{chunk}}
treeherder:
groupSymbol: tc-R
symbol: C{{chunk}}

View File

@ -3,9 +3,10 @@ $inherits:
task:
payload:
command:
- --test-suite=crashtest-debug-{{chunk}}
- --download-symbols=true
extra:
suite:
name: crashtest-debug-{{chunk}}
chunks:
total: 10
treeherder:

View File

@ -4,7 +4,6 @@ $inherits:
task:
payload:
command:
- --test-suite=crashtest-{{chunk}}
- --download-symbols=ondemand
extra:
treeherder:

View File

@ -5,6 +5,8 @@ task:
workerType: desktop-test-xlarge
payload:
maxRunTime: 7200
command:
- --test-suite={{suite}}{{chunk}}
metadata:
name: '[TC] Android 4.3 API15+ jsreftest-{{chunk}}'
description: jsreftest run {{chunk}}
@ -12,8 +14,7 @@ task:
chunks:
total: 6
suite:
name: reftest
flavor: jsreftest
name: jsreftest-{{chunk}}
treeherder:
groupSymbol: tc-R
symbol: J{{chunk}}

View File

@ -3,9 +3,10 @@ $inherits:
task:
payload:
command:
- --test-suite=jsreftest-debug-{{chunk}}
- --download-symbols=true
extra:
suite:
name: jsreftest-debug-{{chunk}}
chunks:
total: 20
treeherder:

View File

@ -4,7 +4,6 @@ $inherits:
task:
payload:
command:
- --test-suite=jsreftest-{{chunk}}
- --download-symbols=ondemand
extra:
treeherder:

View File

@ -6,14 +6,13 @@ task:
payload:
maxRunTime: 5400
command:
- --test-suite=mochitest-chrome
- --test-suite={{suite}}
metadata:
name: '[TC] Android API 15 mochitest-chrome'
description: Mochitest chrome run
extra:
suite:
name: mochitest
flavor: chrome
name: mochitest-chrome
treeherder:
groupSymbol: tc-M
symbol: c

View File

@ -5,14 +5,13 @@ task:
workerType: desktop-test-xlarge
payload:
command:
- --test-suite=mochitest-plain-clipboard
- --test-suite={{suite}}
metadata:
name: '[TC] Android 4.3 API15+ mochitest-clipboard'
description: Mochitest Clipboard run
extra:
suite:
name: mochitest
flavor: plain-clipboard
name: mochitest-plain-clipboard
treeherder:
groupSymbol: tc-M
symbol: cl

View File

@ -5,7 +5,7 @@ task:
payload:
maxRunTime: 7200
command:
- --test-suite=mochitest-gl-{{chunk}}
- --test-suite={{suite}}{{chunk}}
metadata:
name: '[TC] Android 4.3 API15+ mochitest-gl-{{chunk}}'
description: Mochitest WebGL run {{chunk}}
@ -13,8 +13,7 @@ task:
chunks:
total: 10
suite:
name: mochitest
flavor: mochitest-gl
name: mochitest-gl-{{chunk}}
treeherder:
groupSymbol: tc-M
symbol: gl{{chunk}}

View File

@ -4,14 +4,13 @@ $inherits:
task:
payload:
command:
- --test-suite=mochitest-plain-gpu
- --test-suite={{suite}}
metadata:
name: '[TC] Android 4.3 API15+ mochitest-gpu'
description: Mochitest GPU run
extra:
suite:
name: mochitest
flavor: plain-gpu
name: mochitest-plain-gpu
treeherder:
groupSymbol: tc-M
symbol: gpu

View File

@ -5,7 +5,7 @@ task:
workerType: desktop-test-xlarge
payload:
command:
- --test-suite=mochitest-media-{{chunk}}
- --test-suite={{suite}}{{chunk}}
metadata:
name: '[TC] Android 4.3 API15+ mochitest-media-{{chunk}}'
description: Mochitest Media run {{chunk}}
@ -13,8 +13,7 @@ task:
chunks:
total: 2
suite:
name: mochitest
flavor: mochitest-media
name: mochitest-media-{{chunk}}
treeherder:
groupSymbol: tc-M
symbol: mda{{chunk}}

View File

@ -5,7 +5,7 @@ task:
workerType: desktop-test-xlarge
payload:
command:
- --test-suite=mochitest-{{chunk}}
- --test-suite={{suite}}{{chunk}}
metadata:
name: '[TC] Android 4.3 API15+ mochitest-{{chunk}}'
description: Mochitest plain run {{chunk}}
@ -13,8 +13,7 @@ task:
chunks:
total: 20
suite:
name: mochitest
flavor: plain-chunked
name: mochitest-{{chunk}}
treeherder:
groupSymbol: tc-M
symbol: {{chunk}}

View File

@ -5,6 +5,8 @@ task:
workerType: desktop-test-xlarge
payload:
maxRunTime: 10800
command:
- --test-suite={{suite}}{{chunk}}
metadata:
name: '[TC] Android 4.3 API15+ reftest-{{chunk}}'
description: Reftest run {{chunk}}
@ -12,8 +14,7 @@ task:
chunks:
total: 16
suite:
name: reftest
flavor: reftest
name: reftest-{{chunk}}
treeherder:
groupSymbol: tc-R
symbol: R{{chunk}}

View File

@ -3,9 +3,10 @@ $inherits:
task:
payload:
command:
- --test-suite=reftest-debug-{{chunk}}
- --download-symbols=true
extra:
suite:
name: reftest-debug-{{chunk}}
chunks:
total: 48
treeherder:

View File

@ -4,7 +4,6 @@ $inherits:
task:
payload:
command:
- --test-suite=reftest-{{chunk}}
- --download-symbols=ondemand
extra:
treeherder:

View File

@ -5,7 +5,7 @@ task:
workerType: desktop-test-xlarge
payload:
command:
- --test-suite=robocop-{{chunk}}
- --test-suite={{suite}}{{chunk}}
metadata:
name: '[TC] Android 4.3 API15+ robocop-{{chunk}}'
description: Robocop run {{chunk}}
@ -13,8 +13,7 @@ task:
chunks:
total: 4
suite:
name: robocop
flavor: robocop
name: robocop-{{chunk}}
treeherder:
groupSymbol: tc-M
symbol: rc{{chunk}}

View File

@ -6,7 +6,7 @@ task:
payload:
maxRunTime: 7200
command:
- --test-suite=xpcshell-{{chunk}}
- --test-suite={{suite}}{{chunk}}
metadata:
name: '[TC] Android 4.3 API15+ xpcshell-{{chunk}}'
description: XPCShell run {{chunk}}
@ -14,8 +14,7 @@ task:
chunks:
total: 3
suite:
name: xpcshell
flavor: xpcshell
name: xpcshell-{{chunk}}
treeherder:
groupSymbol: tc-X
symbol: {{chunk}}

View File

@ -21,12 +21,10 @@ task:
name: '[TC] Linux64 jsreftest e10s'
description: Jsreftest e10s run
extra:
chunks:
total: 2
suite:
name: reftest
flavor: jsreftest
treeherder:
groupName: Desktop jsreftest
groupSymbol: tc-R-e10s
symbol: J{{chunk}}
symbol: J

View File

@ -23,5 +23,4 @@ task:
flavor: marionette
treeherder:
groupName: Desktop marionette e10s
groupSymbol: tc-e10s
symbol: Mn
symbol: Mn-e10s

View File

@ -29,4 +29,4 @@ task:
treeherder:
groupName: Desktop reftest
groupSymbol: tc-R-e10s
symbol: R{{chunk}}
symbol: R-e10s{{chunk}}

View File

@ -22,9 +22,6 @@ task:
name: '[TC] Linux64 web-platform-tests-e10s-{{chunk}}'
description: Web platform e10s tests run {{chunk}}
extra:
suite:
name: web-platform-tests
flavor: web-platform-tests
chunks:
total: 12
treeherder:

View File

@ -2,7 +2,6 @@
$inherits:
from: 'tasks/tests/fx_docker_desktop_generic.yml'
task:
workerType: desktop-test-xlarge
payload:
maxRunTime: 5400
command:
@ -26,4 +25,4 @@ task:
treeherder:
groupName: Desktop web-platform-tests
groupSymbol: tc-W-e10s
symbol: Wr
symbol: Wr-e10s

View File

@ -0,0 +1,29 @@
---
$inherits:
from: 'tasks/tests/b2g_unittest_base.yml'
task:
metadata:
name: '[TC] - Gaia Build Test'
description: Gaia Build Test test run
payload:
env:
NEED_PULL_GAIA: true
MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_build_integration.py'
MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_integration.py'
command:
- bash
- /home/worker/bin/test.sh
- --application=firefox
- {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
- {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
- --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
extra:
treeherderEnv:
- production
- staging
treeherder:
groupSymbol: "?"
symbol: 'Gb'
productName: b2g

View File

@ -0,0 +1,28 @@
---
$inherits:
from: 'tasks/tests/b2g_unittest_base.yml'
task:
metadata:
name: '[TC] - Gaia Build Unit Test'
description: Gaia Build Unit Test
payload:
env:
NEED_PULL_GAIA: true
MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_build_unit.py'
MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_integration.py'
command:
- bash
- /home/worker/bin/test.sh
- --application=firefox
- {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
- {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
extra:
treeherderEnv:
- production
- staging
treeherder:
groupSymbol: "?"
symbol: 'Gbu'
productName: b2g

View File

@ -0,0 +1,34 @@
---
$inherits:
from: 'tasks/tests/b2g_unittest_base.yml'
reruns: 3
task:
metadata:
name: '[TC] Mulet Gaia JS Integration Test'
description: Mulet Gaia JS Integration Test run {{chunk}}
payload:
env:
NEED_PULL_GAIA: true
MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_integration.py'
MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_integration.py'
command:
- bash
- /home/worker/bin/test.sh
- --application=firefox
- {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
- {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
- --total-chunk={{total_chunks}}
- --this-chunk={{chunk}}
extra:
chunks:
total: 40
treeherderEnv:
- production
- staging
treeherder:
groupName: Gaia JS Integration Test
groupSymbol: Gij
symbol: '{{chunk}}'
productName: b2g

View File

@ -0,0 +1,33 @@
---
$inherits:
from: 'tasks/tests/b2g_unittest_base.yml'
task:
metadata:
name: '[TC] Mulet Gaia Unit Test'
description: Mulet Gaia Unit Test
payload:
env:
NEED_PULL_GAIA: true
MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_unit.py'
MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_unit_production.py'
command:
- bash
- /home/worker/bin/test.sh
- --application=firefox
- {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
- {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
- --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
- --total-chunk={{total_chunks}}
- --this-chunk={{chunk}}
extra:
treeherderEnv:
- production
- staging
chunks:
total: 10
treeherder:
groupSymbol: Gu
groupName: Mulet gaia unit tests
symbol: {{chunk}}

View File

@ -0,0 +1,33 @@
---
$inherits:
from: 'tasks/tests/b2g_unittest_base.yml'
task:
metadata:
name: '[TC] Mulet Gaia Unit Test OOP'
description: Mulet Gaia Unit Test OOP
payload:
env:
NEED_PULL_GAIA: true
MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_unit.py'
MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_unit_production.py'
command:
- bash
- /home/worker/bin/test.sh
- --application=firefox
- --browser-arg=-oop
- {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
- {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
- --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
- --total-chunk={{total_chunks}}
- --this-chunk={{chunk}}
extra:
treeherderEnv:
- staging
chunks:
total: 10
treeherder:
groupSymbol: Gu-oop
groupName: Mulet Gaia unit tests OOP
symbol: {{chunk}}

View File

@ -0,0 +1,28 @@
---
$inherits:
from: 'tasks/tests/b2g_unittest_base.yml'
task:
metadata:
name: '[TC] - Gaia Linter'
description: Linter Test
payload:
env:
NEED_PULL_GAIA: true
MOZHARNESS_SCRIPT: 'mozharness/scripts/gaia_linter.py'
MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_gaia_integration.py'
command:
- bash
- /home/worker/bin/test.sh
- --application=firefox
- {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
- {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
extra:
treeherderEnv:
- production
- staging
treeherder:
groupSymbol: "?"
symbol: 'Li'
productName: 'b2g'

View File

@ -0,0 +1,36 @@
---
$inherits:
from: 'tasks/tests/b2g_unittest_base.yml'
task:
metadata:
name: '[TC] Mulet Mochitests ( {{chunk}} )'
description: Mulet Mochitest run {{chunk}}
payload:
env:
NEED_PULSEAUDIO: true
MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
MOZHARNESS_CONFIG: >
mozharness/configs/unittests/linux_unittest.py
mozharness/configs/remove_executables.py
command:
- bash
- /home/worker/bin/test.sh
- --no-read-buildbot-config
- {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
- {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
- --download-symbols=ondemand
- --mochitest-suite=plain-chunked
- --total-chunk={{total_chunks}}
- --this-chunk={{chunk}}
extra:
treeherderEnv:
- production
- staging
chunks:
total: 5
treeherder:
groupSymbol: M
groupName: Mulet mochitests
symbol: {{chunk}}

View File

@ -0,0 +1,36 @@
---
$inherits:
from: 'tasks/tests/b2g_unittest_base.yml'
task:
metadata:
name: '[TC] Mulet Reftest ( {{chunk}} )'
description: Mulet Reftest run {{chunk}}
payload:
env:
MOZ_DISABLE_NONLOCAL_CONNECTIONS: 0
NEED_PULL_GAIA: true
MOZHARNESS_SCRIPT: 'mozharness/scripts/mulet_unittest.py'
MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_mulet_automation.py'
command:
- bash
- /home/worker/bin/test.sh
- {"task-reference": "--installer-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{build_location}}"}
- {"task-reference": "--test-packages-url=https://queue.taskcluster.net/v1/task/<{{build_slugid}}>/artifacts/{{test_packages_location}}"}
- --test-suite=reftest
- --test-manifest=tests/layout/reftests/reftest.list
- --this-chunk={{chunk}}
- --total-chunk={{total_chunks}}
extra:
treeherderEnv:
- production
- staging
chunks:
total: 6
treeherder:
groupSymbol: R
groupName: Mulet Reftest
symbol: 'R{{chunk}}'
productName: b2g
tier: 3