Changeset 288911 in webkit

Timestamp:

Feb 1, 2022, 1:51:21 PM (4 years ago)

Author:

Jonathan Bedard

Message:

[EWS] Fix infinate retry on PR with red ToT
​https://bugs.webkit.org/show_bug.cgi?id=235971
<rdar://problem/88344438>

Reviewed by Aakash Jain.

• Tools/CISupport/ews-build/steps.py:

(AnalyzeCompileWebKitResults.analyzeResults): Update message for PRs,
do not retry if base commit has failed to build.
(AnalyzeCompileWebKitResults.send_email_for_new_build_failure): Only send
emails for patch failures.

• Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: ​https://commits.webkit.org/246651@main

Location:

trunk/Tools

Files:

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

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

@@ -2041 +2041 @@
         compile_without_patch_result = self.getStepResult(compile_without_patch_step)
 
+        patch_id = self.getProperty('patch_id', '')
+        pr_number = self.getProperty('github.number')
+
         if compile_without_patch_result == FAILURE:
-            message = 'Unable to build WebKit without patch, retrying build'
+            if pr_number:
+                message = 'Unable to build WebKit without PR, please rebase the PR against {}'.format(self.getProperty('basename', 'ToT'))
+            else:
+                message = 'Unable to build WebKit without patch, retrying build'
+
             self.descriptionDone = message
             self.send_email_for_preexisting_build_failure()
             self.finished(FAILURE)
-            self.build.buildFinished([message], RETRY)
+            # Do not retry PRs, we end up in an infinite retry loop because we don't automatically rebase against ToT
+            self.build.buildFinished([message], FAILURE if pr_number else RETRY)
             return defer.succeed(None)
 
         self.build.results = FAILURE
-        patch_id = self.getProperty('patch_id', '')
-        message = 'Patch {} does not build'.format(patch_id)
+        sha = self.getProperty('github.head.sha')
+        if sha and pr_number:
+            message = 'Hash {} for PR {} does not build'.format(sha[:HASH_LENGTH_TO_DISPLAY], pr_number)
+        else:
+            message = 'Patch {} does not build'.format(patch_id)
         self.send_email_for_new_build_failure()
 
@@ -2057 +2068 @@
         self.finished(FAILURE)
         self.setProperty('build_finish_summary', message)
-        if self.getProperty('buildername', '').lower() == 'commit-queue':
-            self.setProperty('bugzilla_comment_text', message)
-            self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
-        else:
-            self.build.addStepsAfterCurrentStep([SetCommitQueueMinusFlagOnPatch()])
+
+        # FIXME: Need a cq- equivalent for GitHub
+        if patch_id:
+            if self.getProperty('buildername', '').lower() == 'commit-queue':
+                self.setProperty('bugzilla_comment_text', message)
+                self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
+            else:
+                self.build.addStepsAfterCurrentStep([SetCommitQueueMinusFlagOnPatch()])
 
     @defer.inlineCallbacks
@@ -2104 +2118 @@
         try:
             patch_id = self.getProperty('patch_id', '')
-            if not self.should_send_email(patch_id):
+            # FIXME: Support pull requests
+            if not patch_id or not self.should_send_email(patch_id):
                 return
             builder_name = self.getProperty('buildername', '')

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

@@ -1223 +1223 @@
         self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
         self.assertEqual(self.getProperty('build_finish_summary'), 'Patch 1234 does not build')
+        return rc
+
+    def test_pull_request_with_build_failure(self):
+        previous_steps = [
+            mock_step(CompileWebKit(), results=FAILURE),
+            mock_step(CompileWebKitWithoutPatch(), results=SUCCESS),
+        ]
+        self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
+        self.setProperty('github.number', '1234')
+        self.setProperty('github.head.sha', '7496f8ecc4cc8011f19c8cc1bc7b18fe4a88ad5c')
+        self.expectOutcome(result=FAILURE, state_string='Hash 7496f8ec for PR 1234 does not build (failure)')
+        rc = self.runStep()
+        self.assertEqual(self.getProperty('build_finish_summary'), 'Hash 7496f8ec for PR 1234 does not build')
         return rc
 

trunk/Tools/ChangeLog

@@ +1 @@
+2022-02-01  Jonathan Bedard  <jbedard@apple.com>
+
+        [EWS] Fix infinate retry on PR with red ToT 
+        https://bugs.webkit.org/show_bug.cgi?id=235971
+        <rdar://problem/88344438>
+
+        Reviewed by Aakash Jain.
+
+        * CISupport/ews-build/steps.py:
+        (AnalyzeCompileWebKitResults.analyzeResults): Update message for PRs,
+        do not retry if base commit has failed to build.
+        (AnalyzeCompileWebKitResults.send_email_for_new_build_failure): Only send
+        emails for patch failures.
+        * CISupport/ews-build/steps_unittest.py:
+
 2022-02-01  Eric Carlson  <eric.carlson@apple.com>