Bug 1211253 - Remove the concept of a platform's VM status

It's calculated during ingestion, but not used and in fact not actually
stored anywhere.

tests/e2e/finished.json

@@ -9,8 +9,7 @@
     "machine_platform": {
         "platform": "2.2",
         "os_name": "android",
-        "architecture": "ARMv7",
-        "vm": false
+        "architecture": "ARMv7"
     },
     "reason": "scheduler",
     "result": 0,
@@ -19,8 +18,7 @@
     "build_platform": {
         "platform": "2.2",
         "os_name": "android",
-        "architecture": "ARMv7",
-        "vm": false
+        "architecture": "ARMv7"
     },
     "start_timestamp": 1370484722.0,
     "name": "xpcshell",

tests/e2e/pending.json

@@ -3,8 +3,7 @@
     "build_platform": {
         "platform": "2.2",
         "os_name": "android",
-        "architecture": "ARMv7",
-        "vm": false
+        "architecture": "ARMv7"
     },
     "submit_timestamp": 1370459521,
     "state": "pending",
@@ -18,8 +17,7 @@
     "machine_platform": {
         "platform": "2.2",
         "os_name": "android",
-        "architecture": "ARMv7",
-        "vm": false
+        "architecture": "ARMv7"
     }
 },
     "revision_hash": "0686a4d3fa477cb0415c9ca590177e4b03919b64",

tests/e2e/running.json

@@ -3,8 +3,7 @@
     "build_platform": {
         "platform": "2.2",
         "os_name": "android",
-        "architecture": "ARMv7",
-        "vm": false
+        "architecture": "ARMv7"
     },
     "submit_timestamp": 1370459521,
     "state": "running",
@@ -18,8 +17,7 @@
     "machine_platform": {
         "platform": "2.2",
         "os_name": "android",
-        "architecture": "ARMv7",
-        "vm": false
+        "architecture": "ARMv7"
     }
 },
     "revision_hash": "0686a4d3fa477cb0415c9ca590177e4b03919b64",

tests/model/derived/sample_data_generator.py

@@ -134,7 +134,6 @@ def build_platform(**kwargs):
         u"platform": u"WINNT5.1",
         u"os_name": u"win",
         u"architecture": u"x86",
-        u"vm": False
     }
 
     defaults.update(kwargs)
@@ -151,7 +150,6 @@ def machine_platform(**kwargs):
         u"platform": u"WINNT5.1",
         u"os_name": u"win",
         u"architecture": u"x86",
-        u"vm": False
     }
 
     defaults.update(kwargs)

tests/sample_data_generator.py

@@ -132,7 +132,6 @@ def build_platform(**kwargs):
         u"platform": u"WINNT5.1",
         u"os_name": u"win",
         u"architecture": u"x86",
-        u"vm": False
     }
 
     defaults.update(kwargs)
@@ -149,7 +148,6 @@ def machine_platform(**kwargs):
         u"platform": u"WINNT5.1",
         u"os_name": u"win",
         u"architecture": u"x86",
-        u"vm": False
     }
 
     defaults.update(kwargs)

tests/test_utils.py

@@ -325,14 +325,4 @@ def clean_job_blob_dict(job):
     except KeyError:
         pass  # no problem
 
-    # @@@ we don't keep track of VM'ness?
-    try:
-        del(job["machine_platform"]["vm"])
-    except KeyError:
-        pass  # no problem
-    try:
-        del(job["build_platform"]["vm"])
-    except KeyError:
-        pass  # no problem
-
     return job

treeherder/etl/buildapi.py

@@ -174,10 +174,7 @@ class Builds4hTransformerMixin(object):
                 'coalesced': []
             }
 
-            device_name = buildbot.get_device_or_unknown(
-                job_name_info.get('name', ''),
-                platform_info['vm']
-            )
+            device_name = buildbot.get_device_or_unknown(job_name_info.get('name', ''))
 
             log_reference = []
             if 'log_url' in prop:
@@ -361,10 +358,7 @@ class PendingRunningTransformerMixin(object):
                         # the others are for the requests that were coalesced into this one.
                         request_id = job['request_ids'][-1]
 
-                    device_name = buildbot.get_device_or_unknown(
-                        job_name_info.get('name', ''),
-                        platform_info['vm']
-                    )
+                    device_name = buildbot.get_device_or_unknown(job_name_info.get('name', ''))
 
                     new_job = {
                         'job_guid': common.generate_job_guid(
@@ -382,14 +376,12 @@ class PendingRunningTransformerMixin(object):
                             'os_name': platform_info['os'],
                             'platform': platform_info['os_platform'],
                             'architecture': platform_info['arch'],
-                            'vm': platform_info['vm']
                         },
                         # where are we going to get this data from?
                         'machine_platform': {
                             'os_name': platform_info['os'],
                             'platform': platform_info['os_platform'],
                             'architecture': platform_info['arch'],
-                            'vm': platform_info['vm']
                         },
                         'device_name': device_name,
                         'who': 'unknown',

treeherder/etl/buildbot.py

@@ -390,10 +390,6 @@ PLATFORMS_BUILDERNAME = [
     }
 ]
 
-VM_STATUS = [
-    re.compile(WORD_BOUNDARY_RE + r'vm' + WORD_BOUNDARY_RE, re.IGNORECASE)
-]
-
 BUILD_TYPE_BUILDERNAME = [
     {
         'type': 'pgo',
@@ -992,7 +988,6 @@ def extract_platform_info(source_string):
         'os': 'unknown',
         'os_platform': source_string[:24],
         'arch': 'unknown',
-        'vm': extract_vm_status(source_string)
     }
     for platform in PLATFORMS_BUILDERNAME:
         if platform['regex'].search(source_string):
@@ -1001,14 +996,6 @@ def extract_platform_info(source_string):
     return output
 
 
-def extract_vm_status(source_string):
-    vm = False
-    for regex in VM_STATUS:
-        if regex.search(source_string):
-            return True
-    return vm
-
-
 def extract_build_type(source_string):
     output = 'opt'
     for build_type in BUILD_TYPE_BUILDERNAME:
@@ -1073,14 +1060,12 @@ def get_symbol(name, bn):
     return "{0}{1}".format(s, n)
 
 
-def get_device_or_unknown(job_name, vm):
+def get_device_or_unknown(job_name):
     """
     retrieve the device name or unknown if no device is detected
     """
     position = job_name.find("Device")
     if position > 0:
         return job_name[0: position - 1]
-    elif vm is True:
-        return "vm"
     else:
         return "unknown"

treeherder/model/derived/jobs.py

@@ -900,14 +900,12 @@ into chunks of chunk_size size. Returns the number of result sets deleted"""
                     "build_platform": {
                         "platform": "Ubuntu VM 12.04",
                         "os_name": "linux",
-                        "architecture": "x86_64",
-                        "vm": true
+                        "architecture": "x86_64"
                     },
                     "machine_platform": {
                         "platform": "Ubuntu VM 12.04",
                         "os_name": "linux",
-                        "architecture": "x86_64",
-                        "vm": true
+                        "architecture": "x86_64"
                     },
                     "option_collection": {
                         "opt": true

treeherder/model/sql/template_schema/treeherder_reference_1.sql.tmpl

@@ -369,7 +369,7 @@ DROP TABLE IF EXISTS `device`;
  *
  * Example Data:
  *
- *  name - tarako | hamachi | inari | VM ...
+ *  name - tarako | hamachi | inari ...
  **************************/
 CREATE TABLE `device` (
   `id` integer NOT NULL AUTO_INCREMENT,