Bug 1328618 - Use new tasklabels naming for test jobs

tests/seta/conftest.py

@@ -37,16 +37,16 @@ def runnable_jobs_data():
                 "ref_data_name": "OS X 10.7 {} build".format(repository_name),
             }, {
                 "build_system_type": "taskcluster",
-                "job_type_name": "desktop-test-linux32/opt-reftest-e10s-1",
+                "job_type_name": "test-linux32/opt-reftest-e10s-1",
                 "platform": "linux32",
                 "platform_option": "opt",
-                "ref_data_name": "desktop-test-linux32/opt-reftest-e10s-1",
+                "ref_data_name": "test-linux32/opt-reftest-e10s-1",
             }, {
                 "build_system_type": "taskcluster",
-                "job_type_name": "desktop-test-linux64/opt-reftest-e10s-2",
+                "job_type_name": "test-linux64/opt-reftest-e10s-2",
                 "platform": "linux64",
                 "platform_option": "opt",
-                "ref_data_name": "desktop-test-linux64/opt-reftest-e10s-2",
+                "ref_data_name": "test-linux64/opt-reftest-e10s-2",
             }
         ]
 

treeherder/etl/seta.py

@@ -19,7 +19,7 @@ class Treecodes:
         for job in RunnableJobsClient().query_runnable_jobs(repo_name)['results']:
             # e.g. web-platform-tests-4
             # e.g. Ubuntu VM 12.04 x64 mozilla-inbound opt test web-platform-tests-4 OR
-            #      desktop-test-linux64/opt-web-platform-tests-4
+            #      test-linux64/opt-web-platform-tests-4
             testtype = job_testtype(job)
             if self._ignore(testtype):
                 ignored_jobs.append(job['ref_data_name'])
@@ -83,18 +83,14 @@ def parse_testtype(build_system_type, job_type_name, platform_option, ref_data_n
         # opt test web-platform-tests-4"
         return ref_data_name.split(' ')[-1]
     else:
-        # The test name on TaskCluster comes to a sort of combination
-        # (e.g desktop-test-linux64/debug-jittests-3)
-
         # NOTE: Buildbot bridge tasks always have a Buildbot job associated to it. We will
         #       ignore any BBB task since we will be analyzing instead the Buildbot job associated
         #       to it. If BBB tasks were a production system and there was a technical advantage
         #       we could look into analyzing that instead of the BB job.
-        if ref_data_name.startswith('desktop-test') or \
-           ref_data_name.startswith('android-test'):
-            # we should get "jittests-3" as testtype for a job_type_name like
-            # desktop-test-linux64/debug-jittests-3
-            return transform(job_type_name.split('{buildtype}-'.format(buildtype=platform_option))[-1])
+        if ref_data_name.startswith('test-'):
+            # we should get "jittest-3" as testtype for a job_type_name like
+            # test-linux64/debug-jittest-3
+            return transform(job_type_name.split('-{buildtype}'.format(buildtype=platform_option))[-1])
 
 
 def transform(testtype):
@@ -130,6 +126,8 @@ def transform(testtype):
     testtype = testtype.replace('devtools-chrome-e10s', 'e10s-devtools-chrome')
     testtype = testtype.replace('[TC] Android 4.3 API15+ ', '')
 
+    # mochitest-gl-1 <-- Android 4.3 armv7 API 15+ mozilla-inbound opt test mochitest-gl-1
+    # mochitest-webgl-9  <-- test-android-4.3-arm7-api-15/opt-mochitest-webgl-9
     testtype = testtype.replace('webgl-', 'gl-')
 
     return testtype

treeherder/seta/job_priorities.py

@@ -30,7 +30,7 @@ def _ref_data_names(build_system):
         "buildplatform": "taskcluster",
         "buildtype": "opt",
         "platform": "linux64",
-        "ref_data_name": "desktop-test-linux64/opt-mochitest-webgl-e10s-1",
+        "ref_data_name": "test-linux64/opt-mochitest-webgl-e10s-1",
         "testtype": "mochitest-webgl-e10s-1",
     }
     '''