[webkit-changes] [291308] trunk/Tools

Tue, 15 Mar 2022 12:35:37 -0700

Title: [291308] trunk/Tools
Revision
291308
Author
[email protected]
Date
2022-03-15 12:34:43 -0700 (Tue, 15 Mar 2022)

Log Message

[Merge-Queue] Rename bugzilla_comment_text
https://bugs.webkit.org/show_bug.cgi?id=237911
<rdar://problem/90319995>

Reviewed by Aakash Jain.

Rename bugzilla_comment_text to comment_text to re-use
code to comment on pull requests.

* Tools/CISupport/ews-build/steps.py:
(ApplyPatch.evaluateCommand):
(ValidateCommiterAndReviewer.fail_build):
(ValidateChangeLogAndReviewer.evaluateCommand):
(CommentOnBug.start):
(AnalyzeCompileWebKitResults.analyzeResults):
(AnalyzeLayoutTestsResults.report_failure):
(FindModifiedChangeLogs.evaluateCommand):
(CreateLocalGITCommit.evaluateCommand):
(PushCommitToWebKitRepo.evaluateCommand):
* Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: https://commits.webkit.org/248447@main

Modified Paths

Diff

Modified: trunk/Tools/CISupport/ews-build/steps.py (291307 => 291308)


--- trunk/Tools/CISupport/ews-build/steps.py	2022-03-15 19:22:07 UTC (rev 291307)
+++ trunk/Tools/CISupport/ews-build/steps.py	2022-03-15 19:34:43 UTC (rev 291308)
@@ -689,7 +689,7 @@
             message = 'Tools/Scripts/svn-apply failed to apply patch {} to trunk'.format(patch_id)
             if self.getProperty('buildername', '').lower() == 'commit-queue':
                 comment_text = '{}.\nPlease resolve the conflicts and upload a new patch.'.format(message.replace('patch', 'attachment'))
-                self.setProperty('bugzilla_comment_text', comment_text)
+                self.setProperty('comment_text', comment_text)
                 self.setProperty('build_finish_summary', message)
                 self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
             else:
@@ -1414,7 +1414,7 @@
         reason = '{} does not have {} permissions'.format(email, status)
         comment = '{} does not have {} permissions according to {}.'.format(email, status, Contributors.url)
         comment += '\n\nRejecting attachment {} from commit queue.'.format(self.getProperty('patch_id', ''))
-        self.setProperty('bugzilla_comment_text', comment)
+        self.setProperty('comment_text', comment)
 
         self._addToLog('stdio', reason)
         self.setProperty('build_finish_summary', reason)
@@ -1493,7 +1493,7 @@
         rc = shell.ShellCommand.evaluateCommand(self, cmd)
         if rc == FAILURE:
             log_text = self.log_observer.getStdout() + self.log_observer.getStderr()
-            self.setProperty('bugzilla_comment_text', log_text)
+            self.setProperty('comment_text', log_text)
             self.setProperty('build_finish_summary', 'ChangeLog validation failed')
             self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
         return rc
@@ -1619,10 +1619,10 @@
 
     def start(self):
         self.bug_id = self.getProperty('bug_id', '')
-        self.comment_text = self.getProperty('bugzilla_comment_text', '')
+        self.comment_text = self.getProperty('comment_text', '')
 
         if not self.comment_text:
-            self._addToLog('stdio', 'bugzilla_comment_text build property not found.\n')
+            self._addToLog('stdio', 'comment_text build property not found.\n')
             self.descriptionDone = 'No bugzilla comment found'
             self.finished(WARNINGS)
             return None
@@ -2249,7 +2249,7 @@
 
         if patch_id:
             if self.getProperty('buildername', '').lower() == 'commit-queue':
-                self.setProperty('bugzilla_comment_text', message)
+                self.setProperty('comment_text', message)
                 self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
             else:
                 self.build.addStepsAfterCurrentStep([SetCommitQueueMinusFlagOnPatch()])
@@ -3075,7 +3075,7 @@
         self.setProperty('build_finish_summary', message)
 
         if self.getProperty('buildername', '').lower() == 'commit-queue':
-            self.setProperty('bugzilla_comment_text', message)
+            self.setProperty('comment_text', message)
             self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
         else:
             self.build.addStepsAfterCurrentStep([SetCommitQueueMinusFlagOnPatch(), BlockPullRequest()])
@@ -4246,7 +4246,7 @@
             patch_id = self.getProperty('patch_id', '')
             message = 'Unable to find any modified ChangeLog in Patch {}'.format(patch_id)
             if self.getProperty('buildername', '').lower() == 'commit-queue':
-                self.setProperty('bugzilla_comment_text', message.replace('Patch', 'Attachment'))
+                self.setProperty('comment_text', message.replace('Patch', 'Attachment'))
                 self.setProperty('build_finish_summary', message)
                 self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
             else:
@@ -4306,7 +4306,7 @@
             patch_id = self.getProperty('patch_id', '')
             message = self.failure_message or 'Failed to create git commit for Patch {}'.format(patch_id)
             if self.getProperty('buildername', '').lower() == 'commit-queue':
-                self.setProperty('bugzilla_comment_text', message.replace('Patch', 'Attachment'))
+                self.setProperty('comment_text', message.replace('Patch', 'Attachment'))
                 self.setProperty('build_finish_summary', message)
                 self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
             else:
@@ -4337,7 +4337,7 @@
             log_text = self.log_observer.getStdout() + self.log_observer.getStderr()
             svn_revision = self.svn_revision_from_commit_text(log_text)
             identifier = self.identifier_for_revision(svn_revision)
-            self.setProperty('bugzilla_comment_text', self.comment_text_for_bug(svn_revision, identifier))
+            self.setProperty('comment_text', self.comment_text_for_bug(svn_revision, identifier))
             commit_summary = 'Committed {}'.format(identifier)
             self.descriptionDone = commit_summary
             self.setProperty('build_summary', commit_summary)
@@ -4350,7 +4350,7 @@
                 self.build.addStepsAfterCurrentStep([GitResetHard(), CheckOutSource(repourl='https://git.webkit.org/git/WebKit-https'), ShowIdentifier(), UpdateWorkingDirectory(), ApplyPatch(), CreateLocalGITCommit(), PushCommitToWebKitRepo()])
                 return rc
 
-            self.setProperty('bugzilla_comment_text', self.comment_text_for_bug())
+            self.setProperty('comment_text', self.comment_text_for_bug())
             self.setProperty('build_finish_summary', 'Failed to commit to WebKit repository')
             self.build.addStepsAfterCurrentStep([CommentOnBug(), SetCommitQueueMinusFlagOnPatch()])
         return rc

Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (291307 => 291308)


--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2022-03-15 19:22:07 UTC (rev 291307)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2022-03-15 19:34:43 UTC (rev 291308)
@@ -444,7 +444,7 @@
         )
         self.expectOutcome(result=FAILURE, state_string='ChangeLog validation failed')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'ChangeLog entry in LayoutTests/ChangeLog contains OOPS!.\n')
+        self.assertEqual(self.getProperty('comment_text'), 'ChangeLog entry in LayoutTests/ChangeLog contains OOPS!.\n')
         self.assertEqual(self.getProperty('build_finish_summary'), 'ChangeLog validation failed')
         return rc
 
@@ -1271,7 +1271,7 @@
         self.setProperty('patch_id', '1234')
         self.expectOutcome(result=FAILURE, state_string='Patch 1234 does not build (failure)')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('comment_text'), None)
         self.assertEqual(self.getProperty('build_finish_summary'), 'Patch 1234 does not build')
         return rc
 
@@ -1298,7 +1298,7 @@
         self.setProperty('buildername', 'commit-queue')
         self.expectOutcome(result=FAILURE, state_string='Patch 1234 does not build (failure)')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Patch 1234 does not build')
+        self.assertEqual(self.getProperty('comment_text'), 'Patch 1234 does not build')
         self.assertEqual(self.getProperty('build_finish_summary'), 'Patch 1234 does not build')
         return rc
 
@@ -2409,7 +2409,7 @@
         self.setProperty('second_run_failures', ['test1'])
         self.expectOutcome(result=FAILURE, state_string='Found 1 new test failure: test1 (failure)')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('comment_text'), None)
         self.assertEqual(self.getProperty('build_finish_summary'), 'Found 1 new test failure: test1')
         return rc
 
@@ -2420,7 +2420,7 @@
         self.setProperty('second_run_failures', ['test1'])
         self.expectOutcome(result=FAILURE, state_string='Found 1 new test failure: test1 (failure)')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Found 1 new test failure: test1')
+        self.assertEqual(self.getProperty('comment_text'), 'Found 1 new test failure: test1')
         self.assertEqual(self.getProperty('build_finish_summary'), 'Found 1 new test failure: test1')
         return rc
 
@@ -2547,7 +2547,7 @@
         failure_message = 'Found 300 new test failures: test0, test1, test10, test100, test101, test102, test103, test104, test105, test106 ...'
         self.expectOutcome(result=FAILURE, state_string=failure_message + ' (failure)')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), failure_message)
+        self.assertEqual(self.getProperty('comment_text'), failure_message)
         self.assertEqual(self.getProperty('build_finish_summary'), failure_message)
         return rc
 
@@ -3175,7 +3175,7 @@
         )
         self.expectOutcome(result=FAILURE, state_string='svn-apply failed to apply patch to trunk')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('comment_text'), None)
         self.assertEqual(self.getProperty('build_finish_summary'), None)
         return rc
 
@@ -3200,7 +3200,7 @@
         )
         self.expectOutcome(result=FAILURE, state_string='svn-apply failed to apply patch to trunk')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Tools/Scripts/svn-apply failed to apply attachment 1234 to trunk.\nPlease resolve the conflicts and upload a new patch.')
+        self.assertEqual(self.getProperty('comment_text'), 'Tools/Scripts/svn-apply failed to apply attachment 1234 to trunk.\nPlease resolve the conflicts and upload a new patch.')
         self.assertEqual(self.getProperty('build_finish_summary'), 'Tools/Scripts/svn-apply failed to apply patch 1234 to trunk')
         return rc
 
@@ -4910,7 +4910,7 @@
         self.expectOutcome(result=SUCCESS, state_string='Found modified ChangeLogs')
         rc = self.runStep()
         self.assertEqual(self.getProperty('modified_changelogs'), ['Source/WebCore/ChangeLog', 'Tools/ChangeLog'])
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('comment_text'), None)
         self.assertEqual(self.getProperty('build_finish_summary'), None)
         return rc
 
@@ -4928,7 +4928,7 @@
         self.expectOutcome(result=SUCCESS, state_string='Found modified ChangeLogs')
         rc = self.runStep()
         self.assertEqual(self.getProperty('modified_changelogs'), ['Tools/Scripts/ChangeLog'])
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('comment_text'), None)
         self.assertEqual(self.getProperty('build_finish_summary'), None)
         return rc
 
@@ -4946,7 +4946,7 @@
         )
         self.expectOutcome(result=FAILURE, state_string='Failed to find any modified ChangeLog in Patch 1234')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Unable to find any modified ChangeLog in Attachment 1234')
+        self.assertEqual(self.getProperty('comment_text'), 'Unable to find any modified ChangeLog in Attachment 1234')
         self.assertEqual(self.getProperty('build_finish_summary'), 'Unable to find any modified ChangeLog in Patch 1234')
         return rc
 
@@ -4973,7 +4973,7 @@
         )
         self.expectOutcome(result=SUCCESS, state_string='Created local git commit')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
+        self.assertEqual(self.getProperty('comment_text'), None)
         self.assertEqual(self.getProperty('build_finish_summary'), None)
         return rc
 
@@ -4998,7 +4998,7 @@
         )
         self.expectOutcome(result=FAILURE, state_string='Failed to create git commit')
         rc = self.runStep()
-        self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Failed to create git commit for Attachment 1234')
+        self.assertEqual(self.getProperty('comment_text'), 'Failed to create git commit for Attachment 1234')
         self.assertEqual(self.getProperty('build_finish_summary'), 'Failed to create git commit for Patch 1234')
         return rc
 
@@ -5292,7 +5292,7 @@
             self.expectOutcome(result=SUCCESS, state_string='Committed 220797@main')
             with current_hostname(EWS_BUILD_HOSTNAME):
                 rc = self.runStep()
-            self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Committed r256729 (220797@main): <https://commits.webkit.org/220797@main>\n\nAll reviewed patches have been landed. Closing bug and clearing flags on attachment 1234.')
+            self.assertEqual(self.getProperty('comment_text'), 'Committed r256729 (220797@main): <https://commits.webkit.org/220797@main>\n\nAll reviewed patches have been landed. Closing bug and clearing flags on attachment 1234.')
             self.assertEqual(self.getProperty('build_finish_summary'), None)
             self.assertEqual(self.getProperty('build_summary'), 'Committed 220797@main')
             return rc
@@ -5312,7 +5312,7 @@
             self.expectOutcome(result=SUCCESS, state_string='Committed r256729')
             with current_hostname(EWS_BUILD_HOSTNAME):
                 rc = self.runStep()
-            self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Committed r256729 (?): <https://commits.webkit.org/r256729>\n\nAll reviewed patches have been landed. Closing bug and clearing flags on attachment 1234.')
+            self.assertEqual(self.getProperty('comment_text'), 'Committed r256729 (?): <https://commits.webkit.org/r256729>\n\nAll reviewed patches have been landed. Closing bug and clearing flags on attachment 1234.')
             self.assertEqual(self.getProperty('build_finish_summary'), None)
             self.assertEqual(self.getProperty('build_summary'), 'Committed r256729')
             return rc
@@ -5334,7 +5334,7 @@
                 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)
+            self.assertEqual(self.getProperty('comment_text'), None)
             return rc
 
     def test_failure(self):
@@ -5354,7 +5354,7 @@
             with current_hostname(EWS_BUILD_HOSTNAME):
                 rc = self.runStep()
             self.assertEqual(self.getProperty('build_finish_summary'), 'Failed to commit to WebKit repository')
-            self.assertEqual(self.getProperty('bugzilla_comment_text'), 'commit-queue failed to commit attachment 2345 to WebKit repository. To retry, please set cq+ flag again.')
+            self.assertEqual(self.getProperty('comment_text'), 'commit-queue failed to commit attachment 2345 to WebKit repository. To retry, please set cq+ flag again.')
             return rc

Modified: trunk/Tools/ChangeLog (291307 => 291308)


--- trunk/Tools/ChangeLog	2022-03-15 19:22:07 UTC (rev 291307)
+++ trunk/Tools/ChangeLog	2022-03-15 19:34:43 UTC (rev 291308)
@@ -1,3 +1,26 @@
+2022-03-15  Jonathan Bedard  <[email protected]>
+
+        [Merge-Queue] Rename bugzilla_comment_text
+        https://bugs.webkit.org/show_bug.cgi?id=237911
+        <rdar://problem/90319995>
+
+        Reviewed by Aakash Jain.
+
+        Rename bugzilla_comment_text to comment_text to re-use
+        code to comment on pull requests.
+
+        * CISupport/ews-build/steps.py:
+        (ApplyPatch.evaluateCommand):
+        (ValidateCommiterAndReviewer.fail_build):
+        (ValidateChangeLogAndReviewer.evaluateCommand):
+        (CommentOnBug.start):
+        (AnalyzeCompileWebKitResults.analyzeResults):
+        (AnalyzeLayoutTestsResults.report_failure):
+        (FindModifiedChangeLogs.evaluateCommand):
+        (CreateLocalGITCommit.evaluateCommand):
+        (PushCommitToWebKitRepo.evaluateCommand):
+        * CISupport/ews-build/steps_unittest.py:
+
 2022-03-15  Aditya Keerthi  <[email protected]>
 
         [iOS] Indefinite hang when printing using a UIPrintPageRenderer

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to