crosperf: Update default_remotes to new DUTs

DUTs have been moved to different rows and racks. This updates the
default_remotes accordingly.

These devices are chosen by checking the swarming dimension setting
"label-pool=toolchain".

Additionally, this removes Lulu machines as they are no longer in
the toolchain pool.

BUG=b:178744715
TEST=Presubmit hooks

Change-Id: Ifefb6cb6d2dae58d3c27b55f3a39bccf2fd27eb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3252241
Commit-Queue: Jordan R Abrahams <ajordanr@google.com>
Tested-by: Jordan R Abrahams <ajordanr@google.com>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>

3 files changed, 33 insertions, 27 deletions

diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg
index d69d375b..5fccf3ac 100644
--- a/PRESUBMIT.cfg
+++ b/PRESUBMIT.cfg
@@ -1,2 +1,6 @@
 [Hook Scripts]
 toolchain_utils_presubmits = ./toolchain_utils_githooks/check-presubmit ${PRESUBMIT_FILES}
+
+[Hook Overrides Options]
+cros_license_check: --exclude_regex=\b(default_remotes)$
+long_line_check: --exclude_regex=\b(default_remotes)$
diff --git a/crosperf/default_remotes b/crosperf/default_remotes
index 45110752..1cc628f9 100644
--- a/crosperf/default_remotes
+++ b/crosperf/default_remotes
@@ -1,9 +1,8 @@
-bob           : chromeos2-row10-rack9-host3.cros chromeos6-row3-rack13-host15.cros
-chell         : chromeos2-row9-rack9-host1.cros   chromeos2-row9-rack9-host3.cros
-coral         : chromeos2-row9-rack9-host9.cros   chromeos2-row9-rack9-host11.cros   chromeos2-row9-rack9-host13.cros
+bob           : chromeos6-row4-rack13-host6.cros    chromeos6-row3-rack13-host15.cros
+chell         : chromeos2-row1-rack10-host2.cros    chromeos2-row1-rack10-host4.cros
+coral         : chromeos6-row5-rack6-host1.cros     chromeos6-row5-rack6-host3.cros    chromeos6-row5-rack6-host5.cros
 elm           : chromeos6-row14-rack15-host21.cros
-kefka         : chromeos6-row6-rack22-host2.cros  chromeos6-row6-rack22-host3.cros
-lulu          : chromeos2-row9-rack9-host5.cros chromeos2-row9-rack9-host7.cros
-nautilus      : chromeos2-row10-rack9-host9.cros  chromeos2-row10-rack9-host11.cros
-snappy        : chromeos2-row10-rack9-host5.cros chromeos2-row10-rack9-host7.cros
-veyron_tiger : chromeos2-row9-rack9-host17.cros
+kefka         : chromeos6-row6-rack22-host2.cros    chromeos6-row6-rack22-host3.cros   chromeos6-row11-rack22-host7.cros
+nautilus      : chromeos6-row5-rack10-host1.cros    chromeos6-row5-rack10-host3.cros
+snappy        : chromeos6-row3-rack20-host1.cros    chromeos6-row3-rack20-host3.cros
+veyron_tiger  : chromeos6-row3-rack7-host1.cros
diff --git a/crosperf/experiment_factory_unittest.py b/crosperf/experiment_factory_unittest.py
index 78cf780c..9637c108 100755
--- a/crosperf/experiment_factory_unittest.py
+++ b/crosperf/experiment_factory_unittest.py
@@ -79,14 +79,14 @@ EXPERIMENT_FILE_2 = """
 
 class ExperimentFactoryTest(unittest.TestCase):
   """Class for running experiment factory unittests."""
-
   def setUp(self):
     self.append_benchmark_call_args = []
 
   def testLoadExperimentFile1(self):
     experiment_file = ExperimentFile(io.StringIO(EXPERIMENT_FILE_1))
-    exp = ExperimentFactory().GetExperiment(
-        experiment_file, working_directory='', log_dir='')
+    exp = ExperimentFactory().GetExperiment(experiment_file,
+                                            working_directory='',
+                                            log_dir='')
     self.assertEqual(exp.remote, ['chromeos-alex3'])
 
     self.assertEqual(len(exp.benchmarks), 2)
@@ -104,8 +104,9 @@ class ExperimentFactoryTest(unittest.TestCase):
 
   def testLoadExperimentFile2CWP(self):
     experiment_file = ExperimentFile(io.StringIO(EXPERIMENT_FILE_2))
-    exp = ExperimentFactory().GetExperiment(
-        experiment_file, working_directory='', log_dir='')
+    exp = ExperimentFactory().GetExperiment(experiment_file,
+                                            working_directory='',
+                                            log_dir='')
     self.assertEqual(exp.cwp_dso, 'kallsyms')
     self.assertEqual(len(exp.benchmarks), 2)
     self.assertEqual(exp.benchmarks[0].weight, 0.8)
@@ -240,11 +241,12 @@ class ExperimentFactoryTest(unittest.TestCase):
     ef = ExperimentFactory()
 
     bench_list = []
-    ef.AppendBenchmarkSet(bench_list, experiment_factory.telemetry_perfv2_tests,
-                          '', 1, False, '', 'telemetry_Crosperf', False, 0,
-                          False, '', 0)
-    self.assertEqual(
-        len(bench_list), len(experiment_factory.telemetry_perfv2_tests))
+    ef.AppendBenchmarkSet(bench_list,
+                          experiment_factory.telemetry_perfv2_tests, '', 1,
+                          False, '', 'telemetry_Crosperf', False, 0, False, '',
+                          0)
+    self.assertEqual(len(bench_list),
+                     len(experiment_factory.telemetry_perfv2_tests))
     self.assertTrue(isinstance(bench_list[0], benchmark.Benchmark))
 
     bench_list = []
@@ -252,17 +254,17 @@ class ExperimentFactoryTest(unittest.TestCase):
                           experiment_factory.telemetry_pagecycler_tests, '', 1,
                           False, '', 'telemetry_Crosperf', False, 0, False, '',
                           0)
-    self.assertEqual(
-        len(bench_list), len(experiment_factory.telemetry_pagecycler_tests))
+    self.assertEqual(len(bench_list),
+                     len(experiment_factory.telemetry_pagecycler_tests))
     self.assertTrue(isinstance(bench_list[0], benchmark.Benchmark))
 
     bench_list = []
     ef.AppendBenchmarkSet(bench_list,
-                          experiment_factory.telemetry_toolchain_perf_tests, '',
-                          1, False, '', 'telemetry_Crosperf', False, 0, False,
-                          '', 0)
-    self.assertEqual(
-        len(bench_list), len(experiment_factory.telemetry_toolchain_perf_tests))
+                          experiment_factory.telemetry_toolchain_perf_tests,
+                          '', 1, False, '', 'telemetry_Crosperf', False, 0,
+                          False, '', 0)
+    self.assertEqual(len(bench_list),
+                     len(experiment_factory.telemetry_toolchain_perf_tests))
     self.assertTrue(isinstance(bench_list[0], benchmark.Benchmark))
 
   @mock.patch.object(socket, 'gethostname')
@@ -370,7 +372,8 @@ class ExperimentFactoryTest(unittest.TestCase):
     global_settings.SetField('same_machine', 'true')
     global_settings.SetField('same_specs', 'true')
 
-    self.assertRaises(Exception, ef.GetExperiment, mock_experiment_file, '', '')
+    self.assertRaises(Exception, ef.GetExperiment, mock_experiment_file, '',
+                      '')
     label_settings.SetField('remote', '')
     global_settings.SetField('remote', '123.45.67.89')
     exp = ef.GetExperiment(mock_experiment_file, '', '')
@@ -399,7 +402,7 @@ class ExperimentFactoryTest(unittest.TestCase):
 
   def test_get_default_remotes(self):
     board_list = [
-        'bob', 'chell', 'coral', 'elm', 'kefka', 'lulu', 'nautilus', 'snappy',
+        'bob', 'chell', 'coral', 'elm', 'kefka', 'nautilus', 'snappy',
         'veyron_tiger'
     ]