Title: [292161] trunk/Tools
- Revision
- 292161
- Author
- commit-qu...@webkit.org
- Date
- 2022-03-31 11:22:29 -0700 (Thu, 31 Mar 2022)
Log Message
[Merge-Queue] Skip CloseBug if no bug defined
https://bugs.webkit.org/show_bug.cgi?id=238612
<rdar://problem/91110116>
Reviewed by Aakash Jain.
* Tools/CISupport/ews-build/steps.py:
(CloseBug.start): Ignore unavailable bug_id case.
(CloseBug.getResultSummary): Use default summary for skip case.
(CloseBug.doStepIf): Do step if bug_id is available.
(CloseBug.hideStepIf): Hide step if skipped.
Canonical link: https://commits.webkit.org/249068@main
From: Jonathan Bedard <jbed...@apple.com>
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (292160 => 292161)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-03-31 15:31:42 UTC (rev 292160)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-03-31 18:22:29 UTC (rev 292161)
@@ -1719,25 +1719,28 @@
name = 'close-bugzilla-bug'
flunkOnFailure = False
haltOnFailure = False
+ bug_id = ''
def start(self):
self.bug_id = self.getProperty('bug_id', '')
- if not self.bug_id:
- self._addToLog('stdio', 'bug_id build property not found.\n')
- self.descriptionDone = 'No bug id found'
- self.finished(FAILURE)
- return None
-
rc = self.close_bug(self.bug_id)
self.finished(rc)
return None
def getResultSummary(self):
+ if self.results == SKIPPED:
+ return buildstep.BuildStep.getResultSummary(self)
if self.results == SUCCESS:
return {'step': 'Closed bug {}'.format(self.bug_id)}
return {'step': 'Failed to close bug {}'.format(self.bug_id)}
+ def doStepIf(self, step):
+ return self.getProperty('bug_id')
+ def hideStepIf(self, results, step):
+ return not self.doStepIf(step)
+
+
class LeaveComment(buildstep.BuildStep, BugzillaMixin, GitHubMixin):
name = 'leave-comment'
flunkOnFailure = False
Modified: trunk/Tools/ChangeLog (292160 => 292161)
--- trunk/Tools/ChangeLog 2022-03-31 15:31:42 UTC (rev 292160)
+++ trunk/Tools/ChangeLog 2022-03-31 18:22:29 UTC (rev 292161)
@@ -1,3 +1,18 @@
+2022-03-31 Jonathan Bedard <jbed...@apple.com>
+
+ [Merge-Queue] Skip CloseBug if no bug defined
+ https://bugs.webkit.org/show_bug.cgi?id=238612
+ <rdar://problem/91110116>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/steps.py:
+ (CloseBug.__init__):
+ (CloseBug.start): Ignore unavailable bug_id case.
+ (CloseBug.getResultSummary): Use default summary for skip case.
+ (CloseBug.doStepIf): Do step if bug_id is available.
+ (CloseBug.hideStepIf): Hide step if skipped.
+
2022-03-30 Jonathan Bedard <jbed...@apple.com>
[Merge-Queue] Update pull-request with landed content
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
