diff options
| -rw-r--r-- | crosperf/README.md (renamed from crosperf/experiment_files/README.md) | 8 | ||||
| -rw-r--r-- | crosperf/default_remotes | 12 | ||||
| -rwxr-xr-x | crosperf/experiment_factory_unittest.py | 10 |
3 files changed, 16 insertions, 14 deletions
diff --git a/crosperf/experiment_files/README.md b/crosperf/README.md index 8c1fe200..18601b67 100644 --- a/crosperf/experiment_files/README.md +++ b/crosperf/README.md @@ -1,4 +1,4 @@ -# Experiment files +# experiment_files To use these experiment files, replace the board, remote and images placeholders and run crosperf on them. @@ -37,3 +37,9 @@ benchmark: page_cycler_v2.morejs { iterations: 1 } ``` + +# default_remotes + +This is the list of machines allocated for toolchain team. +This should be kept in sync with: +https://chromeos-swarming.appspot.com/botlist?c=id&c=task&c=label-board&c=label-pool&c=os&c=status&d=asc&f=label-pool%3Atoolchain&k=label-pool&s=id diff --git a/crosperf/default_remotes b/crosperf/default_remotes index 4aa2a1f6..ac4c3856 100644 --- a/crosperf/default_remotes +++ b/crosperf/default_remotes @@ -1,9 +1,9 @@ -bob : chromeos2-row10-rack9-host1.cros chromeos2-row10-rack9-host3.cros -coral : chromeos2-row9-rack9-host9.cros chromeos2-row9-rack9-host11.cros chromeos2-row9-rack9-host13.cros -elm : chromeos2-row10-rack9-host19.cros chromeos2-row10-rack9-host21.cros +bob : chromeos2-row10-rack9-host1.cros chromeos2-row10-rack9-host3.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 +elm : chromeos2-row10-rack9-host21.cros kefka : chromeos6-row6-rack22-host2.cros chromeos6-row6-rack22-host3.cros -lulu : chromeos2-row9-rack9-host5.cros chromeos2-row9-rack9-host7.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 chromeos2-row9-rack9-host19.cros +snappy : chromeos2-row10-rack9-host5.cros chromeos2-row10-rack9-host7.cros +veyron_tiger : chromeos2-row9-rack9-host17.cros diff --git a/crosperf/experiment_factory_unittest.py b/crosperf/experiment_factory_unittest.py index 53d28f74..78cf780c 100755 --- a/crosperf/experiment_factory_unittest.py +++ b/crosperf/experiment_factory_unittest.py @@ -399,21 +399,17 @@ class ExperimentFactoryTest(unittest.TestCase): def test_get_default_remotes(self): board_list = [ - 'elm', 'bob', 'chell', 'kefka', 'lulu', 'nautilus', 'snappy', + 'bob', 'chell', 'coral', 'elm', 'kefka', 'lulu', 'nautilus', 'snappy', 'veyron_tiger' ] ef = ExperimentFactory() self.assertRaises(Exception, ef.GetDefaultRemotes, 'bad-board') - # Verify that we have entries for every board, and that we get at least - # two machines for each board. + # Verify that we have entries for every board for b in board_list: remotes = ef.GetDefaultRemotes(b) - if b == 'daisy': - self.assertEqual(len(remotes), 1) - else: - self.assertGreaterEqual(len(remotes), 2) + self.assertGreaterEqual(len(remotes), 1) @mock.patch.object(command_executer.CommandExecuter, 'RunCommand') @mock.patch.object(os.path, 'exists') |