From bbb7e4a148e10e77bb2c7dc3bb239d723687f779 Mon Sep 17 00:00:00 2001 From: Armen Zambrano Gasparnian Date: Tue, 19 Jan 2016 11:17:27 -0500 Subject: [PATCH] Bug 1239410 - Replace mochitest-other with a11y & chrome (3 chunks). DONTBUILD. r=jmaher --HG-- extra : commitid : 4UjetV3RB0w extra : source : 57bdc24f62298a93e9d1ce41d71a80838b787670 --- .../tasks/branches/base_job_flags.yml | 10 ++++---- .../taskcluster/tasks/branches/base_jobs.yml | 8 +++++++ .../tasks/branches/try/job_flags.yml | 8 +++++++ ...ther.yml => fx_linux64_mochitest_a11y.yml} | 8 +++---- .../tests/fx_linux64_mochitest_chrome.yml | 24 +++++++++++++++++++ 5 files changed, 49 insertions(+), 9 deletions(-) rename testing/taskcluster/tasks/tests/{fx_linux64_mochitest_other.yml => fx_linux64_mochitest_a11y.yml} (77%) create mode 100644 testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome.yml diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml index 520d06da3492..278bb50be899 100644 --- a/testing/taskcluster/tasks/branches/base_job_flags.yml +++ b/testing/taskcluster/tasks/branches/base_job_flags.yml @@ -43,16 +43,15 @@ flags: mochitest-e10s: /mochitest-e10s.*/ mochitests-e10s: /mochitest-e10s.*/ mochitest-debug: /mochitest-debug-.*/ - mochitest-a11y: /.*mochitest-o.*/ + mochitest-a11y: /.*mochitest-a11y.*/ mochitest-bc: /mochitest-browser-chrome.*/ - mochitest-browser-chrome: /mochitest-browser-chrome.*/ mochitest-bc-e10s: /mochitest-browser-chrome-e10s.*/ + mochitest-browser-chrome: /mochitest-browser-chrome.*/ mochitest-browser-chrome-e10s: /mochitest-browser-chrome-e10s.*/ + mochitest-chrome: /.*mochitest-chrome.*/ mochitest-dt: /mochitest-devtools-chrome.*/ mochitest-dt-e10s: /mochitest-devtools-chrome-e10s.*/ mochitest-gl: /mochitest-webgl.*/ - mochitest-o: /.*mochitest-o.*/ - mochitest-other: /mochitest-other.*/ mochitest-push: /mochitest-push.*/ reftest: /(plain-)?reftest.*/ reftest-no-accel: /(plain-)?reftest-no-accel.*/ @@ -130,15 +129,16 @@ flags: - marionette - marionette-webapi - mochitest + - mochitest-a11y - mochitest-browser-chrome - mochitest-browser-chrome-e10s + - mochitest-chrome - mochitest-devtools-chrome - mochitest-devtools-chrome-e10s - mochitest-e10s - mochitest-jetpack - mochitest-media - mochitest-oop - - mochitest-other - mochitest-push - mochitest-webgl - mozmill diff --git a/testing/taskcluster/tasks/branches/base_jobs.yml b/testing/taskcluster/tasks/branches/base_jobs.yml index 19ceef6da7b7..0dbfbe228559 100644 --- a/testing/taskcluster/tasks/branches/base_jobs.yml +++ b/testing/taskcluster/tasks/branches/base_jobs.yml @@ -232,6 +232,14 @@ tests: task: tasks/tests/mulet_mochitests.yml tasks/builds/b2g_emulator_x86_kk_opt.yml: task: tasks/tests/b2g_emulator_mochitest.yml + mochitest-a11y: + allowed_build_tasks: + tasks/builds/dbg_linux64.yml: + task: tasks/tests/fx_linux64_mochitest_a11y.yml + mochitest-chrome: + allowed_build_tasks: + tasks/builds/dbg_linux64.yml: + task: tasks/tests/fx_linux64_mochitest_chrome.yml mochitest-push: allowed_build_tasks: tasks/builds/dbg_linux64.yml: diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml index e1e3bc51929c..a3bc8d063094 100644 --- a/testing/taskcluster/tasks/branches/try/job_flags.yml +++ b/testing/taskcluster/tasks/branches/try/job_flags.yml @@ -170,6 +170,14 @@ tests: task: tasks/tests/b2g_emulator_mochitest.yml tasks/builds/b2g_emulator_x86_kk_opt.yml: task: tasks/tests/b2g_emulator_mochitest.yml + mochitest-a11y: + allowed_build_tasks: + tasks/builds/dbg_linux64_clobber.yml: + task: tasks/tests/fx_linux64_mochitest_a11y.yml + mochitest-chrome: + allowed_build_tasks: + tasks/builds/dbg_linux64_clobber.yml: + task: tasks/tests/fx_linux64_mochitest_chrome.yml mochitest-push: allowed_build_tasks: tasks/builds/dbg_linux64_clobber.yml: diff --git a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y.yml similarity index 77% rename from testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml rename to testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y.yml index 411df6d82453..480cf00c38ee 100644 --- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml +++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y.yml @@ -5,8 +5,8 @@ task: - 'docker-worker:capability:device:loopbackVideo' - 'docker-worker:capability:device:loopbackAudio' metadata: - name: '[TC] Linux64 mochitest-other' - description: Mochitest other run + name: '[TC] Linux64 mochitest-a11y' + description: Mochitest a11y run payload: capabilities: devices: @@ -15,8 +15,8 @@ task: extra: suite: name: mochitest - flavor: chrome,a11y + flavor: a11y treeherder: groupName: Desktop mochitests groupSymbol: tc-M - symbol: oth + symbol: a11y diff --git a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome.yml b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome.yml new file mode 100644 index 000000000000..a25cb059c4be --- /dev/null +++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome.yml @@ -0,0 +1,24 @@ +$inherits: + from: 'tasks/tests/fx_desktop_unittest.yml' +task: + scopes: + - 'docker-worker:capability:device:loopbackVideo' + - 'docker-worker:capability:device:loopbackAudio' + metadata: + name: '[TC] Linux64 mochitest-chrome {{chunk}}' + description: Mochitest chrome run {{chunk}} + payload: + capabilities: + devices: + loopbackVideo: true + loopbackAudio: true + extra: + chunks: + total: 3 + suite: + name: mochitest + flavor: chrome + treeherder: + groupName: Desktop mochitests + groupSymbol: tc-M + symbol: c{{chunk}}