Changeset 56133 in webkit

Timestamp:

Mar 17, 2010 4:39:44 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-03-17 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Change post-rollout to create-rollout and have it make a new bug
instead of posting the rollout to the old bug.
​https://bugs.webkit.org/show_bug.cgi?id=36250

The new bug blocks the old bug instead of adding more complexity to the
old bug. One tricky question is whether to create the bug if we're
unable to create a rollout patch. In this patch, we do create the bug,
but we might revist this question in the future.

• Scripts/webkitpy/bugzilla.py:
• Scripts/webkitpy/commands/download.py:
• Scripts/webkitpy/commands/download_unittest.py:
• Scripts/webkitpy/steps/createbug.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/bugzilla.py (modified) (2 diffs)
• Scripts/webkitpy/commands/download.py (modified) (2 diffs)
• Scripts/webkitpy/commands/download_unittest.py (modified) (1 diff)
• Scripts/webkitpy/steps/createbug.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ -6 +6 @@
 
         * Scripts/webkitpy/committers.py:
+
+2010-03-17  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Change post-rollout to create-rollout and have it make a new bug
+        instead of posting the rollout to the old bug.
+        https://bugs.webkit.org/show_bug.cgi?id=36250
+
+        The new bug blocks the old bug instead of adding more complexity to the
+        old bug.  One tricky question is whether to create the bug if we're
+        unable to create a rollout patch.  In this patch, we do create the bug,
+        but we might revist this question in the future.
+
+        * Scripts/webkitpy/bugzilla.py:
+        * Scripts/webkitpy/commands/download.py:
+        * Scripts/webkitpy/commands/download_unittest.py:
+        * Scripts/webkitpy/steps/createbug.py:
 
 2010-03-17  Adam Barth  <abarth@webkit.org>

trunk/WebKitTools/Scripts/webkitpy/bugzilla.py

@@ -599 +599 @@
                    patch_description=None,
                    cc=None,
+                   blocked=None,
                    mark_for_review=False,
                    mark_for_commit_queue=False):
@@ -616 +617 @@
         if component not in component_names:
             component = self.prompt_for_component(component_names)
-        self.browser['component'] = [component]
+        self.browser["component"] = [component]
         if cc:
-            self.browser['cc'] = cc
-        self.browser['short_desc'] = bug_title
-        self.browser['comment'] = bug_description
+            self.browser["cc"] = cc
+        if blocked:
+            self.browser["blocked"] = blocked
+        self.browser["short_desc"] = bug_title
+        self.browser["comment"] = bug_description
 
         if patch_file_object:

trunk/WebKitTools/Scripts/webkitpy/commands/download.py

@@ -36 +36 @@
 from webkitpy.bugzilla import parse_bug_id
 # We could instead use from modules import buildsteps and then prefix every buildstep with "buildsteps."
-from webkitpy.changelogs import ChangeLog
+from webkitpy.changelogs import ChangeLog, view_source_url
 from webkitpy.commands.abstractsequencedcommand import AbstractSequencedCommand
 from webkitpy.comments import bug_comment_from_commit_text
@@ -279 +279 @@
 
 
-class PostRollout(AbstractRolloutPrepCommand):
-    name = "post-rollout"
-    help_text = "Prepare a rollout of the given revision and upload it to the bug."
-    steps = [
-        steps.CleanWorkingDirectory,
-        steps.Update,
-        steps.RevertRevision,
+class CreateRollout(AbstractRolloutPrepCommand):
+    name = "create-rollout"
+    help_text = "Creates a bug to track a broken SVN revision and uploads a rollout patch."
+    steps = [
+        steps.CreateBug,
+        steps.CleanWorkingDirectory,
+        steps.Update,
+        steps.RevertRevision, # Notice that we still create the bug if this step fails.
         steps.PrepareChangeLogForRevert,
-        # FIXME: If there's no bug number, we should make a new bug.
         steps.PostDiffForRevert,
     ]
+
+    def _prepare_state(self, options, args, tool):
+        state = AbstractRolloutPrepCommand._prepare_state(self, options, args, tool)
+        # Currently, state["bug_id"] points to the bug that caused the
+        # regression.  We want to create a new bug that blocks the old bug
+        # so we move state["bug_id"] to state["bug_blocked"] and delete the
+        # old state["bug_id"] so that steps.CreateBug will actually create
+        # the new bug that we want (and subsequently store its bug id into
+        # state["bug_id"])
+        state["bug_blocked"] = state["bug_id"]
+        del state["bug_id"]
+        state["bug_title"] = "REGRESSION(r%s): %s" % (state["revision"], state["reason"])
+        state["bug_description"] = "%s broke the build:\n%s"
+        # FIXME: If we had more context here, we could link to other open bugs
+        #        that mention the test that regressed.
+        if options.parent_command == "sheriff-bot":
+            state["bug_description"] += """
+
+This is an automatic bug report generated by the sheriff-bot. If this bug
+report was created because of a flaky test, please file a bug for the flaky
+test (if we don't already have one on file) and dup this bug against that bug
+so that we can track how often these flaky tests case pain.
+
+"Only you can prevent forest fires." -- Smokey the Bear
+""" % (state["reason"], view_source_url(state["revision"]))
+        return state
 
 

trunk/WebKitTools/Scripts/webkitpy/commands/download_unittest.py

@@ -121 +121 @@
         self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
 
-    def test_post_rollout(self):
+    def test_create_rollout(self):
         expected_stderr="Preparing rollout for bug 12345.\nUpdating working directory\nRunning prepare-ChangeLog\n"
-        self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
+        self.assert_execute_outputs(CreateRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_rollout(self):

trunk/WebKitTools/Scripts/webkitpy/steps/createbug.py

@@ -43 +43 @@
         if state.get("bug_id"):
             return
-        state["bug_id"] = self._tool.bugs.create_bug(state["bug_title"], state["bug_description"], component=self._options.component, cc=self._options.cc)
+        state["bug_id"] = self._tool.bugs.create_bug(state["bug_title"], state["bug_description"], blocked=state.get("bug_blocked"), component=self._options.component, cc=self._options.cc)