diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml index e7ab2e7798c9..ca2ec1a97e05 100644 --- a/testing/taskcluster/tasks/branches/base_job_flags.yml +++ b/testing/taskcluster/tasks/branches/base_job_flags.yml @@ -39,6 +39,7 @@ flags: jsreftest-e10s: /jsreftest-e10s.*/ luciddream: /luciddream.*/ marionette: /marionette.*/ + marionette-e10s: /marionette-e10s.*/ mochitest: /mochitest.*/ mochitests: /mochitest.*/ mochitest-e10s: /mochitest-e10s.*/ @@ -131,6 +132,7 @@ flags: - jsreftest-e10s - luciddream - marionette + - marionette-e10s - marionette-webapi - mochitest - mochitest-a11y diff --git a/testing/taskcluster/tasks/branches/base_jobs.yml b/testing/taskcluster/tasks/branches/base_jobs.yml index d102d837b0ef..96d6723dd6f3 100644 --- a/testing/taskcluster/tasks/branches/base_jobs.yml +++ b/testing/taskcluster/tasks/branches/base_jobs.yml @@ -238,6 +238,14 @@ tests: allowed_build_tasks: tasks/builds/dbg_linux64.yml: task: tasks/tests/fx_linux64_jsreftest_e10s.yml + marionette: + allowed_build_tasks: + tasks/builds/dbg_linux64.yml: + task: tasks/tests/fx_linux64_marionette.yml + marionette-e10s: + allowed_build_tasks: + tasks/builds/dbg_linux64.yml: + task: tasks/tests/fx_linux64_marionette_e10s.yml marionette-webapi: allowed_build_tasks: tasks/builds/b2g_emulator_x86_kk_opt.yml: diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml index cac4b809411c..8b44bdddfa89 100644 --- a/testing/taskcluster/tasks/branches/try/job_flags.yml +++ b/testing/taskcluster/tasks/branches/try/job_flags.yml @@ -180,6 +180,12 @@ tests: allowed_build_tasks: tasks/builds/b2g_emulator_x86_kk_opt.yml: task: tasks/tests/b2g_emulator_marionette.yml + tasks/builds/dbg_linux64_clobber.yml: + task: tasks/tests/fx_linux64_marionette.yml + marionette-e10s: + allowed_build_tasks: + tasks/builds/dbg_linux64_clobber.yml: + task: tasks/tests/fx_linux64_marionette_e10s.yml mochitest: allowed_build_tasks: tasks/builds/b2g_emulator_x86_l_opt.yml: diff --git a/testing/taskcluster/tasks/tests/fx_linux64_marionette_e10s.yml b/testing/taskcluster/tasks/tests/fx_linux64_marionette_e10s.yml new file mode 100644 index 000000000000..b6869e60b470 --- /dev/null +++ b/testing/taskcluster/tasks/tests/fx_linux64_marionette_e10s.yml @@ -0,0 +1,27 @@ +--- +$inherits: + from: 'tasks/tests/fx_desktop_generic.yml' +task: + payload: + command: + - --no-read-buildbot-config + - --installer-url={{build_url}} + - --test-packages-url={{test_packages_url}} + - --download-symbols=ondemand + - --e10s + env: + MOZHARNESS_SCRIPT: 'mozharness/scripts/marionette.py' + MOZHARNESS_CONFIG: > + mozharness/configs/marionette/prod_config.py + mozharness/configs/remove_executables.py + maxRunTime: 5400 + metadata: + name: '[TC] Linux64 marionette-e10s' + description: Marionette e10s unittest run + extra: + suite: + name: marionette + flavor: marionette + treeherder: + groupName: Desktop marionette e10s + symbol: Mn-e10s