Title: [271812] trunk/Tools
- Revision
- 271812
- Author
- [email protected]
- Date
- 2021-01-25 13:29:07 -0800 (Mon, 25 Jan 2021)
Log Message
[ews] Commit Queue should retry the build when update-working-directory step fails
https://bugs.webkit.org/show_bug.cgi?id=220836
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(UpdateWorkingDirectory):
(UpdateWorkingDirectory.getResultSummary): Provide better failure message.
(UpdateWorkingDirectory.evaluateCommand): Retry the build when this step fails.
* CISupport/ews-build/steps_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (271811 => 271812)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-01-25 21:26:37 UTC (rev 271811)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-01-25 21:29:07 UTC (rev 271812)
@@ -243,7 +243,6 @@
class UpdateWorkingDirectory(shell.ShellCommand):
name = 'update-working-directory'
description = ['update-workring-directory running']
- descriptionDone = ['Updated working directory']
flunkOnFailure = True
haltOnFailure = True
command = ['perl', 'Tools/Scripts/update-webkit']
@@ -251,7 +250,19 @@
def __init__(self, **kwargs):
super(UpdateWorkingDirectory, self).__init__(logEnviron=False, **kwargs)
+ def getResultSummary(self):
+ if self.results != SUCCESS:
+ return {u'step': u'Failed to updated working directory'}
+ else:
+ return {u'step': u'Updated working directory'}
+ def evaluateCommand(self, cmd):
+ rc = shell.ShellCommand.evaluateCommand(self, cmd)
+ if rc == FAILURE:
+ self.build.buildFinished(['Git issue, retrying build'], RETRY)
+ return rc
+
+
class ApplyPatch(shell.ShellCommand, CompositeStepMixin):
name = 'apply-patch'
description = ['applying-patch']
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (271811 => 271812)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-01-25 21:26:37 UTC (rev 271811)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-01-25 21:29:07 UTC (rev 271812)
@@ -2268,7 +2268,7 @@
+ ExpectShell.log('stdio', stdout='Unexpected failure.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='Updated working directory (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Failed to updated working directory')
return self.runStep()
Modified: trunk/Tools/ChangeLog (271811 => 271812)
--- trunk/Tools/ChangeLog 2021-01-25 21:26:37 UTC (rev 271811)
+++ trunk/Tools/ChangeLog 2021-01-25 21:29:07 UTC (rev 271812)
@@ -1,3 +1,16 @@
+2021-01-25 Aakash Jain <[email protected]>
+
+ [ews] Commit Queue should retry the build when update-working-directory step fails
+ https://bugs.webkit.org/show_bug.cgi?id=220836
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (UpdateWorkingDirectory):
+ (UpdateWorkingDirectory.getResultSummary): Provide better failure message.
+ (UpdateWorkingDirectory.evaluateCommand): Retry the build when this step fails.
+ * CISupport/ews-build/steps_unittest.py:
+
2021-01-25 Fujii Hironori <[email protected]>
The generated commit message have a directory label at the first line rather than the bug's title if ChangeLogs have different bug titles
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
