Stop tagging fuzz blockers as release blockers. (#4839)

This is causing issues for Chrome releases.

Fixes: https://crbug.com/399218120

Author: letitz

src/clusterfuzz/_internal/cron/cleanup.py

@@ -23,7 +23,6 @@
 from clusterfuzz._internal.base import errors
 from clusterfuzz._internal.base import memoize
 from clusterfuzz._internal.base import utils
-from clusterfuzz._internal.chrome import build_info
 from clusterfuzz._internal.common import testcase_utils
 from clusterfuzz._internal.crash_analysis import crash_comparer
 from clusterfuzz._internal.crash_analysis import severity_analyzer
@@ -1040,20 +1039,6 @@ def update_fuzz_blocker_label(policy, testcase, issue,
       'to be found.')
   if utils.is_oss_fuzz():
     update_message += OSS_FUZZ_INCORRECT_COMMENT
-  elif utils.is_chromium():
-    label_text = issue.issue_tracker.label_text(
-        data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL)
-    update_message += '\n\nMarking this bug as a blocker for next Beta release.'
-    update_message = _append_generic_incorrect_comment(
-        update_message, policy, issue, f' and remove the {label_text}.')
-    issue.labels.add(data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL)
-
-    # Update with the next beta for trunk, and remove existing milestone label.
-    beta_milestone_label = (
-        f'M-{build_info.get_release_milestone("head", testcase.platform)}')
-    if beta_milestone_label not in issue.labels:
-      issue.labels.remove_by_prefix('M-')
-      issue.labels.add(beta_milestone_label)
 
   logs.info(update_message)
   issue.labels.add(fuzz_blocker_label)

src/clusterfuzz/_internal/datastore/data_types.py

@@ -115,8 +115,6 @@
 UNREPRODUCIBLE_TESTCASE_NO_BUG_DEADLINE = 7
 UNREPRODUCIBLE_TESTCASE_WITH_BUG_DEADLINE = 14
 
-# Chromium specific issue state tracking labels.
-CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL = 'ReleaseBlock-Beta'
 # TODO(ochang): Find some way to remove these.
 CHROMIUM_ISSUE_PREDATOR_AUTO_CC_LABEL = 'Test-Predator-Auto-CC'
 CHROMIUM_ISSUE_PREDATOR_AUTO_COMPONENTS_LABEL = 'Test-Predator-Auto-Components'

src/clusterfuzz/_internal/tests/appengine/handlers/cron/cleanup_test.py

@@ -1190,9 +1190,6 @@ def test_no_top_crashes(self):
     cleanup.update_fuzz_blocker_label(self.policy, self.testcase, self.issue,
                                       top_crashes_by_project_and_platform_map)
     self.assertNotIn(ISSUE_FUZZ_BLOCKER_LABEL, self.issue.labels)
-    self.assertNotIn(data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL,
-                     self.issue.labels)
-    self.assertNotIn('M-63', self.issue.labels)
     self.assertEqual('', self.issue._monorail_issue.comment)
 
   def test_top_crashes_no_match(self):
@@ -1210,9 +1207,6 @@ def test_top_crashes_no_match(self):
     cleanup.update_fuzz_blocker_label(self.policy, self.testcase, self.issue,
                                       top_crashes_by_project_and_platform_map)
     self.assertNotIn(ISSUE_FUZZ_BLOCKER_LABEL, self.issue.labels)
-    self.assertNotIn(data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL,
-                     self.issue.labels)
-    self.assertNotIn('M-63', self.issue.labels)
     self.assertEqual('', self.issue._monorail_issue.comment)
 
   def test_top_crashes_with_testcase_closed(self):
@@ -1233,9 +1227,6 @@ def test_top_crashes_with_testcase_closed(self):
     cleanup.update_fuzz_blocker_label(self.policy, self.testcase, self.issue,
                                       top_crashes_by_project_and_platform_map)
     self.assertNotIn(ISSUE_FUZZ_BLOCKER_LABEL, self.issue.labels)
-    self.assertNotIn(data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL,
-                     self.issue.labels)
-    self.assertNotIn('M-63', self.issue.labels)
     self.assertEqual('', self.issue._monorail_issue.comment)
 
   def test_top_crashes_match_single_platform(self):
@@ -1250,21 +1241,13 @@ def test_top_crashes_match_single_platform(self):
             }]
         }
     }
-    self.issue.labels.add('M-62')
     cleanup.update_fuzz_blocker_label(self.policy, self.testcase, self.issue,
                                       top_crashes_by_project_and_platform_map)
     self.assertIn(ISSUE_FUZZ_BLOCKER_LABEL, self.issue.labels)
-    self.assertIn(data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL,
-                  self.issue.labels)
-    self.assertIn('M-63', self.issue.labels)
-    self.assertNotIn('M-62', self.issue.labels)
     self.assertEqual(
         'This crash occurs very frequently on linux platform and is likely '
         'preventing the fuzzer fuzzer1 from making much progress. '
-        'Fixing this will allow more bugs to be found.'
-        '\n\nMarking this bug as a blocker for next Beta release.'
-        '\n\nIf this is incorrect, please add the ClusterFuzz-Wrong label and '
-        'remove the ReleaseBlock-Beta label.',
+        'Fixing this will allow more bugs to be found.',
         self.issue._monorail_issue.comment)
 
   def test_top_crashes_match_single_platform_oss_fuzz(self):
@@ -1285,9 +1268,6 @@ def test_top_crashes_match_single_platform_oss_fuzz(self):
     cleanup.update_fuzz_blocker_label(self.policy, self.testcase, self.issue,
                                       top_crashes_by_project_and_platform_map)
     self.assertIn(ISSUE_FUZZ_BLOCKER_LABEL, self.issue.labels)
-    self.assertNotIn(data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL,
-                     self.issue.labels)
-    self.assertNotIn('M-63', self.issue.labels)
     self.assertEqual(
         'This crash occurs very frequently on linux platform and is likely '
         'preventing the fuzzer fuzz_target1 from making much progress. '
@@ -1323,16 +1303,10 @@ def test_top_crashes_match_multiple_platforms(self):
     cleanup.update_fuzz_blocker_label(self.policy, self.testcase, self.issue,
                                       top_crashes_by_project_and_platform_map)
     self.assertIn(ISSUE_FUZZ_BLOCKER_LABEL, self.issue.labels)
-    self.assertIn(data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL,
-                  self.issue.labels)
-    self.assertIn('M-63', self.issue.labels)
     self.assertEqual(
         'This crash occurs very frequently on linux, mac and windows platforms '
         'and is likely preventing the fuzzer fuzzer1 from making much '
-        'progress. Fixing this will allow more bugs to be found.'
-        '\n\nMarking this bug as a blocker for next Beta release.'
-        '\n\nIf this is incorrect, please add the ClusterFuzz-Wrong label and '
-        'remove the ReleaseBlock-Beta label.',
+        'progress. Fixing this will allow more bugs to be found.',
         self.issue._monorail_issue.comment)
 
   def test_top_crashes_match_and_label_removed(self):
@@ -1355,9 +1329,6 @@ def test_top_crashes_match_and_label_removed(self):
     cleanup.update_fuzz_blocker_label(self.policy, self.testcase, self.issue,
                                       top_crashes_by_project_and_platform_map)
     self.assertNotIn(ISSUE_FUZZ_BLOCKER_LABEL, self.issue.labels)
-    self.assertNotIn(data_types.CHROMIUM_ISSUE_RELEASEBLOCK_BETA_LABEL,
-                     self.issue.labels)
-    self.assertNotIn('M-63', self.issue.labels)
     self.assertEqual('', self.issue._monorail_issue.comment)