Bug 1250737 - Update android mozharness 'chunked' handling, for jittest; r=bc

It turns out there are several places where the change to suite 'jittest-chunked'
causes problem. I am abandoning that approach.
Desktop uses this trick, and this returns android '-chunked' handling to a state
similar to what it was before I started messing around!

Differential Revision: https://phabricator.services.mozilla.com/D28897

--HG--
extra : moz-landing-system : lando

testing/mozharness/configs/android/android_common.py

@@ -243,7 +243,7 @@ config = {
             ],
             "tests": ["tests/testing/crashtest/crashtests.list",],
         },
-        "jittest-chunked": {
+        "jittest": {
             "run_filename": "jit_test.py",
             "testsdir": "jit-test/jit-test",
             "options": [

testing/mozharness/scripts/android_emulator_unittest.py

@@ -132,7 +132,10 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi
         self.test_packages_url = c.get('test_packages_url')
         self.test_manifest = c.get('test_manifest')
         self.robocop_path = os.path.join(abs_dirs['abs_work_dir'], "robocop.apk")
-        self.test_suite = c.get('test_suite')
+        suite = c.get('test_suite')
+        if suite and '-chunked' in suite:
+            suite = suite[:suite.index('-chunked')]
+        self.test_suite = suite
         self.this_chunk = c.get('this_chunk')
         self.total_chunks = c.get('total_chunks')
         self.xre_path = None

testing/mozharness/scripts/android_hardware_unittest.py

@@ -108,7 +108,10 @@ class AndroidHardwareTest(TestingMixin, BaseScript, MozbaseMixin,
         self.test_packages_url = c.get('test_packages_url')
         self.test_manifest = c.get('test_manifest')
         self.robocop_path = os.path.join(abs_dirs['abs_work_dir'], "robocop.apk")
-        self.test_suite = c.get('test_suite')
+        suite = c.get('test_suite')
+        if suite and '-chunked' in suite:
+            suite = suite[:suite.index('-chunked')]
+        self.test_suite = suite
         self.this_chunk = c.get('this_chunk')
         self.total_chunks = c.get('total_chunks')
         self.xre_path = None

tools/tryselect/test/test_mozharness_integration.py

@@ -23,7 +23,7 @@ MOZHARNESS_SCRIPTS = {
             'cppunittest',
             'gtest',
             'geckoview-junit',
-            'jittest-chunked',
+            'jittest',
             'jsreftest',
         ],
     },