Bug 1096765 - Prevent 32bit talos other_nol64 being categorised as 64bit

tests/etl/test_buildbot.py

@@ -858,9 +858,9 @@ buildernames = [
                'group_symbol': 'T',
                'name': 'Talos other',
                'job_symbol': 'o'},
-      'platform': {'arch': 'x86_64',
+      'platform': {'arch': 'x86',
                    'os': 'linux',
-                   'os_platform': 'linux64',
+                   'os_platform': 'linux32',
                    'vm': False}}),
     ('Ubuntu HW 12.04 mozilla-central pgo talos g1',
     {'build_type': 'pgo',

treeherder/etl/buildbot.py

@@ -51,7 +51,7 @@ PLATFORMS_BUILDERNAME = [
         }
     },
     {
-        'regex': re.compile('(?:linux|ubuntu).*64|dxr', re.IGNORECASE),
+        'regex': re.compile('(?:linux|ubuntu).*64.+|dxr', re.IGNORECASE),
         'attributes': {
             'os': 'linux',
             'os_platform': 'linux64',