Changeset 258999 in webkit

Timestamp:

Mar 25, 2020 11:24:31 AM (4 years ago)

Author:

aakash_jain@apple.com

Message:

[ews] commit-queue should comment on bug if it fails to find any modified ChangeLog
​https://bugs.webkit.org/show_bug.cgi?id=209550

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/steps.py:

(FindModifiedChangeLogs): Set haltOnFailure to false.
(FindModifiedChangeLogs.getResultSummary):
(FindModifiedChangeLogs.evaluateCommand): Add build steps to comment on bug and set cq- on patch appropriately.

• BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (3 diffs)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -2465 +2465 @@
     descriptionDone = ['Found modified ChangeLogs']
     command = ['git', 'diff', '-r', '--name-status', '--no-renames', '--no-ext-diff', '--full-index']
-    haltOnFailure = True
+    haltOnFailure = False
 
     def __init__(self, **kwargs):
@@ -2477 +2477 @@
     def getResultSummary(self):
         if self.results != SUCCESS:
-            return {u'step': u'Failed to find list of modified ChangeLogs'}
+            patch_id = self.getProperty('patch_id', '')
+            return {u'step': u'Failed to find any modified ChangeLog in Patch {}'.format(patch_id)}
         return shell.ShellCommand.getResultSummary(self)
 
@@ -2485 +2486 @@
         modified_changelogs = self.extract_changelogs(log_text, self._status_regexp('MA'))
         self.setProperty('modified_changelogs', modified_changelogs)
+        if rc == FAILURE or not modified_changelogs:
+            patch_id = self.getProperty('patch_id', '')
+            message = 'Unable to find any modified ChangeLog in Patch {}'.format(patch_id)
+            if self.getProperty('buildername', '').lower() == 'commit-queue':
+                self.setProperty('bugzilla_comment_text', message.replace('Patch', 'Attachment'))
+                self.setProperty('build_finish_summary', message)
+                self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
+            else:
+                self.build.buildFinished([message], FAILURE)
         return rc
 

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -3149 +3149 @@
     def test_modified_changelogs(self):
         self.setupStep(FindModifiedChangeLogs())
+        self.assertEqual(FindModifiedChangeLogs.haltOnFailure, False)
+        self.setProperty('buildername', 'Commit-Queue')
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
@@ -3164 +3166 @@
         rc = self.runStep()
         self.assertEqual(self.getProperty('modified_changelogs'), ['Source/WebCore/ChangeLog', 'Tools/ChangeLog'])
+        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('build_finish_summary'), None)
         return rc
 
@@ -3180 +3184 @@
         rc = self.runStep()
         self.assertEqual(self.getProperty('modified_changelogs'), ['Tools/Scripts/ChangeLog'])
+        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('build_finish_summary'), None)
         return rc
 
     def test_failure(self):
         self.setupStep(FindModifiedChangeLogs())
+        self.setProperty('patch_id', '1234')
+        self.setProperty('buildername', 'Commit-Queue')
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
@@ -3192 +3200 @@
             2,
         )
-        self.expectOutcome(result=FAILURE, state_string='Failed to find list of modified ChangeLogs')
-        return self.runStep()
+        self.expectOutcome(result=FAILURE, state_string='Failed to find any modified ChangeLog in Patch 1234')
+        rc = self.runStep()
+        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Unable to find any modified ChangeLog in Attachment 1234')
+        self.assertEqual(self.getProperty('build_finish_summary'), 'Unable to find any modified ChangeLog in Patch 1234')
+        return rc
 
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-03-25  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews] commit-queue should comment on bug if it fails to find any modified ChangeLog
+        https://bugs.webkit.org/show_bug.cgi?id=209550
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (FindModifiedChangeLogs): Set haltOnFailure to false.
+        (FindModifiedChangeLogs.getResultSummary):
+        (FindModifiedChangeLogs.evaluateCommand): Add build steps to comment on bug and set cq- on patch appropriately.
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+
 2020-03-25  Aakash Jain  <aakash_jain@apple.com>