Enable headless ozone on main amd64-generic simplechrome bot.

And add a few test suites that need that arg to run.

Bug: 840967
Change-Id: I9954a08cc22f7237b0e0d2093214b544b6f3d897
Reviewed-on: https://chromium-review.googlesource.com/1162863Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581031}

testing/buildbot/chromium.chromiumos.json

@@ -6,6 +6,22 @@
       "chromiumos_preflight"
     ],
     "gtest_tests": [
+      {
+        "args": [
+          "--ozone-platform=headless"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "aura_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -58,6 +74,23 @@
         },
         "test": "cc_unittests"
       },
+      {
+        "args": [
+          "--dbus-stub",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.chromeos_unittests.filter"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "chromeos_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -191,6 +224,22 @@
         },
         "test": "mojo_unittests"
       },
+      {
+        "args": [
+          "--ozone-platform=headless"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "ozone_gl_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/chromium.fyi.json

@@ -2816,24 +2816,6 @@
       "chromiumos_preflight"
     ],
     "gtest_tests": [
-      {
-        "args": [
-          "--ozone-platform=headless"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "kvm": "1",
-              "os": "Ubuntu-14.04",
-              "pool": "Chrome-CrOS-VM"
-            }
-          ],
-          "hard_timeout": 3600,
-          "io_timeout": 3600
-        },
-        "test": "aura_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2909,24 +2891,6 @@
         },
         "test": "net_unittests"
       },
-      {
-        "args": [
-          "--ozone-platform=headless"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "kvm": "1",
-              "os": "Ubuntu-14.04",
-              "pool": "Chrome-CrOS-VM"
-            }
-          ],
-          "hard_timeout": 3600,
-          "io_timeout": 3600
-        },
-        "test": "ozone_gl_unittests"
-      },
       {
         "args": [
           "--vpython-dir=../../vpython_dir_linux_amd64",

testing/buildbot/test_suites.pyl

@@ -333,10 +333,22 @@
   },
 
   'chromeos_gtests': {
+    'aura_unittests': {
+      'args': [
+        '--ozone-platform=headless',
+      ],
+    },
     'base_unittests': {},
     'cacheinvalidation_unittests': {},
     'capture_unittests': {},
     'cc_unittests': {},
+    'chromeos_unittests': {
+      'args': [
+        # TODO(crbug.com/865693): Don't stub out dbus clients.
+        '--dbus-stub',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.chromeos_unittests.filter',
+      ],
+    },
     'cros_vm_sanity_test': {},
     'crypto_unittests': {},
     'display_unittests': {},
@@ -351,6 +363,11 @@
     },
     'midi_unittests': {},
     'mojo_unittests': {},
+    'ozone_gl_unittests': {
+      'args': [
+        '--ozone-platform=headless',
+      ],
+    },
     'ozone_unittests': {},
     'pdf_unittests': {},
     'printing_unittests': {},
@@ -360,11 +377,6 @@
   },
 
   'chromeos_gtests_experimental': {
-    'aura_unittests': {
-      'args': [
-        '--ozone-platform=headless',
-      ],
-    },
     'base_unittests': {},
     'chromeos_unittests': {
       'args': [
@@ -392,11 +404,6 @@
         'shards': 3,
       },
     },
-    'ozone_gl_unittests': {
-      'args': [
-        '--ozone-platform=headless',
-      ],
-    },
     'services_unittests': {
       'args': [
         '--vpython-dir=../../vpython_dir_linux_amd64',

tools/mb/mb_config.pyl

@@ -90,7 +90,7 @@
     'chromium.chromiumos': {
       'Linux ChromiumOS Full': 'chromeos_with_codecs_release_bot',
 
-      'chromeos-amd64-generic-rel': 'cros_chrome_sdk',
+      'chromeos-amd64-generic-rel': 'cros_chrome_sdk_headless_ozone',
       'chromeos-daisy-rel': 'cros_chrome_sdk',
       'linux-chromeos-rel': 'chromeos_with_codecs_release_bot',
       'linux-chromeos-dbg': 'chromeos_with_codecs_debug_bot',
@@ -552,7 +552,7 @@
     },
 
     'tryserver.chromium.chromiumos': {
-      'chromeos-amd64-generic-rel': 'cros_chrome_sdk',
+      'chromeos-amd64-generic-rel': 'cros_chrome_sdk_headless_ozone',
       'chromeos-daisy-rel': 'cros_chrome_sdk',
       'linux-chromeos-rel': 'chromeos_with_codecs_release_trybot',
       'linux-chromeos-compile-dbg': 'chromeos_with_codecs_debug_bot',
@@ -1150,6 +1150,10 @@
       'cros_chrome_sdk',
     ],
 
+    'cros_chrome_sdk_headless_ozone': [
+      'cros_chrome_sdk', 'ozone_platform_headless',
+    ],
+
     'cros_chrome_sdk_headless_ozone_dcheck_always_on': [
       'cros_chrome_sdk', 'ozone_platform_headless', 'dcheck_always_on',
     ],