Bug 1545147 - Run remote agent's mochitests in a distinct "remote" job. r=ahal
authorAlexandre Poirot <poirot.alex@gmail.com>
Mon, 17 Jun 2019 13:57:03 +0000
changeset 479111 9890048a9f4ed06aeca614f55c7b2075f1938bba
parent 479110 1fabebb93947f6d501e7ee5566f7226c8a1993d9
child 479112 ef5cab0f3f37fc24ad6729113b10e5a7b05b9bcb
push id36169
push usercbrindusan@mozilla.com
push dateTue, 18 Jun 2019 21:46:19 +0000
treeherdermozilla-central@0dff9f803849 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1545147
milestone69.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 1545147 - Run remote agent's mochitests in a distinct "remote" job. r=ahal Differential Revision: https://phabricator.services.mozilla.com/D32028
remote/test/browser/browser.ini
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/test-sets.yml
testing/mozbase/moztest/moztest/resolve.py
testing/mozharness/configs/unittests/linux_unittest.py
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_unittest.py
testing/mozharness/mach_commands.py
testing/mozharness/mozharness/mozilla/testing/try_tools.py
tools/tryselect/selectors/syntax.py
--- a/remote/test/browser/browser.ini
+++ b/remote/test/browser/browser.ini
@@ -1,10 +1,11 @@
 [DEFAULT]
 tags = remote
+subsuite = remote
 prefs = remote.enabled=true
 support-files =
   chrome-remote-interface.js
   doc_page_frameNavigated.html
   head.js
 
 [browser_cdp.js]
 [browser_main_target.js]
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -501,8 +501,18 @@ mochitest-webgl2-deqp:
         by-test-platform:
             windows.*: 5400
             default: 3600
     # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
     allow-software-gl-layers: false
     mozharness:
         mochitest-flavor: plain
         chunked: true
+
+mochitest-remote:
+    description: "Mochitest for the remote agent (/remote folder)"
+    suite:
+        name: mochitest-remote
+    treeherder-symbol: M(remote)
+    loopback-video: true
+    max-run-time: 5400
+    mozharness:
+        mochitest-flavor: browser
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -30,16 +30,17 @@ common-tests:
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-gpu
     - mochitest-media
+    - mochitest-remote
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - reftest
     - reftest-no-accel
     - telemetry-tests-client
     - test-verify
     - test-verify-gpu
     - test-verify-wpt
@@ -245,16 +246,17 @@ windows-tests:
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-gpu
     - mochitest-media
+    - mochitest-remote
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
     - reftest
     - reftest-no-accel
     - telemetry-tests-client
     - test-verify
@@ -269,16 +271,17 @@ windows-aarch64-tests:
     - marionette
     - mochitest
     - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-gpu
     - mochitest-media
+    - mochitest-remote
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
     - reftest
     - web-platform-tests
     - web-platform-tests-reftests
     - xpcshell
@@ -319,16 +322,17 @@ macosx1014-64-tests:
     # - mochitest
     - mochitest-a11y
     # - mochitest-browser-chrome
     # - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-devtools-webreplay
     - mochitest-gpu
     # - mochitest-media
+    - mochitest-remote
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     # - mochitest-webgl2-core
     # - mochitest-webgl2-ext test  # timeouts
     - reftest
     - telemetry-tests-client
     - test-verify
     - test-verify-gpu
@@ -422,16 +426,19 @@ devtools-tests:
     - mochitest-devtools-chrome
 
 mochitest-headless:
     - mochitest-plain-headless
 
 marionette-headless:
     - marionette-headless
 
+remote-tests:
+    - mochitest-remote
+
 android-hw-arm7-opt-unittests:
     - mochitest-media
 
 android-hw-arm7-pgo-unittests:
     - jittest
     - jsreftest
     - mochitest-media
 
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -130,16 +130,23 @@ TEST_SUITES = {
     },
     'mochitest-plain-gpu': {
         'aliases': ('gpu',),
         'mach_command': 'mochitest',
         'kwargs': {'flavor': 'plain', 'subsuite': 'gpu', 'test_paths': None},
         'task_regex': ['mochitest-gpu($|.*(-1|[^0-9])$)',
                        'test-verify($|.*(-1|[^0-9])$)'],
     },
+    'mochitest-remote': {
+        'aliases': ('remote',),
+        'mach_command': 'mochitest',
+        'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'remote', 'test_paths': None},
+        'task_regex': ['mochitest-remote($|.*(-1|[^0-9])$)',
+                       'test-verify($|.*(-1|[^0-9])$)'],
+    },
     'mochitest-webgl1-core': WebglSuite('webgl1-core'),
     'mochitest-webgl1-ext': WebglSuite('webgl1-ext'),
     'mochitest-webgl2-core': WebglSuite('webgl2-core'),
     'mochitest-webgl2-ext': WebglSuite('webgl2-ext'),
     'mochitest-webgl2-deqp': WebglSuite('webgl2-deqp'),
     'python': {
         'mach_command': 'python-test',
         'kwargs': {'tests': None},
@@ -233,16 +240,17 @@ for i in range(1, MOCHITEST_TOTAL_CHUNKS
     'telemetry-tests-client': 'telemetry-tests-client',
     'web-platform-tests': 'web-platform-tests',
     'xpcshell': 'xpcshell',
 }
 
 _test_subsuites = {
     ('browser-chrome', 'devtools'): 'mochitest-devtools-chrome',
     ('browser-chrome', 'gpu'): 'mochitest-browser-chrome-gpu',
+    ('browser-chrome', 'remote'): 'mochitest-remote',
     ('browser-chrome', 'screenshots'): 'mochitest-browser-chrome-screenshots',
     ('chrome', 'gpu'): 'mochitest-chrome-gpu',
     ('mochitest', 'gpu'): 'mochitest-plain-gpu',
     ('mochitest', 'media'): 'mochitest-media',
     ('mochitest', 'robocop'): 'robocop',
     ('mochitest', 'webgl1-core'): 'mochitest-webgl1-core',
     ('mochitest', 'webgl1-ext'): 'mochitest-webgl1-ext',
     ('mochitest', 'webgl2-core'): 'mochitest-webgl2-core',
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -173,16 +173,17 @@ config = {
         "mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
         "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
         "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
         "mochitest-devtools-chrome-coverage": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime", "--timeout=1200"],
         "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"],
+        "mochitest-remote": ["--flavor=browser", "--subsuite=remote"],
     },
     # local reftest suites
     "all_reftest_suites": {
         "crashtest": {
             "options": ["--suite=crashtest"],
             "tests": ["tests/reftest/tests/testing/crashtest/crashtests.list"]
         },
         "jsreftest": {
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -137,16 +137,17 @@ config = {
         "mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
         "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
         "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
         "mochitest-devtools-chrome-webreplay": ["--flavor=browser", "--subsuite=devtools-webreplay"],
         "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"],
+        "mochitest-remote": ["--flavor=browser", "--subsuite=remote"],
     },
     # local reftest suites
     "all_reftest_suites": {
         "crashtest": {
             'options': ["--suite=crashtest"],
             'tests': ["tests/reftest/tests/testing/crashtest/crashtests.list"]
         },
         "jsreftest": {
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -159,16 +159,17 @@ config = {
         "mochitest-webgl1-core": ["--subsuite=webgl1-core"],
         "mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
         "mochitest-webgl2-core": ["--subsuite=webgl2-core"],
         "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"],
         "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
         "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
         "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"],
+        "mochitest-remote": ["--flavor=browser", "--subsuite=remote"],
     },
     # local reftest suites
     "all_reftest_suites": {
         "crashtest": {
             'options': ["--suite=crashtest"],
             'tests': ["tests/reftest/tests/testing/crashtest/crashtests.list"]
         },
         "jsreftest": {
--- a/testing/mozharness/mach_commands.py
+++ b/testing/mozharness/mach_commands.py
@@ -72,16 +72,21 @@ class MozharnessRunner(MozbuildObject):
                 "config": desktop_unittest_config + [
                     "--mochitest-suite", "browser-chrome"]
             },
             "mochitest-devtools-chrome": {
                 "script": "desktop_unittest.py",
                 "config": desktop_unittest_config + [
                     "--mochitest-suite", "mochitest-devtools-chrome"]
             },
+            "mochitest-remote": {
+                "script": "desktop_unittest.py",
+                "config": desktop_unittest_config + [
+                    "--mochitest-suite", "mochitest-remote"]
+            },
             "crashtest": {
                 "script": "desktop_unittest.py",
                 "config": desktop_unittest_config + [
                     "--reftest-suite", "crashtest"]
             },
             "jsreftest": {
                 "script": "desktop_unittest.py",
                 "config": desktop_unittest_config + [
--- a/testing/mozharness/mozharness/mozilla/testing/try_tools.py
+++ b/testing/mozharness/mozharness/mozilla/testing/try_tools.py
@@ -29,16 +29,19 @@ test_flavors = {
     'mochitest': {},
     'xpcshell': {},
     'reftest': {
         "path": lambda x: os.path.join("tests", "reftest", "tests", x)
     },
     'crashtest': {
         "path": lambda x: os.path.join("tests", "reftest", "tests", x)
     },
+    'remote': {
+        "path": lambda x: os.path.join("remote", "test", "browser", x)
+    },
     'web-platform-tests': {
         "path": lambda x: os.path.join("tests", x.split("testing" + os.path.sep)[1])
     },
     'web-platform-tests-reftests': {
         "path": lambda x: os.path.join("tests", x.split("testing" + os.path.sep)[1])
     },
     'web-platform-tests-wdspec': {
         "path": lambda x: os.path.join("tests", x.split("testing" + os.path.sep)[1])
--- a/tools/tryselect/selectors/syntax.py
+++ b/tools/tryselect/selectors/syntax.py
@@ -267,16 +267,17 @@ class AutoTry(object):
         'browser-chrome': ['mochitest-browser-chrome-1',
                            'mochitest-e10s-browser-chrome-1',
                            'mochitest-browser-chrome-e10s-1'],
         'devtools-chrome': ['mochitest-devtools-chrome-1',
                             'mochitest-e10s-devtools-chrome-1',
                             'mochitest-devtools-chrome-e10s-1'],
         'crashtest': ['crashtest', 'crashtest-e10s'],
         'reftest': ['reftest', 'reftest-e10s'],
+        'remote': ['mochitest-remote'],
         'web-platform-tests': ['web-platform-tests-1'],
     }
 
     flavor_suites = {
         "mochitest": "mochitests",
         "xpcshell": "xpcshell",
         "chrome": "mochitest-o",
         "browser-chrome": "mochitest-bc",