Revert "[chromeos_config] Increase CQ HWTest timeout"
This reverts commit 7e92fcc27f77b4061d15b0f0c74a3f2ce94559dd.
Change-Id: I3ee16c51473f05b58957f0ed53e5977f123e3580
Reviewed-on: https://chromium-review.googlesource.com/298063
Commit-Ready: Mungyung Ryu <mkryu@google.com>
Tested-by: Mungyung Ryu <mkryu@google.com>
Reviewed-by: Shuqian Zhao <shuqianz@chromium.org>
diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 1b636eb..bd4da89 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -182,8 +182,7 @@
Optional arguments may be overridden in `kwargs`, except that
the `blocking` setting cannot be provided.
"""
- # TODO(mkryu): Temporarily increase timeout to 240 mins. crbug.com/528371.
- default_dict = dict(pool=constants.HWTEST_PALADIN_POOL, timeout=240 * 60,
+ default_dict = dict(pool=constants.HWTEST_PALADIN_POOL, timeout=120 * 60,
file_bugs=False, priority=constants.HWTEST_CQ_PRIORITY,
minimum_duts=4, offload_failures_only=True)
# Allows kwargs overrides to default_dict for cq.
@@ -234,8 +233,7 @@
shared with other types of builder (canaries, pfq). The first suite in the
list is a blocking sanity suite that verifies the build will not break dut.
"""
- # TODO(mkryu): Temporarily increase timeout to 240 mins. crbug.com/528371.
- sanity_dict = dict(pool=constants.HWTEST_MACH_POOL, timeout=240 * 60,
+ sanity_dict = dict(pool=constants.HWTEST_MACH_POOL, timeout=120 * 60,
file_bugs=False, priority=constants.HWTEST_CQ_PRIORITY)
sanity_dict.update(kwargs)
sanity_dict.update(dict(num=1, minimum_duts=1, suite_min_duts=1,
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 4ff9005..eb7f5fe 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -5427,7 +5427,7 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -9918,8 +9918,8 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -10276,7 +10276,7 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -13922,7 +13922,7 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -14100,7 +14100,7 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -17954,7 +17954,7 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -22572,7 +22572,7 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -22670,9 +22670,9 @@
"description": "Commit Queue (internal)",
"do_not_apply_cq_patches": true,
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"bvt\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 10,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"bvt\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 10,\n \"timeout\": 14400,\n \"warn_only\": false\n}"
+ "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 1,\n \"num\": 1,\n \"offload_failures_only\": false,\n \"pool\": \"bvt\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"sanity\",\n \"suite_min_duts\": 1,\n \"timeout\": 7200,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"bvt\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 10,\n \"timeout\": 7200,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"bvt\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 10,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -22827,7 +22827,7 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
@@ -23560,7 +23560,7 @@
],
"description": "Commit Queue (internal)",
"hw_tests": [
- "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 10,\n \"minimum_duts\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 14400,\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\": 4,\n \"num\": 6,\n \"offload_failures_only\": true,\n \"pool\": \"cq\",\n \"priority\": \"CQ\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_min_duts\": 0,\n \"timeout\": 7200,\n \"warn_only\": false\n}"
],
"internal": true,
"manifest": "official.xml",
