- Revision
- 275282
- Author
- aakash_j...@apple.com
- Date
- 2021-03-31 09:03:32 -0700 (Wed, 31 Mar 2021)
Log Message
Add a fast-cq mode for commit-queue which will skip build and test
https://bugs.webkit.org/show_bug.cgi?id=223954
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py: Enable fast-cq mode when patch name on bugzilla starts with [fast-cq].
(BugzillaMixin):
(BugzillaMixin._is_patch_obsolete):
(CompileWebKit.doStepIf): Skip building on commit-queue when fast_commit_queue property is set.
(RunWebKitTests.doStepIf): Skip testing on commit-queue when fast_commit_queue property is set.
* CISupport/ews-build/steps_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (275281 => 275282)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-03-31 15:40:46 UTC (rev 275281)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-03-31 16:03:32 UTC (rev 275282)
@@ -517,6 +517,7 @@
bug_open_statuses = ['UNCONFIRMED', 'NEW', 'ASSIGNED', 'REOPENED']
bug_closed_statuses = ['RESOLVED', 'VERIFIED', 'CLOSED']
revert_preamble = 'REVERT of r'
+ fast_cq_preamble = '[fast-cq]'
@defer.inlineCallbacks
def _addToLog(self, logName, message):
@@ -594,8 +595,8 @@
patch_author = patch_json.get('creator')
self.setProperty('patch_author', patch_author)
patch_title = patch_json.get('summary')
- if patch_title.startswith(self.revert_preamble):
- self.setProperty('revert', True)
+ if patch_title.lower().startswith((self.revert_preamble, self.fast_cq_preamble)):
+ self.setProperty('fast_commit_queue', True)
if self.addURLs:
self.addURL('Patch by: {}'.format(patch_author), '')
return patch_json.get('is_obsolete')
@@ -1504,7 +1505,7 @@
super(CompileWebKit, self).__init__(logEnviron=False, **kwargs)
def doStepIf(self, step):
- return not (self.getProperty('revert') and self.getProperty('buildername', '').lower() == 'commit-queue')
+ return not (self.getProperty('fast_commit_queue') and self.getProperty('buildername', '').lower() == 'commit-queue')
def start(self):
platform = self.getProperty('platform')
@@ -2083,7 +2084,7 @@
def doStepIf(self, step):
return not ((self.getProperty('buildername', '').lower() == 'commit-queue') and
- (self.getProperty('revert') or self.getProperty('passed_mac_wk2')))
+ (self.getProperty('fast_commit_queue') or self.getProperty('passed_mac_wk2')))
def setLayoutTestCommand(self):
platform = self.getProperty('platform')
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (275281 => 275282)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-03-31 15:40:46 UTC (rev 275281)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-03-31 16:03:32 UTC (rev 275282)
@@ -1085,7 +1085,7 @@
self.setupStep(CompileWebKit())
self.setProperty('buildername', 'Commit-Queue')
self.setProperty('configuration', 'debug')
- self.setProperty('revert', True)
+ self.setProperty('fast_commit_queue', True)
self.expectOutcome(result=SKIPPED, state_string='Compiled WebKit (skipped)')
return self.runStep()
@@ -1685,7 +1685,7 @@
self.setProperty('buildername', 'Commit-Queue')
self.setProperty('fullPlatform', 'mac')
self.setProperty('configuration', 'debug')
- self.setProperty('revert', True)
+ self.setProperty('fast_commit_queue', True)
self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
return self.runStep()
@@ -2108,7 +2108,7 @@
self.setProperty('buildername', 'Commit-Queue')
self.setProperty('fullPlatform', 'mac')
self.setProperty('configuration', 'debug')
- self.setProperty('revert', True)
+ self.setProperty('fast_commit_queue', True)
self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
return self.runStep()
Modified: trunk/Tools/ChangeLog (275281 => 275282)
--- trunk/Tools/ChangeLog 2021-03-31 15:40:46 UTC (rev 275281)
+++ trunk/Tools/ChangeLog 2021-03-31 16:03:32 UTC (rev 275282)
@@ -1,3 +1,17 @@
+2021-03-31 Aakash Jain <aakash_j...@apple.com>
+
+ Add a fast-cq mode for commit-queue which will skip build and test
+ https://bugs.webkit.org/show_bug.cgi?id=223954
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py: Enable fast-cq mode when patch name on bugzilla starts with [fast-cq].
+ (BugzillaMixin):
+ (BugzillaMixin._is_patch_obsolete):
+ (CompileWebKit.doStepIf): Skip building on commit-queue when fast_commit_queue property is set.
+ (RunWebKitTests.doStepIf): Skip testing on commit-queue when fast_commit_queue property is set.
+ * CISupport/ews-build/steps_unittest.py:
+
2021-03-31 Youenn Fablet <you...@apple.com>
Apply permission policy to geolocation
