chromeos_config: stop email alerts on pre-cq-launcher, master-paladin
Also: delete some now-obsolete tests that depended on this config
values.
BUG=None
TEST=None
Change-Id: Id4e27c8956c39088165c7da5c38c7987fd136d00
Reviewed-on: https://chromium-review.googlesource.com/693145
Commit-Ready: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Paul Hobbs <phobbs@google.com>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 5cbe53c..bc0353e 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -1898,7 +1898,6 @@
'if supported.',
doc='http://www.chromium.org/chromium-os/build/builder-overview#'
'TOC-Pre-CQ',
- health_threshold=3,
)
# Pre-CQ targets that only check compilation and unit tests.
@@ -1940,9 +1939,6 @@
description='Launcher for Pre-CQ builders',
trybot_list=False,
manifest_version=False,
- # Every Pre-CQ launch failure should send out an alert.
- health_threshold=1,
- health_alert_recipients=['chromeos-infra-eng@grotations.appspotmail.com'],
doc='http://www.chromium.org/chromium-os/build/builder-overview#'
'TOC-Pre-CQ',
)
@@ -2373,8 +2369,6 @@
# build_internals/masters/master.chromeos/board_config.py.
# TODO(mtennant): Fix this. There should be some amount of auto-
# configuration in the board_config.py code.
- health_threshold=3,
- health_alert_recipients=['chromeos-infra-eng@grotations.appspotmail.com'],
sanity_check_slaves=['wolf-tot-paladin'],
trybot_list=False,
auto_reboot=False,
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index c34d778..8dd2421 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -350,7 +350,6 @@
"debug_symbols": false,
"description": "Verifies compilation only",
"doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Pre-CQ",
- "health_threshold": 3,
"hw_tests_override": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\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\": 10800,\n \"warn_only\": false\n}",
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"suites\",\n \"priority\": \"Build\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
@@ -718,7 +717,6 @@
"debug_symbols": false,
"description": "Verifies compilation, building an image, and unit tests if supported.",
"doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Pre-CQ",
- "health_threshold": 3,
"hw_tests_override": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\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\": 10800,\n \"warn_only\": false\n}",
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"suites\",\n \"priority\": \"Build\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
@@ -816,7 +814,6 @@
"debug_symbols": false,
"description": "Verifies compilation, building an image, and vm/unit tests if supported.",
"doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Pre-CQ",
- "health_threshold": 3,
"hw_tests_override": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\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\": 10800,\n \"warn_only\": false\n}",
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"num\": 3,\n \"offload_failures_only\": false,\n \"pool\": \"suites\",\n \"priority\": \"Build\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
@@ -1163,7 +1160,6 @@
"debug_symbols": false,
"description": "WiFi tests acting as pre-cq for WiFi related changes",
"doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Pre-CQ",
- "health_threshold": 3,
"hw_tests": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": null,\n \"minimum_duts\": 1,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"wificell-pre-cq\",\n \"priority\": \"DEFAULT\",\n \"retry\": false,\n \"suite\": \"wificell-pre-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}"
],
@@ -4032,7 +4028,6 @@
"debug_symbols": false,
"description": "Bluestreak tests as pre-cq for CFM related changes",
"doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Pre-CQ",
- "health_threshold": 3,
"hw_tests": [
"{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"file_bugs\": false,\n \"max_retries\": null,\n \"minimum_duts\": 1,\n \"num\": 6,\n \"offload_failures_only\": false,\n \"pool\": \"bluestreak-pre-cq\",\n \"priority\": \"DEFAULT\",\n \"retry\": false,\n \"suite\": \"bluestreak-pre-cq\",\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}"
],
@@ -15653,10 +15648,6 @@
"boards": [],
"buildslave_type": "gce_wimpy",
"description": "Commit Queue master (all others are slaves)",
- "health_alert_recipients": [
- "chromeos-infra-eng@grotations.appspotmail.com"
- ],
- "health_threshold": 3,
"internal": true,
"manifest": "official.xml",
"manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
@@ -20214,10 +20205,6 @@
"chroot_replace": false,
"description": "Launcher for Pre-CQ builders",
"doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Pre-CQ",
- "health_alert_recipients": [
- "chromeos-infra-eng@grotations.appspotmail.com"
- ],
- "health_threshold": 1,
"hw_tests_override": [],
"image_test": true,
"images": [
diff --git a/cbuildbot/stages/sync_stages_unittest.py b/cbuildbot/stages/sync_stages_unittest.py
index 6b34a49..e8b437c 100644
--- a/cbuildbot/stages/sync_stages_unittest.py
+++ b/cbuildbot/stages/sync_stages_unittest.py
@@ -645,58 +645,6 @@
failed_configs = self.sync_stage._GetFailedPreCQConfigs(action_history)
self.assertItemsEqual(failed_configs, ['lumpy-pre-cq'])
- def testFailureStreakCounterExceedsThreshold(self):
- """Test FailureStreakCounterExceedsThreshold."""
- pre_cq_1 = self.fake_db.InsertBuild(
- 'lumpy-pre-cq', constants.WATERFALL_TRYBOT, 0, 'lumpy-pre-cq',
- 'bot hostname')
- pre_cq_2 = self.fake_db.InsertBuild(
- 'lumpy-pre-cq', constants.WATERFALL_TRYBOT, 1, 'lumpy-pre-cq',
- 'bot hostname')
- pre_cq_3 = self.fake_db.InsertBuild(
- 'lumpy-pre-cq', constants.WATERFALL_TRYBOT, 2, 'lumpy-pre-cq',
- 'bot hostname')
- self.fake_db.FinishBuild(pre_cq_1, status=constants.BUILDER_STATUS_PASSED)
- self.fake_db.FinishBuild(pre_cq_2, status=constants.BUILDER_STATUS_FAILED)
- self.fake_db.FinishBuild(pre_cq_3, status=constants.BUILDER_STATUS_FAILED)
-
- build_history = self.fake_db.GetBuildHistory('lumpy-pre-cq', -1, final=True)
- self.assertFalse(self.sync_stage. _FailureStreakCounterExceedsThreshold(
- 'lumpy-pre-cq', build_history))
-
- pre_cq_4 = self.fake_db.InsertBuild(
- 'lumpy-pre-cq', constants.WATERFALL_TRYBOT, 2, 'lumpy-pre-cq',
- 'bot hostname')
- self.fake_db.FinishBuild(pre_cq_4, status=constants.BUILDER_STATUS_FAILED)
-
- build_history = self.fake_db.GetBuildHistory('lumpy-pre-cq', -1, final=True)
- self.assertTrue(self.sync_stage. _FailureStreakCounterExceedsThreshold(
- 'lumpy-pre-cq', build_history))
-
- def testGetBuildConfigsToSanityCheck(self):
- """Test _GetBuildConfigsToSanityCheck."""
- build_configs = {'lumpy-pre-cq', 'cyan-pre-cq', 'betty-pre-cq'}
-
- for build_config in ('lumpy-pre-cq', 'cyan-pre-cq'):
- for _ in range(0, 3):
- pre_cq = self.fake_db.InsertBuild(
- build_config, constants.WATERFALL_TRYBOT, 0, build_config,
- 'bot hostname')
- self.fake_db.FinishBuild(pre_cq, status=constants.BUILDER_STATUS_FAILED)
-
- self.fake_db.InsertBuildRequest(
- self.build_id, 'lumpy-pre-cq', 'sanity-pre-cq',
- request_buildbucket_id='bb_id_1', timestamp=datetime.datetime.now())
-
- stale_timestamp = datetime.datetime.now() - datetime.timedelta(hours=10)
- self.fake_db.InsertBuildRequest(
- self.build_id, 'cyan-pre-cq', 'sanity-pre-cq',
- request_buildbucket_id='bb_id_2', timestamp=stale_timestamp)
-
- sanity_check_build_configs = self.sync_stage._GetBuildConfigsToSanityCheck(
- self.fake_db, build_configs)
- self.assertEqual(sanity_check_build_configs, ['cyan-pre-cq'])
-
def testLaunchSanityCheckPreCQsIfNeeded(self):
"""Test _LaunchSanityCheckPreCQsIfNeeded."""
mock_pool = mock.Mock()
