chromeos_config: Take lakitu out of brillo

Considering the direction that the Brillo project is going, Lakitu probably
doesn't fit in there any more. There are some recent Brillo related changes that
aren't applicable to Lakitu, e.g., chrome-os-partner:45210 that enabled HWTests
for all Brillo boards. Things like this will continue to happen so let's move
early before we find us in a difficult situation.

This change tries to keep the config delta as minimal as just to disable hwtests
for Lakitu, so the risk of breakage is very low.

BUG=chromium:550601
TEST=cbuildbot/runtest cbuildbot/chromeos_config_unittest and compare the
generated config_dump.json with unchanged one.

Change-Id: I45613b70332f089af347b93916d40bd73fcfc5ef
Reviewed-on: https://chromium-review.googlesource.com/311440
Commit-Ready: Daniel Wang <wonderfly@google.com>
Tested-by: Daniel Wang <wonderfly@google.com>
Reviewed-by: Amey Deshpande <ameyd@google.com>
diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 2fc2578..f42c76d 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -499,15 +499,18 @@
     'arkham',
     'gizmo',
     'kayle',
-    'lakitu',
-    'lakitu_mobbuild',
-    'lakitu_next',
     'panther_embedded',
     'purin',
     'storm',
     'whirlwind',
 ])
 
+_lakitu_boards = frozenset([
+    'lakitu',
+    'lakitu_mobbuild',
+    'lakitu_next',
+])
+
 _moblab_boards = frozenset([
     'stumpy_moblab',
     'panther_moblab',
@@ -527,42 +530,26 @@
     'x32-generic',
 ])
 
-_noimagetest_boards = frozenset([
-    'lakitu',
-    'lakitu_mobbuild',
-    'lakitu_next',
-])
+_noimagetest_boards = _lakitu_boards
 
-_nohwqual_boards = frozenset([
+_nohwqual_boards = _lakitu_boards | frozenset([
     'kayle',
-    'lakitu',
-    'lakitu_mobbuild',
-    'lakitu_next',
 ])
 
 _norootfs_verification_boards = frozenset([
 ])
 
-_base_layout_boards = frozenset([
-    'lakitu',
-    'lakitu_mobbuild',
-    'lakitu_next',
-])
+_base_layout_boards = _lakitu_boards
 
 _no_unittest_boards = frozenset((
 ))
 
-_upload_gce_images_boards = frozenset([
-    'lakitu',
-    'lakitu_mobbuild',
-    'lakitu_next',
-])
+_upload_gce_images_boards = _lakitu_boards
 
 _no_vmtest_boards = _arm_boards | _brillo_boards | frozenset((
     'cyan-cheets',
 ))
 
-
 # This is a list of configs that should be included on the main waterfall, but
 # aren't included by default (see IsDefaultMainWaterfall). This loosely
 # corresponds to the set of experimental or self-standing configs.
@@ -902,6 +889,16 @@
       vm_tests=[],
   )
 
+  lakitu = config_lib.BuildConfig(
+      sync_chrome=False,
+      chrome_sdk=False,
+      afdo_use=False,
+      dev_installer_prebuilts=False,
+      vm_tests=[],
+      vm_tests_override=None,
+      hw_tests=[],
+  )
+
   moblab = config_lib.BuildConfig(
       image_test=False,
       vm_tests=[],
@@ -1068,6 +1065,8 @@
         base.update(manifest=constants.OFFICIAL_MANIFEST)
       if board in _brillo_boards:
         base.update(brillo)
+      if board in _lakitu_boards:
+        base.update(lakitu)
       if board in _moblab_boards:
         base.update(moblab)
       if board in _minimal_profile_boards:
@@ -1301,7 +1300,6 @@
       trybot_list=True,
   )
 
-
   site_config.AddConfig(
       tot_asan_info, 'amd64-generic-tot-asan-informational',
       boards=['amd64-generic'],
@@ -1376,7 +1374,6 @@
   _CreateConfigsForBoards(chrome_perf, _chrome_perf_boards, 'chrome-perf',
                           trybot_list=True)
 
-
   _CreateConfigsForBoards(chromium_info,
                           ['x86-generic', 'amd64-generic'],
                           'telem-chromium-pfq-informational',
@@ -1764,10 +1761,8 @@
           customizations,
           base_config)
 
-
   _CreatePaladinConfigs()
 
-
   site_config.AddConfig(
       internal_paladin, 'lumpy-incremental-paladin',
       boards=['lumpy'],
@@ -1777,8 +1772,8 @@
       unittests=False,
   )
 
-  ### Paladins (CQ builders) which do not run VM or Unit tests on the builder
-  ### itself.
+  # Paladins (CQ builders) which do not run VM or Unit tests on the builder
+  # itself.
   external_brillo_paladin = paladin.derive(brillo)
 
   site_config.AddConfig(
@@ -1840,7 +1835,6 @@
 
   # Add a pre-cq config for every board.
   _CreateConfigsForBoards(pre_cq, _all_boards, 'pre-cq')
-  # Override 'lakitu-pre-cq' - it's in _brillo_boards, but should run vmtests.
   site_config.AddConfig(
       pre_cq, 'lakitu-pre-cq',
       _base_configs['lakitu'],
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 4eb2045..b44a4ac 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -9847,6 +9847,7 @@
         "chrome_sdk": false,
         "dev_installer_prebuilts": false,
         "disk_layout": "base",
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "important": true,
@@ -10025,6 +10026,7 @@
         "chrome_sdk": false,
         "dev_installer_prebuilts": false,
         "disk_layout": "base",
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "important": true,
@@ -10224,6 +10226,7 @@
         "chrome_sdk": false,
         "dev_installer_prebuilts": false,
         "disk_layout": "base",
+        "hw_tests": [],
         "hwqual": false,
         "image_test": false,
         "signer_tests": false,