[cbuildbot] Make toolchain bots run their tests synchronously.
This CL updates the toolchain waterfall buildbots to run their
HWTest phases synchronously (so failures are visible in the build).
It also increases their timeout significantly to allow for this, and
for the recently added oak board.
BUG=chromium:622459
TEST=ran 'run_tests'
Change-Id: I76b40c6fca1456538d9a82b8fdcffe57f3ce8b1c
Reviewed-on: https://chromium-review.googlesource.com/355190
Commit-Ready: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Luis Lozano <llozano@chromium.org>
diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 8570c89..8dd0728 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -317,7 +317,8 @@
@classmethod
def ToolchainTest(cls, **kwargs):
"""Return a list of HWTESTConfigs which run toolchain correctness tests."""
- default_dict = dict(pool=constants.HWTEST_MACH_POOL, file_bugs=False,
+ default_dict = dict(pool=constants.HWTEST_MACH_POOL, async=False,
+ file_bugs=False,
priority=constants.HWTEST_DEFAULT_PRIORITY)
default_dict.update(kwargs)
return [config_lib.HWTestConfig(constants.HWTEST_BVT_SUITE,
@@ -2146,7 +2147,7 @@
internal,
default_hw_tests_override,
build_type=constants.TOOLCHAIN_TYPE,
- build_timeout=(9 * 60 + 50) * 60,
+ build_timeout=(15 * 60 + 50) * 60,
useflags=append_useflags(['-cros-debug']),
afdo_use=True,
manifest=constants.OFFICIAL_MANIFEST,
@@ -2164,7 +2165,7 @@
vm_tests=[config_lib.VMTestConfig(constants.SMOKE_SUITE_TEST_TYPE),
config_lib.VMTestConfig(constants.DEV_MODE_TEST_TYPE),
config_lib.VMTestConfig(constants.CROS_VM_TEST_TYPE)],
- hw_tests=HWTestList.SharedPoolCanary(),
+ hw_tests=HWTestList.ToolchainTest(),
paygen=True,
signer_tests=True,
trybot_list=True,
diff --git a/cbuildbot/chromeos_config_unittest.py b/cbuildbot/chromeos_config_unittest.py
index 26e0fe1..b288bfab 100644
--- a/cbuildbot/chromeos_config_unittest.py
+++ b/cbuildbot/chromeos_config_unittest.py
@@ -749,7 +749,7 @@
else:
expected = 12 * 60 * 60
elif config.build_type == constants.TOOLCHAIN_TYPE:
- expected = (9 * 60 + 50) * 60
+ expected = (15 * 60 + 50) * 60
else:
expected = (4 * 60 + 30) * 60
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 37f7e84..f791d0a 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -790,7 +790,7 @@
"binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
"binhost_bucket": "gs://chromeos-dev-installer",
"binhost_key": "RELEASE_BINHOST",
- "build_timeout": 35400,
+ "build_timeout": 57000,
"build_type": "toolchain",
"chrome_sdk": true,
"chromeos_official": true,
@@ -893,7 +893,7 @@
"binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
"binhost_bucket": "gs://chromeos-dev-installer",
"binhost_key": "RELEASE_BINHOST",
- "build_timeout": 35400,
+ "build_timeout": 57000,
"build_type": "toolchain",
"chrome_sdk": true,
"chromeos_official": true,
@@ -1395,7 +1395,7 @@
"binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",
"binhost_bucket": "gs://chromeos-dev-installer",
"binhost_key": "RELEASE_BINHOST",
- "build_timeout": 35400,
+ "build_timeout": 57000,
"build_type": "toolchain",
"chrome_sdk": true,
"chromeos_official": true,
@@ -1404,11 +1404,13 @@
"doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Continuous",
"git_sync": false,
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 10,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"Build\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"Build\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 6,\n \"timeout\": 7200,\n \"warn_only\": false\n}",
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 2,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"au\",\n \"suite_min_duts\": 6,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 2,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PostBuild\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
- "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": true,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 2,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"PostBuild\",\n \"retry\": true,\n \"suite\": \"bvt-perbuild\",\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"toolchain-tests\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"paygen_au_canary\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"security\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_regression\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"DEFAULT\",\n \"retry\": true,\n \"suite\": \"kernel_daily_benchmarks\",\n \"suite_min_duts\": 0,\n \"timeout\": 5400,\n \"warn_only\": false\n}"
],
"hw_tests_override": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 0,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"suites\",\n \"priority\": \"Build\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}",
