Reduce the chrome PFQ HWTests timeout.
We can't hold up all of the chrome's cycling for the tests,
especially when they may not even start. As a side effect
we can remove the special handling of the PaladinHWTest stage,
BUG=chromium-os:33552
TEST=unittests
Change-Id: Ic1d562fcd5131a1a4e6a057e936202a34b862ea8
Reviewed-on: https://gerrit.chromium.org/gerrit/30708
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Peter Mayo <petermayo@chromium.org>
Tested-by: Peter Mayo <petermayo@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 2067366..68109c5 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -383,11 +383,7 @@
# We can not run hw tests without archiving the payloads.
if self.options.archive:
for suite in config['hw_tests']:
- if cbuildbot_config.IsCQType(config['build_type']):
- stage_list.append([stages.PaladinHWTestStage, board, archive_stage,
- suite])
- else:
- stage_list.append([stages.HWTestStage, board, archive_stage, suite])
+ stage_list.append([stages.HWTestStage, board, archive_stage, suite])
for suite in config['async_hw_tests']:
stage_list.append([stages.ASyncHWTestStage, board, archive_stage,