From b0997f96b214bd3b9c01312219e1395b56763048 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Thu, 30 Jun 2016 22:44:41 +0200 Subject: [PATCH] Bug 1283596 - Update firefox-ui-tests task template files for local and remote tests. r=garndt Firefox-ui functional tests which use local test data should report with the Tier-1 level. Due to restrictions of Tier-1 the other tests with remote test data have to be kept as Tier-2 jobs. The patches reorganize our hierarchy of templates accordingly. MozReview-Commit-ID: 9QcuYUzkvwf --HG-- extra : rebase_source : de0b2437fe047aa2e502d16ae477cd2f3b5b21f7 --- .../legacy/tasks/branches/base_job_flags.yml | 6 ++-- .../ci/legacy/tasks/branches/base_jobs.yml | 32 ++++++++++++++----- .../fx_linux64_firefox_ui_functional_e10s.yml | 27 ---------------- ...nal.yml => fx_linux64_fxui_functional.yml} | 2 -- .../fx_linux64_fxui_functional_local.yml | 17 ++++++++++ ... fx_linux64_fxui_functional_local_dbg.yml} | 2 +- .../fx_linux64_fxui_functional_local_e10s.yml | 13 ++++++++ ...inux64_fxui_functional_local_e10s_dbg.yml} | 2 +- ...inux64_fxui_functional_local_e10s_opt.yml} | 2 +- ... fx_linux64_fxui_functional_local_opt.yml} | 2 +- .../fx_linux64_fxui_functional_remote.yml | 18 +++++++++++ .../fx_linux64_fxui_functional_remote_dbg.yml | 7 ++++ ...fx_linux64_fxui_functional_remote_e10s.yml | 13 ++++++++ ...inux64_fxui_functional_remote_e10s_dbg.yml | 7 ++++ ...inux64_fxui_functional_remote_e10s_opt.yml | 7 ++++ .../fx_linux64_fxui_functional_remote_opt.yml | 7 ++++ 16 files changed, 121 insertions(+), 43 deletions(-) delete mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml rename taskcluster/ci/legacy/tasks/tests/{fx_linux64_firefox_ui_functional.yml => fx_linux64_fxui_functional.yml} (95%) create mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local.yml rename taskcluster/ci/legacy/tasks/tests/{fx_linux64_firefox_ui_functional_dbg.yml => fx_linux64_fxui_functional_local_dbg.yml} (56%) create mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s.yml rename taskcluster/ci/legacy/tasks/tests/{fx_linux64_firefox_ui_functional_e10s_dbg.yml => fx_linux64_fxui_functional_local_e10s_dbg.yml} (54%) rename taskcluster/ci/legacy/tasks/tests/{fx_linux64_firefox_ui_functional_e10s_opt.yml => fx_linux64_fxui_functional_local_e10s_opt.yml} (55%) rename taskcluster/ci/legacy/tasks/tests/{fx_linux64_firefox_ui_functional_opt.yml => fx_linux64_fxui_functional_local_opt.yml} (57%) create mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote.yml create mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_dbg.yml create mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s.yml create mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_dbg.yml create mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_opt.yml create mode 100644 taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_opt.yml diff --git a/taskcluster/ci/legacy/tasks/branches/base_job_flags.yml b/taskcluster/ci/legacy/tasks/branches/base_job_flags.yml index 40a7077a108d..497c148e3c94 100644 --- a/taskcluster/ci/legacy/tasks/branches/base_job_flags.yml +++ b/taskcluster/ci/legacy/tasks/branches/base_job_flags.yml @@ -34,8 +34,10 @@ flags: - crashtest - crashtest-e10s - external-media-tests - - firefox-ui-functional - - firefox-ui-functional-e10s + - firefox-ui-functional-local + - firefox-ui-functional-local-e10s + - firefox-ui-functional-remote + - firefox-ui-functional-remote-e10s - gaia-build - gaia-build-unit - gaia-js-integration diff --git a/taskcluster/ci/legacy/tasks/branches/base_jobs.yml b/taskcluster/ci/legacy/tasks/branches/base_jobs.yml index 9f03e1baf558..ba522d383b81 100644 --- a/taskcluster/ci/legacy/tasks/branches/base_jobs.yml +++ b/taskcluster/ci/legacy/tasks/branches/base_jobs.yml @@ -261,22 +261,38 @@ tests: task: tasks/tests/fx_linux64_external_media_tests_dbg.yml tasks/builds/opt_linux64_pgo.yml: task: tasks/tests/fx_linux64_external_media_tests_opt.yml - firefox-ui-functional: + firefox-ui-functional-local: allowed_build_tasks: tasks/builds/opt_linux64.yml: - task: tasks/tests/fx_linux64_firefox_ui_functional_opt.yml + task: tasks/tests/fx_linux64_fxui_functional_local_opt.yml tasks/builds/dbg_linux64.yml: - task: tasks/tests/fx_linux64_firefox_ui_functional_dbg.yml + task: tasks/tests/fx_linux64_fxui_functional_local_dbg.yml tasks/builds/opt_linux64_pgo.yml: - task: tasks/tests/fx_linux64_firefox_ui_functional_opt.yml - firefox-ui-functional-e10s: + task: tasks/tests/fx_linux64_fxui_functional_local_opt.yml + firefox-ui-functional-local-e10s: allowed_build_tasks: tasks/builds/opt_linux64.yml: - task: tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml + task: tasks/tests/fx_linux64_fxui_functional_local_e10s_opt.yml tasks/builds/dbg_linux64.yml: - task: tasks/tests/fx_linux64_firefox_ui_functional_e10s_dbg.yml + task: tasks/tests/fx_linux64_fxui_functional_local_e10s_dbg.yml tasks/builds/opt_linux64_pgo.yml: - task: tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml + task: tasks/tests/fx_linux64_fxui_functional_local_e10s_opt.yml + firefox-ui-functional-remote: + allowed_build_tasks: + tasks/builds/opt_linux64.yml: + task: tasks/tests/fx_linux64_fxui_functional_remote_opt.yml + tasks/builds/dbg_linux64.yml: + task: tasks/tests/fx_linux64_fxui_functional_remote_dbg.yml + tasks/builds/opt_linux64_pgo.yml: + task: tasks/tests/fx_linux64_fxui_functional_remote_opt.yml + firefox-ui-functional-remote-e10s: + allowed_build_tasks: + tasks/builds/opt_linux64.yml: + task: tasks/tests/fx_linux64_fxui_functional_remote_e10s_opt.yml + tasks/builds/dbg_linux64.yml: + task: tasks/tests/fx_linux64_fxui_functional_remote_e10s_dbg.yml + tasks/builds/opt_linux64_pgo.yml: + task: tasks/tests/fx_linux64_fxui_functional_remote_e10s_opt.yml gtest: allowed_build_tasks: tasks/builds/opt_linux64.yml: diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml deleted file mode 100644 index c33946f6d7eb..000000000000 --- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -$inherits: - from: 'tasks/tests/fx_docker_desktop_generic.yml' -task: - payload: - command: - - {"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}}"} - - --e10s - env: - MOZHARNESS_SCRIPT: 'mozharness/scripts/firefox_ui_tests/functional.py' - MOZHARNESS_CONFIG: > - mozharness/configs/firefox_ui_tests/taskcluster.py - mozharness/configs/remove_executables.py - maxRunTime: 5400 - metadata: - name: '[TC] Linux64 firefox-ui-tests functional e10s' - description: firefox-ui-tests functional e10s run - extra: - suite: - name: firefox-ui - flavor: functional - treeherder: - groupName: Desktop firefox-ui-tests - groupSymbol: tc-Fxfn-e10s - symbol: en-US - tier: 2 diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional.yml similarity index 95% rename from taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional.yml rename to taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional.yml index b557a05d1310..eee9f0fdc4fb 100644 --- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional.yml +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional.yml @@ -18,9 +18,7 @@ task: extra: suite: name: firefox-ui - flavor: functional treeherder: groupName: Desktop firefox-ui-tests groupSymbol: tc-Fxfn symbol: en-US - tier: 2 diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local.yml new file mode 100644 index 000000000000..50feb1db61dd --- /dev/null +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local.yml @@ -0,0 +1,17 @@ +--- +$inherits: + from: 'tasks/tests/fx_linux64_fxui_functional.yml' +task: + payload: + command: + - --tag local + metadata: + name: '[TC] Linux64 firefox-ui-tests functional local' + description: firefox-ui-tests functional local run + extra: + suite: + name: firefox-ui + flavor: functional local + treeherder: + groupName: Desktop firefox-ui-tests (local) + groupSymbol: tc-Fxfn-l diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_dbg.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_dbg.yml similarity index 56% rename from taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_dbg.yml rename to taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_dbg.yml index 883b1ab4e00f..4b6878993311 100644 --- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_dbg.yml +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_dbg.yml @@ -1,6 +1,6 @@ --- $inherits: - from: 'tasks/tests/fx_linux64_firefox_ui_functional.yml' + from: 'tasks/tests/fx_linux64_fxui_functional_local.yml' task: payload: command: diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s.yml new file mode 100644 index 000000000000..c12bda6a6fb5 --- /dev/null +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s.yml @@ -0,0 +1,13 @@ +--- +$inherits: + from: 'tasks/tests/fx_linux64_fxui_functional_local.yml' +task: + payload: + command: + - --e10s + metadata: + name: '[TC] Linux64 firefox-ui-tests functional local e10s' + description: firefox-ui-tests functional local e10s run + extra: + treeherder: + groupSymbol: tc-Fxfn-l-e10s diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_dbg.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_dbg.yml similarity index 54% rename from taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_dbg.yml rename to taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_dbg.yml index 6126fd31cc31..252893bb231b 100644 --- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_dbg.yml +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_dbg.yml @@ -1,6 +1,6 @@ --- $inherits: - from: 'tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml' + from: 'tasks/tests/fx_linux64_fxui_functional_local_e10s.yml' task: payload: command: diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_opt.yml similarity index 55% rename from taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml rename to taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_opt.yml index 1a76c5f2389a..62f190d112b4 100644 --- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_opt.yml @@ -1,6 +1,6 @@ --- $inherits: - from: 'tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml' + from: 'tasks/tests/fx_linux64_fxui_functional_local_e10s.yml' task: payload: command: diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_opt.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_opt.yml similarity index 57% rename from taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_opt.yml rename to taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_opt.yml index e09cc41fce91..c8c46d2a1655 100644 --- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_opt.yml +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_opt.yml @@ -1,6 +1,6 @@ --- $inherits: - from: 'tasks/tests/fx_linux64_firefox_ui_functional.yml' + from: 'tasks/tests/fx_linux64_fxui_functional_local.yml' task: payload: command: diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote.yml new file mode 100644 index 000000000000..42b8571e7e39 --- /dev/null +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote.yml @@ -0,0 +1,18 @@ +--- +$inherits: + from: 'tasks/tests/fx_linux64_fxui_functional.yml' +task: + payload: + command: + - --tag remote + metadata: + name: '[TC] Linux64 firefox-ui-tests functional remote' + description: firefox-ui-tests functional remote run + extra: + suite: + name: firefox-ui + flavor: functional remote + treeherder: + groupName: Desktop firefox-ui-tests (remote) + groupSymbol: tc-Fxfn-r + tier: 2 diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_dbg.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_dbg.yml new file mode 100644 index 000000000000..4ffc5841fd64 --- /dev/null +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_dbg.yml @@ -0,0 +1,7 @@ +--- +$inherits: + from: 'tasks/tests/fx_linux64_fxui_functional_remote.yml' +task: + payload: + command: + - --download-symbols=true diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s.yml new file mode 100644 index 000000000000..9f522b968afa --- /dev/null +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s.yml @@ -0,0 +1,13 @@ +--- +$inherits: + from: 'tasks/tests/fx_linux64_fxui_functional_remote.yml' +task: + payload: + command: + - --e10s + metadata: + name: '[TC] Linux64 firefox-ui-tests functional remote e10s' + description: firefox-ui-tests functional remote e10s run + extra: + treeherder: + groupSymbol: tc-Fxfn-r-e10s diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_dbg.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_dbg.yml new file mode 100644 index 000000000000..c783d8cf57b6 --- /dev/null +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_dbg.yml @@ -0,0 +1,7 @@ +--- +$inherits: + from: 'tasks/tests/fx_linux64_fxui_functional_remote_e10s.yml' +task: + payload: + command: + - --download-symbols=true diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_opt.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_opt.yml new file mode 100644 index 000000000000..8e0b2fefb231 --- /dev/null +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_opt.yml @@ -0,0 +1,7 @@ +--- +$inherits: + from: 'tasks/tests/fx_linux64_fxui_functional_remote_e10s.yml' +task: + payload: + command: + - --download-symbols=ondemand diff --git a/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_opt.yml b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_opt.yml new file mode 100644 index 000000000000..8a0e4bdd0cfc --- /dev/null +++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_opt.yml @@ -0,0 +1,7 @@ +--- +$inherits: + from: 'tasks/tests/fx_linux64_fxui_functional_remote.yml' +task: + payload: + command: + - --download-symbols=ondemand