Changeset 267705 in webkit
- Timestamp:
- Sep 28, 2020, 10:46:39 AM (6 years ago)
- Location:
- trunk/Tools
- Files:
-
- 6 edited
-
BuildSlaveSupport/ews-build/email_unittest.py (modified) (1 diff)
-
BuildSlaveSupport/ews-build/emails.json (modified) (2 diffs)
-
BuildSlaveSupport/ews-build/send_email.py (modified) (2 diffs)
-
BuildSlaveSupport/ews-build/steps.py (modified) (10 diffs)
-
BuildSlaveSupport/ews-build/steps_unittest.py (modified) (2 diffs)
-
ChangeLog (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/ews-build/email_unittest.py
r265817 r267705 37 37 cwd = os.path.dirname(os.path.abspath(__file__)) 38 38 emails = json.load(open(os.path.join(cwd, 'emails.json'))) 39 valid_email_categories = ['ADMIN_EMAILS', ' BOT_WATCHERS_EMAILS', 'EMAIL_IDS_TO_UNSUBSCRIBE']39 valid_email_categories = ['ADMIN_EMAILS', 'APPLE_BOT_WATCHERS_EMAILS', 'EMAIL_IDS_TO_UNSUBSCRIBE', 'IGALIA_JSC_TEAM_EMAILS', 'IGALIA_GTK_WPE_EMAILS'] 40 40 for category in valid_email_categories: 41 41 self.assertTrue(category in emails.keys()) -
trunk/Tools/BuildSlaveSupport/ews-build/emails.json
r267492 r267705 4 4 "webkit-ews-bot-watchers@group.apple.com" 5 5 ], 6 " BOT_WATCHERS_EMAILS": [6 "APPLE_BOT_WATCHERS_EMAILS": [ 7 7 "webkit-ews-bot-watchers@group.apple.com" 8 8 ], … … 10 10 "jsc32@igalia.com" 11 11 ], 12 "IGALIA_GTK_WPE_EMAILS": [ 13 "webkit-bot-admin@igalia.com" 14 ], 12 15 "EMAIL_IDS_TO_UNSUBSCRIBE": ["pnormand@igalia.com"] 13 16 } -
trunk/Tools/BuildSlaveSupport/ews-build/send_email.py
r267492 r267705 30 30 31 31 FROM_EMAIL = 'ews@webkit.org' 32 IGALIA_JSC_QUEUES_PATTERNS = ['armv7', 'mips', 'i386'] 33 IGALIA_GTK_WPE_QUEUES_PATTERNS = ['gtk', 'wpe'] 32 34 SERVER = 'localhost' 33 35 34 36 35 37 def get_email_ids(category): 36 # Valid categories: 'ADMIN_EMAILS', ' BOT_WATCHERS_EMAILS', 'EMAIL_IDS_TO_UNSUBSCRIBE'38 # Valid categories: 'ADMIN_EMAILS', 'APPLE_BOT_WATCHERS_EMAILS', 'EMAIL_IDS_TO_UNSUBSCRIBE' etc. 37 39 try: 38 40 emails = json.load(open('emails.json')) … … 79 81 80 82 81 def send_email_to_bot_watchers(subject, text, reference=''):82 send_email(get_email_ids(' BOT_WATCHERS_EMAILS'), subject, text, reference)83 84 85 def send_email_to_igalia_jsc_team(subject, text, reference=''):86 send_email(get_email_ids('IGALIA_JSC_TEAM_EMAILS'), subject, text, reference)83 def send_email_to_bot_watchers(subject, text, builder_name, reference=''): 84 send_email(get_email_ids('APPLE_BOT_WATCHERS_EMAILS'), subject, text, reference) 85 if any(pattern in builder_name.lower() for pattern in IGALIA_JSC_QUEUES_PATTERNS): 86 send_email(get_email_ids('IGALIA_JSC_TEAM_EMAILS'), subject, text, reference) 87 if any(pattern in builder_name.lower() for pattern in IGALIA_GTK_WPE_QUEUES_PATTERNS): 88 send_email(get_email_ids('IGALIA_GTK_WPE_EMAILS'), subject, text, reference) -
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
r267493 r267705 31 31 32 32 from layout_test_failures import LayoutTestFailures 33 from send_email import send_email_to_patch_author, send_email_to_bot_watchers , send_email_to_igalia_jsc_team33 from send_email import send_email_to_patch_author, send_email_to_bot_watchers 34 34 35 35 import json … … 43 43 EWS_BUILD_URL = 'https://ews-build.webkit.org/' 44 44 EWS_URL = 'https://ews.webkit.org/' 45 IGALIA_JSC_QUEUES_PATTERNS = ['armv7', 'mips', 'i386']46 45 RESULTS_DB_URL = 'https://results.webkit.org/' 47 46 WithProperties = properties.WithProperties … … 1549 1548 logs = logs.replace('&', '&').replace('<', '<').replace('>', '>') 1550 1549 email_text += u'\n\nError lines:\n\n<code>{}</code>'.format(logs) 1551 send_email_to_bot_watchers(email_subject, email_text, 'preexisting-build-failure-{}-{}'.format(builder_name, date.today().strftime("%Y-%d-%m"))) 1552 if any(pattern in builder_name.lower() for pattern in IGALIA_JSC_QUEUES_PATTERNS): 1553 send_email_to_igalia_jsc_team(email_subject, email_text, 'preexisting-build-failure-{}-{}'.format(builder_name, date.today().strftime("%Y-%d-%m"))) 1550 reference = 'preexisting-build-failure-{}-{}'.format(builder_name, date.today().strftime("%Y-%d-%m")) 1551 send_email_to_bot_watchers(email_subject, email_text, builder_name, reference) 1554 1552 except Exception as e: 1555 1553 print('Error in sending email for build failure: {}'.format(e)) … … 1801 1799 email_subject = u'Flaky test: {}'.format(test_name) 1802 1800 email_text = 'Flaky test: {}\n\nBuild: {}\n\nBuilder: {}\n\nWorker: {}\n\nHistory: {}'.format(test_name, build_url, builder_name, worker_name, history_url) 1803 send_email_to_bot_watchers(email_subject, email_text, 'flaky-{}'.format(test_name))1801 send_email_to_bot_watchers(email_subject, email_text, builder_name, 'flaky-{}'.format(test_name)) 1804 1802 except Exception as e: 1805 1803 print('Error in sending email for flaky failure: {}'.format(e)) … … 1814 1812 email_subject = u'Pre-existing test failure: {}'.format(test_name) 1815 1813 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) 1816 send_email_to_bot_watchers(email_subject, email_text, 'preexisting-{}'.format(test_name)) 1817 if any(pattern in builder_name.lower() for pattern in IGALIA_JSC_QUEUES_PATTERNS): 1818 send_email_to_igalia_jsc_team(email_subject, email_text, 'preexisting-{}'.format(test_name)) 1814 send_email_to_bot_watchers(email_subject, email_text, builder_name, 'preexisting-{}'.format(test_name)) 1819 1815 except Exception as e: 1820 1816 print('Error in sending email for pre-existing failure: {}'.format(e)) … … 2102 2098 email_text = 'Test {} flaked in {}\n\nBuilder: {}'.format(test_name, build_url, builder_name) 2103 2099 email_text = 'Flaky test: {}\n\nBuild: {}\n\nBuilder: {}\n\nWorker: {}\n\nHistory: {}'.format(test_name, build_url, builder_name, worker_name, history_url) 2104 send_email_to_bot_watchers(email_subject, email_text, 'flaky-{}'.format(test_name))2100 send_email_to_bot_watchers(email_subject, email_text, builder_name, 'flaky-{}'.format(test_name)) 2105 2101 except Exception as e: 2106 2102 # Catching all exceptions here to ensure that failure to send email doesn't impact the build … … 2211 2207 email_subject = u'Flaky test: {}'.format(test_name) 2212 2208 email_text = 'Flaky test: {}\n\nBuild: {}\n\nBuilder: {}\n\nWorker: {}\n\nHistory: {}'.format(test_name, build_url, builder_name, worker_name, history_url) 2213 send_email_to_bot_watchers(email_subject, email_text, 'flaky-{}'.format(test_name))2209 send_email_to_bot_watchers(email_subject, email_text, builder_name, 'flaky-{}'.format(test_name)) 2214 2210 except Exception as e: 2215 2211 print('Error in sending email for flaky failure: {}'.format(e)) … … 2224 2220 email_subject = u'Pre-existing test failure: {}'.format(test_name) 2225 2221 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) 2226 send_email_to_bot_watchers(email_subject, email_text, 'preexisting-{}'.format(test_name))2222 send_email_to_bot_watchers(email_subject, email_text, builder_name, 'preexisting-{}'.format(test_name)) 2227 2223 except Exception as e: 2228 2224 print('Error in sending email for pre-existing failure: {}'.format(e)) … … 2678 2674 email_subject = u'Flaky test: {}'.format(test_name) 2679 2675 email_text = 'Flaky test: {}\n\nBuild: {}\n\nBuilder: {}\n\nWorker: {}\n\nHistory: {}'.format(test_name, build_url, builder_name, worker_name, history_url) 2680 send_email_to_bot_watchers(email_subject, email_text, 'flaky-{}'.format(test_name))2676 send_email_to_bot_watchers(email_subject, email_text, builder_name, 'flaky-{}'.format(test_name)) 2681 2677 except Exception as e: 2682 2678 print('Error in sending email for flaky failure: {}'.format(e)) … … 2691 2687 email_subject = u'Pre-existing test failure: {}'.format(test_name) 2692 2688 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) 2693 send_email_to_bot_watchers(email_subject, email_text, 'preexisting-{}'.format(test_name))2689 send_email_to_bot_watchers(email_subject, email_text, builder_name, 'preexisting-{}'.format(test_name)) 2694 2690 except Exception as e: 2695 2691 print('Error in sending email for pre-existing failure: {}'.format(e)) -
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
r267052 r267705 53 53 UploadTestResults, ValidateCommiterAndReviewer, ValidatePatch) 54 54 55 import send_email56 send_email.BOT_WATCHERS_EMAILS = []57 58 55 # Workaround for https://github.com/buildbot/buildbot/issues/4669 59 56 from buildbot.test.fake.fakebuild import FakeBuild … … 1454 1451 self.setProperty('jsc_clean_tree_stress_test_failures', []) 1455 1452 self.setProperty('jsc_clean_tree_binary_failures', []) 1453 AnalyzeJSCTestsResults.send_email_for_flaky_failure = lambda self, test: None 1454 AnalyzeJSCTestsResults.send_email_for_pre_existing_failure = lambda self, test: None 1456 1455 1457 1456 def test_single_new_stress_failure(self): -
trunk/Tools/ChangeLog
r267704 r267705 1 2020-09-28 Aakash Jain <aakash_jain@apple.com> 2 3 Notify igalia team about pre-existing test failures and build failures for WPE and GTK queues 4 https://bugs.webkit.org/show_bug.cgi?id=217052 5 6 Reviewed by Jonathan Bedard. 7 8 * BuildSlaveSupport/ews-build/send_email.py: 9 (send_email_to_bot_watchers): Moved the logic here to determine whether to email igalia folks. 10 * BuildSlaveSupport/ews-build/steps.py: 11 (AnalyzeCompileWebKitResults.send_email_for_preexisting_build_failure): Passed builder_name parameter. 12 (AnalyzeJSCTestsResults.send_email_for_flaky_failure): 13 (AnalyzeJSCTestsResults.send_email_for_pre_existing_failure): 14 (ReRunWebKitTests.send_email_for_flaky_failure): 15 (AnalyzeLayoutTestsResults.send_email_for_flaky_failure): 16 (AnalyzeLayoutTestsResults.send_email_for_pre_existing_failure): 17 (AnalyzeAPITestsResults.send_email_for_flaky_failure): 18 (AnalyzeAPITestsResults.send_email_for_pre_existing_failure): 19 * BuildSlaveSupport/ews-build/steps_unittest.py: 20 (TestAnalyzeJSCTestsResults.configureStep): Drive-by fix to improve unit-test. 21 * BuildSlaveSupport/ews-build/emails.json: Added IGALIA_GTK_WPE_EMAILS. Renamed BOT_WATCHERS_EMAILS to APPLE_BOT_WATCHERS_EMAILS. 22 * BuildSlaveSupport/ews-build/email_unittest.py: Updated unit-test. 23 1 24 2020-09-28 Matt Lewis <jlewis3@apple.com> 2 25
Note:
See TracChangeset
for help on using the changeset viewer.