Skip to content

Commit

Permalink
[Merge-Queue] Remove custom summaries when skipped
Browse files Browse the repository at this point in the history 
https://bugs.webkit.org/show_bug.cgi?id=238633
<rdar://problem/91125435>

Patch by Jonathan Bedard <jbedard@apple.com> on 2022-04-04
Reviewed by Aakash Jain.

* Tools/CISupport/ews-build/steps.py:
(ValidateSquashed.getResultSummary):
(AddReviewerToCommitMessage.getResultSummary):
(AddReviewerToChangeLog.getResultSummary):
(ValidateCommitMessage.getResultSummary):
(Canonicalize.getResultSummary):
(PushPullRequestBranch.getResultSummary):
(UpdatePullRequest.getResultSummary):
* Tools/CISupport/ews-build/steps_unittest.py:
  • Loading branch information
@JonWBedard
JonWBedard committed Apr 4, 2022
1 parent 97b311c commit afb86c2
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 34 deletions.
52 changes: 27 additions & 25 deletions Tools/CISupport/ews-build/steps.py
View file
Expand Up @@ -4637,11 +4637,11 @@ def start(self, BufferLogObserverClass=logobserver.BufferLogObserver):
return shell.ShellCommand.start(self)

def getResultSummary(self):
if self.results == SKIPPED:
return {'step': 'Patches are always squashed'}
elif self.results == SUCCESS:
if self.results == FAILURE:
return {'step': 'Can only land squashed branches'}
if self.results == SUCCESS:
return {'step': 'Verified branch is squashed'}
return {'step': 'Can only land squashed branches'}
return super(ValidateSquashed, self).getResultSummary()

def evaluateCommand(self, cmd):
rc = shell.ShellCommand.evaluateCommand(self, cmd)
Expand Down Expand Up @@ -4714,11 +4714,11 @@ def start(self, BufferLogObserverClass=logobserver.BufferLogObserver):
return super(AddReviewerToCommitMessage, self).start()

def getResultSummary(self):
if self.results == SKIPPED:
return {'step': 'No reviewer defined' if self.getProperty('github.number') else 'Patches have no commit message'}
elif self.results == SUCCESS:
if self.results == FAILURE:
return {'step': 'Failed to apply reviewers'}
if self.results == SUCCESS:
return {'step': f'Reviewed by {self.reviewers()}'}
return {'step': 'Failed to apply reviewers'}
return super(AddReviewerToCommitMessage, self).getResultSummary()

def doStepIf(self, step):
return self.getProperty('github.number') and self.getProperty('reviewers_full_names')
Expand Down Expand Up @@ -4762,11 +4762,11 @@ def run(self, BufferLogObserverClass=logobserver.BufferLogObserver):
return super(AddReviewerToChangeLog, self).run()

def getResultSummary(self):
if self.results == SKIPPED:
return {'step': 'No reviewer defined' if self.getProperty('github.number') else 'Patches are edited upon application'}
elif self.results == SUCCESS:
if self.results == FAILURE:
return {'step': 'Failed to add reviewers to ChangeLogs'}
if self.results == SUCCESS:
return {'step': f'Reviewed by {self.reviewers()}'}
return {'step': 'Failed to add reviewers to ChangeLogs'}
return super(AddReviewerToChangeLog, self).getResultSummary()

def doStepIf(self, step):
return self.getProperty('github.number') and self.getProperty('reviewers_full_names')
Expand Down Expand Up @@ -4794,7 +4794,9 @@ def start(self, BufferLogObserverClass=logobserver.BufferLogObserver):
return super(ValidateCommitMessage, self).start()

def getResultSummary(self):
return {'step': self.summary}
if self.results in (SUCCESS, FAILURE):
return {'step': self.summary}
return super(ValidateCommitMessage, self).getResultSummary()

def evaluateCommand(self, cmd):
rc = super(ValidateCommitMessage, self).evaluateCommand(cmd)
Expand Down Expand Up @@ -4853,11 +4855,11 @@ def run(self):
return super(Canonicalize, self).run()

def getResultSummary(self):
if self.results == SKIPPED:
return {'step': 'Cannot canonicalize patches'}
if self.results != SUCCESS:
if self.results == SUCCESS:
return {'step': 'Canonicalized commit'}
if self.results == FAILURE:
return {'step': 'Failed to canonicalize commit'}
return {'step': 'Canonicalized commit'}
return super(Canonicalize, self).getResultSummary()

def doStepIf(self, step):
return self.getProperty('github.number', False)
Expand Down Expand Up @@ -4885,11 +4887,11 @@ def start(self, BufferLogObserverClass=logobserver.BufferLogObserver):
return super(PushPullRequestBranch, self).start()

def getResultSummary(self):
if self.results == SKIPPED:
return {'step': 'No pull request branch to push to'}
if self.results != SUCCESS:
if self.results == SUCCESS:
return {'step': 'Pushed to pull request branch'}
if self.results == FAILURE:
return {'step': 'Failed to push to pull request branch'}
return {'step': 'Pushed to pull request branch'}
return super(PushPullRequestBranch, self).getResultSummary()

def doStepIf(self, step):
return CURRENT_HOSTNAME == EWS_BUILD_HOSTNAME and self.getProperty('github.number') and self.getProperty('github.head.ref') and self.getProperty('github.head.repo.full_name')
Expand Down Expand Up @@ -4932,11 +4934,11 @@ def start(self, BufferLogObserverClass=logobserver.BufferLogObserver):
return super(UpdatePullRequest, self).start()

def getResultSummary(self):
if self.results == SKIPPED:
return {'step': 'No pull request to update'}
if self.results != SUCCESS:
if self.results == SUCCESS:
return {'step': 'Updated pull request'}
if self.results == FAILURE:
return {'step': 'Failed to update pull request'}
return {'step': 'Updated pull request'}
return super(UpdatePullRequest, self).getResultSummary()

def evaluateCommand(self, cmd):
rc = super(UpdatePullRequest, self).evaluateCommand(cmd)
Expand Down
18 changes: 9 additions & 9 deletions Tools/CISupport/ews-build/steps_unittest.py
View file
Expand Up @@ -5621,7 +5621,7 @@ def tearDown(self):
def test_skipped_patch(self):
self.setupStep(ValidateSquashed())
self.setProperty('patch_id', '1234')
self.expectOutcome(result=SKIPPED, state_string='Patches are always squashed')
self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
return self.runStep()

def test_success(self):
Expand Down Expand Up @@ -5694,7 +5694,7 @@ def tearDown(self):
def test_skipped_patch(self):
self.setupStep(AddReviewerToCommitMessage())
self.setProperty('patch_id', '1234')
self.expectOutcome(result=SKIPPED, state_string='Patches have no commit message')
self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
return self.runStep()

def test_success(self):
Expand Down Expand Up @@ -5761,7 +5761,7 @@ def test_no_reviewers(self):
self.setProperty('github.base.ref', 'main')
self.setProperty('github.head.ref', 'eng/pull-request-branch')
self.setProperty('reviewers_full_names', [])
self.expectOutcome(result=SKIPPED, state_string='No reviewer defined')
self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
return self.runStep()


Expand All @@ -5783,7 +5783,7 @@ def tearDown(self):
def test_skipped_patch(self):
self.setupStep(AddReviewerToChangeLog())
self.setProperty('patch_id', '1234')
self.expectOutcome(result=SKIPPED, state_string='Patches are edited upon application')
self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
return self.runStep()

def test_success(self):
Expand Down Expand Up @@ -5876,7 +5876,7 @@ def test_no_reviewers(self):
self.setProperty('github.base.ref', 'main')
self.setProperty('github.head.ref', 'eng/pull-request-branch')
self.setProperty('reviewers_full_names', [])
self.expectOutcome(result=SKIPPED, state_string='No reviewer defined')
self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
return self.runStep()


Expand All @@ -5891,7 +5891,7 @@ def tearDown(self):
def test_skipped_patch(self):
self.setupStep(ValidateCommitMessage())
self.setProperty('patch_id', '1234')
self.expectOutcome(result=SKIPPED, state_string='Patches have no commit message')
self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
return self.runStep()

def test_success(self):
Expand Down Expand Up @@ -5984,7 +5984,7 @@ def tearDown(self):
def test_skipped_patch(self):
self.setupStep(Canonicalize())
self.setProperty('patch_id', '1234')
self.expectOutcome(result=SKIPPED, state_string='Cannot canonicalize patches')
self.expectOutcome(result=SKIPPED, state_string='Canonicalize Commit (skipped)')
return self.runStep()

def test_success(self):
Expand Down Expand Up @@ -6080,7 +6080,7 @@ def tearDown(self):
def test_skipped_patch(self):
self.setupStep(PushPullRequestBranch())
self.setProperty('patch_id', '1234')
self.expectOutcome(result=SKIPPED, state_string='No pull request branch to push to')
self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
return self.runStep()

def test_success(self):
Expand Down Expand Up @@ -6133,7 +6133,7 @@ def tearDown(self):
def test_skipped_patch(self):
self.setupStep(UpdatePullRequest())
self.setProperty('patch_id', '1234')
self.expectOutcome(result=SKIPPED, state_string='No pull request to update')
self.expectOutcome(result=SKIPPED, state_string="'git log ...' (skipped)")
return self.runStep()

def test_success(self):
Expand Down
18 changes: 18 additions & 0 deletions Tools/ChangeLog
View file
@@ -1,3 +1,21 @@
2022-03-31 Jonathan Bedard <jbedard@apple.com>

[Merge-Queue] Remove custom summaries when skipped
https://bugs.webkit.org/show_bug.cgi?id=238633
<rdar://problem/91125435>

Reviewed by Aakash Jain.

* CISupport/ews-build/steps.py:
(ValidateSquashed.getResultSummary):
(AddReviewerToCommitMessage.getResultSummary):
(AddReviewerToChangeLog.getResultSummary):
(ValidateCommitMessage.getResultSummary):
(Canonicalize.getResultSummary):
(PushPullRequestBranch.getResultSummary):
(UpdatePullRequest.getResultSummary):
* CISupport/ews-build/steps_unittest.py:

2022-04-04 Sam Sneddon <gsnedders@apple.com>

WPT export broken under Python 3
Expand Down

0 comments on commit afb86c2

Please sign in to comment.