⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 292291 in webkit


Ignore:
Timestamp:
Apr 4, 2022, 9:31:48 AM (4 years ago)
Author:
Jonathan Bedard
Message:

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

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:

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

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r292235 r292291  
    46384638
    46394639    def getResultSummary(self):
    4640         if self.results == SKIPPED:
    4641             return {'step': 'Patches are always squashed'}
    4642         elif self.results == SUCCESS:
     4640        if self.results == FAILURE:
     4641            return {'step': 'Can only land squashed branches'}
     4642        if self.results == SUCCESS:
    46434643            return {'step': 'Verified branch is squashed'}
    4644         return {'step': 'Can only land squashed branches'}
     4644        return super(ValidateSquashed, self).getResultSummary()
    46454645
    46464646    def evaluateCommand(self, cmd):
    … …  
    47154715
    47164716    def getResultSummary(self):
    4717         if self.results == SKIPPED:
    4718             return {'step': 'No reviewer defined' if self.getProperty('github.number') else 'Patches have no commit message'}
    4719         elif self.results == SUCCESS:
     4717        if self.results == FAILURE:
     4718            return {'step': 'Failed to apply reviewers'}
     4719        if self.results == SUCCESS:
    47204720            return {'step': f'Reviewed by {self.reviewers()}'}
    4721         return {'step': 'Failed to apply reviewers'}
     4721        return super(AddReviewerToCommitMessage, self).getResultSummary()
    47224722
    47234723    def doStepIf(self, step):
    … …  
    47634763
    47644764    def getResultSummary(self):
    4765         if self.results == SKIPPED:
    4766             return {'step': 'No reviewer defined' if self.getProperty('github.number') else 'Patches are edited upon application'}
    4767         elif self.results == SUCCESS:
     4765        if self.results == FAILURE:
     4766            return {'step': 'Failed to add reviewers to ChangeLogs'}
     4767        if self.results == SUCCESS:
    47684768            return {'step': f'Reviewed by {self.reviewers()}'}
    4769         return {'step': 'Failed to add reviewers to ChangeLogs'}
     4769        return super(AddReviewerToChangeLog, self).getResultSummary()
    47704770
    47714771    def doStepIf(self, step):
    … …  
    47954795
    47964796    def getResultSummary(self):
    4797         return {'step': self.summary}
     4797        if self.results in (SUCCESS, FAILURE):
     4798            return {'step': self.summary}
     4799        return super(ValidateCommitMessage, self).getResultSummary()
    47984800
    47994801    def evaluateCommand(self, cmd):
    … …  
    48544856
    48554857    def getResultSummary(self):
    4856         if self.results == SKIPPED:
    4857             return {'step': 'Cannot canonicalize patches'}
    4858         if self.results != SUCCESS:
     4858        if self.results == SUCCESS:
     4859            return {'step': 'Canonicalized commit'}
     4860        if self.results == FAILURE:
    48594861            return {'step': 'Failed to canonicalize commit'}
    4860         return {'step': 'Canonicalized commit'}
     4862        return super(Canonicalize, self).getResultSummary()
    48614863
    48624864    def doStepIf(self, step):
    … …  
    48864888
    48874889    def getResultSummary(self):
    4888         if self.results == SKIPPED:
    4889             return {'step': 'No pull request branch to push to'}
    4890         if self.results != SUCCESS:
     4890        if self.results == SUCCESS:
     4891            return {'step': 'Pushed to pull request branch'}
     4892        if self.results == FAILURE:
    48914893            return {'step': 'Failed to push to pull request branch'}
    4892         return {'step': 'Pushed to pull request branch'}
     4894        return super(PushPullRequestBranch, self).getResultSummary()
    48934895
    48944896    def doStepIf(self, step):
    … …  
    49334935
    49344936    def getResultSummary(self):
    4935         if self.results == SKIPPED:
    4936             return {'step': 'No pull request to update'}
    4937         if self.results != SUCCESS:
     4937        if self.results == SUCCESS:
     4938            return {'step': 'Updated pull request'}
     4939        if self.results == FAILURE:
    49384940            return {'step': 'Failed to update pull request'}
    4939         return {'step': 'Updated pull request'}
     4941        return super(UpdatePullRequest, self).getResultSummary()
    49404942
    49414943    def evaluateCommand(self, cmd):

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

    r292235 r292291  
    56225622        self.setupStep(ValidateSquashed())
    56235623        self.setProperty('patch_id', '1234')
    5624         self.expectOutcome(result=SKIPPED, state_string='Patches are always squashed')
     5624        self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
    56255625        return self.runStep()
    56265626
    … …  
    56955695        self.setupStep(AddReviewerToCommitMessage())
    56965696        self.setProperty('patch_id', '1234')
    5697         self.expectOutcome(result=SKIPPED, state_string='Patches have no commit message')
     5697        self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
    56985698        return self.runStep()
    56995699
    … …  
    57625762        self.setProperty('github.head.ref', 'eng/pull-request-branch')
    57635763        self.setProperty('reviewers_full_names', [])
    5764         self.expectOutcome(result=SKIPPED, state_string='No reviewer defined')
     5764        self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
    57655765        return self.runStep()
    57665766
    … …  
    57845784        self.setupStep(AddReviewerToChangeLog())
    57855785        self.setProperty('patch_id', '1234')
    5786         self.expectOutcome(result=SKIPPED, state_string='Patches are edited upon application')
     5786        self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
    57875787        return self.runStep()
    57885788
    … …  
    58775877        self.setProperty('github.head.ref', 'eng/pull-request-branch')
    58785878        self.setProperty('reviewers_full_names', [])
    5879         self.expectOutcome(result=SKIPPED, state_string='No reviewer defined')
     5879        self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
    58805880        return self.runStep()
    58815881
    … …  
    58925892        self.setupStep(ValidateCommitMessage())
    58935893        self.setProperty('patch_id', '1234')
    5894         self.expectOutcome(result=SKIPPED, state_string='Patches have no commit message')
     5894        self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
    58955895        return self.runStep()
    58965896
    … …  
    59855985        self.setupStep(Canonicalize())
    59865986        self.setProperty('patch_id', '1234')
    5987         self.expectOutcome(result=SKIPPED, state_string='Cannot canonicalize patches')
     5987        self.expectOutcome(result=SKIPPED, state_string='Canonicalize Commit (skipped)')
    59885988        return self.runStep()
    59895989
    … …  
    60816081        self.setupStep(PushPullRequestBranch())
    60826082        self.setProperty('patch_id', '1234')
    6083         self.expectOutcome(result=SKIPPED, state_string='No pull request branch to push to')
     6083        self.expectOutcome(result=SKIPPED, state_string='finished (skipped)')
    60846084        return self.runStep()
    60856085
    … …  
    61346134        self.setupStep(UpdatePullRequest())
    61356135        self.setProperty('patch_id', '1234')
    6136         self.expectOutcome(result=SKIPPED, state_string='No pull request to update')
     6136        self.expectOutcome(result=SKIPPED, state_string="'git log ...' (skipped)")
    61376137        return self.runStep()
    61386138

  • trunk/Tools/ChangeLog

    r292288 r292291  
     12022-03-31  Jonathan Bedard  <jbedard@apple.com>
     2
     3        [Merge-Queue] Remove custom summaries when skipped
     4        https://bugs.webkit.org/show_bug.cgi?id=238633
     5        <rdar://problem/91125435>
     6
     7        Reviewed by Aakash Jain.
     8
     9        * CISupport/ews-build/steps.py:
     10        (ValidateSquashed.getResultSummary):
     11        (AddReviewerToCommitMessage.getResultSummary):
     12        (AddReviewerToChangeLog.getResultSummary):
     13        (ValidateCommitMessage.getResultSummary):
     14        (Canonicalize.getResultSummary):
     15        (PushPullRequestBranch.getResultSummary):
     16        (UpdatePullRequest.getResultSummary):
     17        * CISupport/ews-build/steps_unittest.py:
     18
    1192022-04-04  Sam Sneddon  <gsnedders@apple.com>
    220
Note: See TracChangeset for help on using the changeset viewer.