Bug 1283596 - Update firefox-ui-tests task template files for local and remote tests. r=garndt
☠☠ backed out by 0ed118774084 ☠ ☠
authorHenrik Skupin <mail@hskupin.info>
Thu, 30 Jun 2016 22:44:41 +0200
changeset 303662 aaf789f8f36624d8a765d63cc1d9ba6fd56e36e9
parent 303661 7b33d4c571ee8fa3aa110b41f126394634b6622e
child 303663 b52d27f7628fd1ba34395eed42f7e00988fb9790
push id79141
push usercbook@mozilla.com
push dateTue, 05 Jul 2016 14:07:42 +0000
treeherdermozilla-inbound@f08c54971dd1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgarndt
bugs1283596
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
taskcluster/ci/legacy/tasks/branches/base_job_flags.yml
taskcluster/ci/legacy/tasks/branches/base_jobs.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_dbg.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_dbg.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_opt.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_dbg.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_dbg.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_opt.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_opt.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_dbg.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_dbg.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_e10s_opt.yml
taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_remote_opt.yml
--- a/taskcluster/ci/legacy/tasks/branches/base_job_flags.yml
+++ b/taskcluster/ci/legacy/tasks/branches/base_job_flags.yml
@@ -30,18 +30,20 @@ flags:
     - macosx64
     - macosx64-st-an
 
   tests:
     - cppunit
     - 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
     - gaia-linter
     - gaia-unit
     - gaia-unit-oop
     - gtest
     - jittests
--- a/taskcluster/ci/legacy/tasks/branches/base_jobs.yml
+++ b/taskcluster/ci/legacy/tasks/branches/base_jobs.yml
@@ -256,32 +256,48 @@ tests:
   external-media-tests:
     allowed_build_tasks:
       tasks/builds/opt_linux64.yml:
         task: tasks/tests/fx_linux64_external_media_tests_opt.yml
       tasks/builds/dbg_linux64.yml:
         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_fxui_functional_local_opt.yml
+      tasks/builds/dbg_linux64.yml:
+        task: tasks/tests/fx_linux64_fxui_functional_local_dbg.yml
+      tasks/builds/opt_linux64_pgo.yml:
+        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_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_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_opt.yml
-  firefox-ui-functional-e10s:
+        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_firefox_ui_functional_e10s_opt.yml
+        task: tasks/tests/fx_linux64_fxui_functional_remote_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_remote_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_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:
         task: tasks/tests/fx_linux64_gtest_opt.yml
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_gtest_dbg.yml
       tasks/builds/opt_linux64_pgo.yml:
         task: tasks/tests/fx_linux64_gtest_opt.yml
deleted file mode 100644
--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional.yml
+++ /dev/null
@@ -1,26 +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}}"}
-    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'
-    description: firefox-ui-tests functional run
-  extra:
-    suite:
-      name: firefox-ui
-      flavor: functional
-    treeherder:
-      groupName: Desktop firefox-ui-tests
-      groupSymbol: tc-Fxfn
-      symbol: en-US
-      tier: 2
deleted file mode 100644
--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_dbg.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_linux64_firefox_ui_functional.yml'
-task:
-  payload:
-    command:
-      - --download-symbols=true
deleted file mode 100644
--- 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
deleted file mode 100644
--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_dbg.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml'
-task:
-  payload:
-    command:
-      - --download-symbols=true
deleted file mode 100644
--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_e10s_opt.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_linux64_firefox_ui_functional_e10s.yml'
-task:
-  payload:
-    command:
-      - --download-symbols=ondemand
deleted file mode 100644
--- a/taskcluster/ci/legacy/tasks/tests/fx_linux64_firefox_ui_functional_opt.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_linux64_firefox_ui_functional.yml'
-task:
-  payload:
-    command:
-      - --download-symbols=ondemand
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional.yml
@@ -0,0 +1,24 @@
+---
+$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}}"}
+    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'
+    description: firefox-ui-tests functional run
+  extra:
+    suite:
+      name: firefox-ui
+    treeherder:
+      groupName: Desktop firefox-ui-tests
+      groupSymbol: tc-Fxfn
+      symbol: en-US
new file mode 100644
--- /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
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_fxui_functional_local.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
new file mode 100644
--- /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
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_dbg.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_fxui_functional_local_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=true
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_e10s_opt.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_fxui_functional_local_e10s.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=ondemand
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/legacy/tasks/tests/fx_linux64_fxui_functional_local_opt.yml
@@ -0,0 +1,7 @@
+---
+$inherits:
+  from: 'tasks/tests/fx_linux64_fxui_functional_local.yml'
+task:
+  payload:
+    command:
+      - --download-symbols=ondemand
new file mode 100644
--- /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
new file mode 100644
--- /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
new file mode 100644
--- /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
new file mode 100644
--- /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
new file mode 100644
--- /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
new file mode 100644
--- /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