Changeset 273000 in webkit

Timestamp:

Feb 17, 2021 8:23:18 AM (3 years ago)

Author:

aakash_jain@apple.com

Message:

commit-queue should retry when it fails to commit
​https://bugs.webkit.org/show_bug.cgi?id=222038

Reviewed by Jonathan Bedard.

• CISupport/ews-build/steps.py:

(PushCommitToWebKitRepo):
(PushCommitToWebKitRepo.evaluateCommand):

• CISupport/ews-build/steps_unittest.py:

Location:

trunk/Tools

Files:

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

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

@@ -3077 +3077 @@
     commit_success_regexp = '^Committed r(?P<svn_revision>\d+)$'
     haltOnFailure = False
+    MAX_RETRY = 2
 
     def __init__(self, **kwargs):
@@ -3098 +3099 @@
             self.addURL('r{}'.format(svn_revision), self.url_for_revision(svn_revision))
         else:
+            retry_count = int(self.getProperty('retry_count', 0))
+            if retry_count < self.MAX_RETRY:
+                self.setProperty('retry_count', retry_count + 1)
+                self.build.addStepsAfterCurrentStep([CheckOutSource(), ShowIdentifier(), UpdateWorkingDirectory(), ApplyPatch(), CreateLocalGITCommit(), PushCommitToWebKitRepo()])
+                return rc
+
             self.setProperty('bugzilla_comment_text', self.comment_text_for_bug())
             self.setProperty('build_finish_summary', 'Failed to commit to WebKit repository')

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

@@ -3781 +3781 @@
         return rc
 
-    def test_failure(self):
+    def test_failure_retry(self):
         self.setupStep(PushCommitToWebKitRepo())
+        self.setProperty('patch_id', '2345')
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        timeout=300,
+                        logEnviron=False,
+                        command=['git', 'svn', 'dcommit', '--rmdir']) +
+            ExpectShell.log('stdio', stdout='Unexpected failure') +
+            2,
+        )
+        self.expectOutcome(result=FAILURE, state_string='Failed to push commit to Webkit repository')
+        rc = self.runStep()
+        self.assertEqual(self.getProperty('retry_count'), 1)
+        self.assertEqual(self.getProperty('build_finish_summary'), None)
+        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        return rc
+
+    def test_failure(self):
+        self.setupStep(PushCommitToWebKitRepo())
+        self.setProperty('retry_count', PushCommitToWebKitRepo.MAX_RETRY)
         self.setProperty('patch_id', '2345')
         self.expectRemoteCommands(

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-17  Aakash Jain  <aakash_jain@apple.com>
+
+        commit-queue should retry when it fails to commit
+        https://bugs.webkit.org/show_bug.cgi?id=222038
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/ews-build/steps.py:
+        (PushCommitToWebKitRepo):
+        (PushCommitToWebKitRepo.evaluateCommand):
+        * CISupport/ews-build/steps_unittest.py:
+
 2021-02-17  Wenson Hsieh  <wenson_hsieh@apple.com>