Title: [265302] trunk/Tools
- Revision
- 265302
- Author
- [email protected]
- Date
- 2020-08-05 13:41:32 -0700 (Wed, 05 Aug 2020)
Log Message
EWS emails about build failure should include relevant error logs
https://bugs.webkit.org/show_bug.cgi?id=215174
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(AnalyzeCompileWebKitResults.start):
(AnalyzeCompileWebKitResults):
(AnalyzeCompileWebKitResults.getResults): Method to read the logs from previous build step.
(AnalyzeCompileWebKitResults.analyzeResults): Made a separate method called using deferred after reading the logs from previous steps.
(AnalyzeCompileWebKitResults.getBuildStepByName): Method to get step object from step name.
(AnalyzeCompileWebKitResults.filter_logs_containing_error): Filter the logs to include in email.
(AnalyzeCompileWebKitResults.send_email_for_preexisting_build_failure): Renamed from send_email_for_build_failure. Added
relevant error logs in email.
* BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (265301 => 265302)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-08-05 19:51:59 UTC (rev 265301)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-08-05 20:41:32 UTC (rev 265302)
@@ -1370,6 +1370,15 @@
descriptionDone = ['analyze-compile-webkit-results']
def start(self):
+ self.error_logs = {}
+ self.compile_webkit_step = CompileWebKit.name
+ if self.getProperty('group') == 'jsc':
+ self.compile_webkit_step = CompileJSC.name
+ d = self.getResults(self.compile_webkit_step)
+ d.addCallback(lambda res: self.analyzeResults())
+ return defer.succeed(None)
+
+ def analyzeResults(self):
compile_without_patch_step = CompileWebKitWithoutPatch.name
if self.getProperty('group') == 'jsc':
compile_without_patch_step = CompileJSCWithoutPatch.name
@@ -1379,7 +1388,7 @@
self.finished(FAILURE)
message = 'Unable to build WebKit without patch, retrying build'
self.descriptionDone = message
- self.send_email_for_build_failure()
+ self.send_email_for_preexisting_build_failure()
self.build.buildFinished([message], RETRY)
return defer.succeed(None)
@@ -1395,21 +1404,55 @@
else:
self.build.buildFinished([message], FAILURE)
- return defer.succeed(None)
+ @defer.inlineCallbacks
+ def getResults(self, name):
+ step = self.getBuildStepByName(name)
+ if not step:
+ defer.returnValue(None)
+ logs = yield self.master.db.logs.getLogs(step.stepid)
+ log = next((log for log in logs if log['name'] == u'errors'), None)
+ if not log:
+ defer.returnValue(None)
+
+ lastline = int(max(0, log['num_lines'] - 1))
+ logLines = yield self.master.db.logs.getLogLines(log['id'], 0, lastline)
+ if log['type'] == 's':
+ logLines = '\n'.join([line[1:] for line in logLines.splitlines()])
+
+ self.error_logs[name] = logLines
+
def getStepResult(self, step_name):
for step in self.build.executedSteps:
if step.name == step_name:
return step.results
- def send_email_for_build_failure(self):
+ def getBuildStepByName(self, step_name):
+ for step in self.build.executedSteps:
+ if step.name == step_name:
+ return step
+ return None
+
+ def filter_logs_containing_error(self, logs, max_num_lines=10):
+ if not logs:
+ return None
+ filtered_logs = []
+ for line in logs.splitlines():
+ if 'rror:' in line:
+ filtered_logs.append(line)
+ return '\n'.join(filtered_logs[:max_num_lines])
+
+ def send_email_for_preexisting_build_failure(self):
try:
builder_name = self.getProperty('buildername', '')
worker_name = self.getProperty('workername', '')
build_url = '{}#/builders/{}/builds/{}'.format(self.master.config.buildbotURL, self.build._builderid, self.build.number)
+ logs = self.filter_logs_containing_error(self.error_logs.get(self.compile_webkit_step))
email_subject = 'Build failure on trunk on {}'.format(builder_name)
email_text = 'Failed to build WebKit without patch in {}\n\nBuilder: {}\n\nWorker: {}'.format(build_url, builder_name, worker_name)
+ if logs:
+ email_text += '\n\nError lines:\n\n{}'.format(logs)
send_email_to_bot_watchers(email_subject, email_text)
except Exception as e:
print('Error in sending email for build failure: {}'.format(e))
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (265301 => 265302)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-08-05 19:51:59 UTC (rev 265301)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-08-05 20:41:32 UTC (rev 265302)
@@ -1108,7 +1108,25 @@
self.expectOutcome(result=FAILURE, state_string='Unable to build WebKit without patch, retrying build (failure)')
return self.runStep()
+ def test_filter_logs_containing_error(self):
+ logs = 'In file included from WebCore/unified-sources/UnifiedSource263.cpp:4:\nImageBufferIOSurfaceBackend.cpp:108:30: error: definition of implicitly declared destructor'
+ expected_output = 'ImageBufferIOSurfaceBackend.cpp:108:30: error: definition of implicitly declared destructor'
+ output = AnalyzeCompileWebKitResults().filter_logs_containing_error(logs)
+ self.assertEqual(expected_output, output)
+ def test_filter_logs_containing_error_with_too_many_errors(self):
+ logs = 'Error:1\nError:2\nerror:3\nerror:4\nerror:5\nrandom-string\nerror:6\nerror:7\nerror8\nerror:9\nerror:10\nerror:11\nerror:12\nerror:13'
+ expected_output = 'Error:1\nError:2\nerror:3\nerror:4\nerror:5\nerror:6\nerror:7\nerror:9\nerror:10\nerror:11'
+ output = AnalyzeCompileWebKitResults().filter_logs_containing_error(logs)
+ self.assertEqual(expected_output, output)
+
+ def test_filter_logs_containing_error_with_no_error(self):
+ logs = 'CompileC /Volumes/Data/worker/macOS-Mojave-Release-Build-EWS'
+ expected_output = ''
+ output = AnalyzeCompileWebKitResults().filter_logs_containing_error(logs)
+ self.assertEqual(expected_output, output)
+
+
class TestCompileJSC(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
Modified: trunk/Tools/ChangeLog (265301 => 265302)
--- trunk/Tools/ChangeLog 2020-08-05 19:51:59 UTC (rev 265301)
+++ trunk/Tools/ChangeLog 2020-08-05 20:41:32 UTC (rev 265302)
@@ -1,3 +1,21 @@
+2020-08-05 Aakash Jain <[email protected]>
+
+ EWS emails about build failure should include relevant error logs
+ https://bugs.webkit.org/show_bug.cgi?id=215174
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (AnalyzeCompileWebKitResults.start):
+ (AnalyzeCompileWebKitResults):
+ (AnalyzeCompileWebKitResults.getResults): Method to read the logs from previous build step.
+ (AnalyzeCompileWebKitResults.analyzeResults): Made a separate method called using deferred after reading the logs from previous steps.
+ (AnalyzeCompileWebKitResults.getBuildStepByName): Method to get step object from step name.
+ (AnalyzeCompileWebKitResults.filter_logs_containing_error): Filter the logs to include in email.
+ (AnalyzeCompileWebKitResults.send_email_for_preexisting_build_failure): Renamed from send_email_for_build_failure. Added
+ relevant error logs in email.
+ * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
+
2020-08-05 Sihui Liu <[email protected]>
TextManipulationController should observe newly inserted or displayed text
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes