Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (264937 => 264938)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-07-27 18:50:44 UTC (rev 264937)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-07-27 20:05:00 UTC (rev 264938)
@@ -41,6 +41,7 @@
S3_RESULTS_URL = 'https://ews-build.s3-us-west-2.amazonaws.com/'
EWS_BUILD_URL = 'https://ews-build.webkit.org/'
EWS_URL = 'https://ews.webkit.org/'
+RESULTS_DB_URL = 'https://results.webkit.org/'
WithProperties = properties.WithProperties
Interpolate = properties.Interpolate
@@ -1398,10 +1399,11 @@
def send_email_for_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)
email_subject = 'Build failure on trunk on {}'.format(builder_name)
- email_text = 'Failed to build WebKit without patch in {}\n\nBuilder: {}'.format(build_url, builder_name)
+ email_text = 'Failed to build WebKit without patch in {}\n\nBuilder: {}\n\nWorker: {}'.format(build_url, builder_name, worker_name)
send_email_to_bot_watchers(email_subject, email_text)
except Exception as e:
print('Error in sending email for build failure: {}'.format(e))
@@ -1911,10 +1913,13 @@
def send_email_for_flaky_failure(self, test_name):
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)
+ history_url = '{}?suite=layout-tests&test={}'.format(RESULTS_DB_URL, test_name)
email_subject = 'Flaky test: {}'.format(test_name)
email_text = 'Test {} flaked in {}\n\nBuilder: {}'.format(test_name, build_url, builder_name)
+ email_text = 'Flaky test: {}\n\nBuild: {}\n\nBuilder: {}\n\nWorker: {}\n\nHistory: {}'.format(test_name, build_url, builder_name, worker_name, history_url)
send_email_to_bot_watchers(email_subject, email_text)
except Exception as e:
# Catching all exceptions here to ensure that failure to send email doesn't impact the build
@@ -2007,10 +2012,12 @@
def send_email_for_flaky_failure(self, test_name):
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)
+ history_url = '{}?suite=layout-tests&test={}'.format(RESULTS_DB_URL, test_name)
email_subject = 'Flaky test: {}'.format(test_name)
- email_text = 'Test {} flaked in {}\n\nBuilder: {}'.format(test_name, build_url, builder_name)
+ email_text = 'Flaky test: {}\n\nBuild: {}\n\nBuilder: {}\n\nWorker: {}\n\nHistory: {}'.format(test_name, build_url, builder_name, worker_name, history_url)
send_email_to_bot_watchers(email_subject, email_text)
except Exception as e:
print('Error in sending email for flaky failure: {}'.format(e))
@@ -2018,10 +2025,12 @@
def send_email_for_pre_existing_failure(self, test_name):
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)
+ history_url = '{}?suite=layout-tests&test={}'.format(RESULTS_DB_URL, test_name)
email_subject = 'Pre-existing test failure: {}'.format(test_name)
- email_text = 'Test {} failed on clean tree run in {}.\nBuilder: {}'.format(test_name, build_url, builder_name)
+ email_text = 'Test {} failed on clean tree run in {}.\n\nBuilder: {}\n\nWorker: {}\n\nHistory: {}'.format(test_name, build_url, builder_name, worker_name, history_url)
send_email_to_bot_watchers(email_subject, email_text)
except Exception as e:
print('Error in sending email for pre-existing failure: {}'.format(e))