Bug 1269872 - add config to support gpu and clipboard jobs. r=armenzg
authorJoel Maher <jmaher@mozilla.com>
Tue, 24 May 2016 11:35:21 -0400
changeset 337796 1355a79b416c35663efe4a989b8a63e605b9bfbd
parent 337795 7d77ceeacfa6f625623f49cca04270e9e9a4b282
child 337797 f3dc1af5b3f0e55c286fd3388e620a193fdde8da
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarmenzg
bugs1269872
milestone49.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 1269872 - add config to support gpu and clipboard jobs. r=armenzg MozReview-Commit-ID: IPAlB0eAckD
testing/mozharness/configs/android/androidarm_4_3.py
testing/mozharness/configs/unittests/linux_unittest.py
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_unittest.py
testing/mozharness/mozharness/mozilla/testing/errors.py
testing/mozharness/mozharness/mozilla/testing/testbase.py
--- a/testing/mozharness/configs/android/androidarm_4_3.py
+++ b/testing/mozharness/configs/android/androidarm_4_3.py
@@ -97,16 +97,56 @@ config = {
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
                 "--log-errorsummary=%(error_summary_file)s",
                 "--screenshot-on-fail",
                 "--total-chunks=10",
                 "--subsuite=webgl",
             ],
         },
+        "mochitest-plain-gpu": {
+            "run_filename": "runtestsremote.py",
+            "testsdir": "mochitest",
+            "options": [
+                "--dm_trans=adb",
+                "--app=%(app)s",
+                "--remote-webserver=%(remote_webserver)s",
+                "--xre-path=%(xre_path)s",
+                "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
+                "--certificate-path=%(certs_path)s",
+                "--symbols-path=%(symbols_path)s",
+                "--quiet",
+                "--log-raw=%(raw_log_file)s",
+                "--log-errorsummary=%(error_summary_file)s",
+                "--screenshot-on-fail",
+                "--subsuite=gpu",
+            ],
+        },
+        "mochitest-plain-clipboard": {
+            "run_filename": "runtestsremote.py",
+            "testsdir": "mochitest",
+            "options": [
+                "--dm_trans=adb",
+                "--app=%(app)s",
+                "--remote-webserver=%(remote_webserver)s",
+                "--xre-path=%(xre_path)s",
+                "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
+                "--certificate-path=%(certs_path)s",
+                "--symbols-path=%(symbols_path)s",
+                "--quiet",
+                "--log-raw=%(raw_log_file)s",
+                "--log-errorsummary=%(error_summary_file)s",
+                "--screenshot-on-fail",
+                "--subsuite=clipboard",
+            ],
+        },
         "mochitest-media": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": [
                 "--dm_trans=adb",
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
@@ -480,16 +520,24 @@ config = {
         "mochitest-media-1": {
             "category": "mochitest-media",
             "extra_args": ["--this-chunk=1"],
         },
         "mochitest-media-2": {
             "category": "mochitest-media",
             "extra_args": ["--this-chunk=2"],
         },
+        "mochitest-plain-gpu": {
+            "category": "mochitest-plain-gpu",
+            "extra_args": [],
+        },
+        "mochitest-plain-clipboard": {
+            "category": "mochitest-plain-clipboard",
+            "extra_args": [],
+        },
         "mochitest-gl-1": {
             "category": "mochitest-gl",
             "extra_args": ["--this-chunk=1"],
         },
         "mochitest-gl-2": {
             "category": "mochitest-gl",
             "extra_args": ["--this-chunk=2"],
         },
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -186,30 +186,37 @@ config = {
         },
     },
     # local mochi suites
     "all_mochitest_suites": {
         "valgrind-plain": ["--valgrind=/usr/bin/valgrind",
                            "--valgrind-supp-files=" + VALGRIND_SUPP_ARCH +
                                "," + VALGRIND_SUPP_CROSS_ARCH,
                            "--timeout=900", "--max-timeouts=50"],
-         "plain": [],
+        "plain": [],
+        "plain-gpu": ["--subsuite=gpu"],
+        "plain-clipboard": ["--subsuite=clipboard"],
         "plain-chunked": ["--chunk-by-dir=4"],
         "mochitest-media": ["--subsuite=media"],
         "chrome": ["--chrome"],
+        "chrome-gpu": ["--chrome", "--subsuite=gpu"],
+        "chrome-clipboard": ["--chrome", "--subsuite=clipboard"],
         "chrome-chunked": ["--chrome", "--chunk-by-dir=4"],
         "browser-chrome": ["--browser-chrome"],
+        "browser-chrome-gpu": ["--browser-chrome", "--subsuite=gpu"],
+        "browser-chrome-clipboard": ["--browser-chrome", "--subsuite=clipboard"],
         "browser-chrome-chunked": ["--browser-chrome", "--chunk-by-runtime"],
         "browser-chrome-addons": ["--browser-chrome", "--chunk-by-runtime", "--tag=addons"],
         "browser-chrome-coverage": ["--browser-chrome", "--chunk-by-runtime", "--timeout=1200"],
         "browser-chrome-screenshots": ["--browser-chrome", "--subsuite=screenshots"],
         "mochitest-gl": ["--subsuite=webgl"],
         "mochitest-devtools-chrome": ["--browser-chrome", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--browser-chrome", "--subsuite=devtools", "--chunk-by-runtime"],
         "jetpack-package": ["--jetpack-package"],
+        "jetpack-package-clipboard": ["--jetpack-package", "--subsuite=clipboard"],
         "jetpack-addon": ["--jetpack-addon"],
         "a11y": ["--a11y"],
     },
     # local reftest suites
     "all_reftest_suites": {
         "reftest": {
             "options": ["--suite=reftest"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -135,28 +135,35 @@ config = {
                 "%(binary_path)s",
             ],
             "run_filename": "rungtests.py",
         },
     },
     # local mochi suites
     "all_mochitest_suites": {
         "plain": [],
+        "plain-gpu": ["--subsuite=gpu"],
+        "plain-clipboard": ["--subsuite=clipboard"],
         "plain-chunked": ["--chunk-by-dir=4"],
         "mochitest-media": ["--subsuite=media"],
         "chrome": ["--chrome"],
+        "chrome-gpu": ["--chrome", "--subsuite=gpu"],
+        "chrome-clipboard": ["--chrome", "--subsuite=clipboard"],
         "chrome-chunked": ["--chrome", "--chunk-by-dir=4"],
         "browser-chrome": ["--browser-chrome"],
+        "browser-chrome-gpu": ["--browser-chrome", "--subsuite=gpu"],
+        "browser-chrome-clipboard": ["--browser-chrome", "--subsuite=clipboard"],
         "browser-chrome-chunked": ["--browser-chrome", "--chunk-by-runtime"],
         "browser-chrome-addons": ["--browser-chrome", "--chunk-by-runtime", "--tag=addons"],
         "browser-chrome-screenshots": ["--browser-chrome", "--subsuite=screenshots"],
         "mochitest-gl": ["--subsuite=webgl"],
         "mochitest-devtools-chrome": ["--browser-chrome", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--browser-chrome", "--subsuite=devtools", "--chunk-by-runtime"],
         "jetpack-package": ["--jetpack-package"],
+        "jetpack-package-clipboard": ["--jetpack-package", "--subsuite=clipboard"],
         "jetpack-addon": ["--jetpack-addon"],
         "a11y": ["--a11y"],
     },
     # local reftest suites
     "all_reftest_suites": {
         "reftest": {
             'options': ["--suite=reftest"],
             'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -149,29 +149,36 @@ config = {
             ],
             "run_filename": "rungtests.py",
         },
     },
     # local mochi suites
     "all_mochitest_suites":
     {
         "plain": [],
+        "plain-gpu": ["--subsuite=gpu"],
+        "plain-clipboard": ["--subsuite=clipboard"],
         "plain-chunked": ["--chunk-by-dir=4"],
         "mochitest-media": ["--subsuite=media"],
         "chrome": ["--chrome"],
+        "chrome-gpu": ["--chrome", "--subsuite=gpu"],
+        "chrome-clipboard": ["--chrome", "--subsuite=clipboard"],
         "chrome-chunked": ["--chrome", "--chunk-by-dir=4"],
         "browser-chrome": ["--browser-chrome"],
+        "browser-chrome-gpu": ["--browser-chrome", "--subsuite=gpu"],
+        "browser-chrome-clipboard": ["--browser-chrome", "--subsuite=clipboard"],
         "browser-chrome-chunked": ["--browser-chrome", "--chunk-by-runtime"],
         "browser-chrome-addons": ["--browser-chrome", "--chunk-by-runtime", "--tag=addons"],
         "browser-chrome-screenshots": ["--browser-chrome", "--subsuite=screenshots"],
         "mochitest-gl": ["--subsuite=webgl"],
         "mochitest-devtools-chrome": ["--browser-chrome", "--subsuite=devtools"],
         "mochitest-devtools-chrome-chunked": ["--browser-chrome", "--subsuite=devtools", "--chunk-by-runtime"],
         "mochitest-metro-chrome": ["--browser-chrome", "--metro-immersive"],
         "jetpack-package": ["--jetpack-package"],
+        "jetpack-package-clipboard": ["--jetpack-package", "--subsuite=clipboard"],
         "jetpack-addon": ["--jetpack-addon"],
         "a11y": ["--a11y"],
     },
     # local reftest suites
     "all_reftest_suites": {
         "reftest": {
             'options': ["--suite=reftest"],
             'tests': ["tests/reftest/tests/layout/reftests/reftest.list"]
--- a/testing/mozharness/mozharness/mozilla/testing/errors.py
+++ b/testing/mozharness/mozharness/mozilla/testing/errors.py
@@ -24,16 +24,18 @@ from mozharness.base.log import INFO, WA
     'fail_group': "Failed",
     'known_fail_group': "Todo",
 }
 
 TinderBoxPrintRe = {
     "mochitest_summary": _mochitest_summary,
     "mochitest-gl_summary": _mochitest_summary,
     "mochitest-media_summary": _mochitest_summary,
+    "mochitest-plain-clipboard_summary": _mochitest_summary,
+    "mochitest-plain-gpu_summary": _mochitest_summary,
     "reftest_summary": {
         'regex': re.compile(r'''REFTEST INFO \| (Successful|Unexpected|Known problems): (\d+) \('''),
         'pass_group': "Successful",
         'fail_group': "Unexpected",
         'known_fail_group': "Known problems",
     },
     "crashtest_summary": {
         'regex': re.compile(r'''REFTEST INFO \| (Successful|Unexpected|Known problems): (\d+) \('''),
--- a/testing/mozharness/mozharness/mozilla/testing/testbase.py
+++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py
@@ -432,16 +432,18 @@ 2. running via buildbot and running the 
     def _download_test_packages(self, suite_categories, target_unzip_dirs):
         # Some platforms define more suite categories/names than others.
         # This is a difference in the convention of the configs more than
         # to how these tests are run, so we pave over these differences here.
         aliases = {
             'robocop': 'mochitest',
             'mochitest-chrome': 'mochitest',
             'mochitest-media': 'mochitest',
+            'mochitest-plain-clipboard': 'mochitest',
+            'mochitest-plain-gpu': 'mochitest',
             'mochitest-gl': 'mochitest',
             'jsreftest': 'reftest',
             'crashtest': 'reftest',
             'reftest-debug': 'reftest',
             'jsreftest-debug': 'reftest',
             'crashtest-debug': 'reftest',
         }
         suite_categories = [aliases.get(name, name) for name in suite_categories]