[webkit-changes] [255686] trunk/Tools
Title: [255686] trunk/Tools
Revision 255686
Author aakash_j...@apple.com
Date 2020-02-04 11:01:40 -0800 (Tue, 04 Feb 2020)
Log Message
[EWS] Do not remove TestWebKitAPI prefix from api test failures
https://bugs.webkit.org/show_bug.cgi?id=207210
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(AnalyzeAPITestsResults.analyzeResults):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (255685 => 255686)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-04 18:43:38 UTC (rev 255685)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-04 19:01:40 UTC (rev 255686)
@@ -1792,10 +1792,10 @@
failures_with_patch = first_run_failures.intersection(second_run_failures)
flaky_failures = first_run_failures.union(second_run_failures) - first_run_failures.intersection(second_run_failures)
-flaky_failures_string = ', '.join([failure_name.replace('TestWebKitAPI.', '') for failure_name in flaky_failures])
+flaky_failures_string = ', '.join(flaky_failures)
new_failures = failures_with_patch - clean_tree_failures
new_failures_to_display = list(new_failures)[:self.NUM_API_FAILURES_TO_DISPLAY]
-new_failures_string = ', '.join([failure_name.replace('TestWebKitAPI.', '') for failure_name in new_failures_to_display])
+new_failures_string = ', '.join(new_failures_to_display)
self._addToLog('stderr', '\nFailures in API Test first run: {}'.format(first_run_failures))
self._addToLog('stderr', '\nFailures in API Test second run: {}'.format(second_run_failures))
Modified: trunk/Tools/ChangeLog (255685 => 255686)
--- trunk/Tools/ChangeLog 2020-02-04 18:43:38 UTC (rev 255685)
+++ trunk/Tools/ChangeLog 2020-02-04 19:01:40 UTC (rev 255686)
@@ -1,5 +1,15 @@
2020-02-04 Aakash Jain
+[EWS] Do not remove TestWebKitAPI prefix from api test failures
+https://bugs.webkit.org/show_bug.cgi?id=207210
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(AnalyzeAPITestsResults.analyzeResults):
+
+2020-02-04 Aakash Jain
+
[EWS] Do not remove webkitpy prefix from test failures
https://bugs.webkit.org/show_bug.cgi?id=207206
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [256026] trunk/Tools
Title: [256026] trunk/Tools
Revision 256026
Author aakash_j...@apple.com
Date 2020-02-07 09:07:34 -0800 (Fri, 07 Feb 2020)
Log Message
[ews] add commit-queue build step to clear flags on patch
https://bugs.webkit.org/show_bug.cgi?id=206536
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(BugzillaMixin): Class for common bugzilla related methods.
(BugzillaMixin.get_bugzilla_api_key): Method to read bugzilla api key from file.
(BugzillaMixin.remove_flags_on_patch): Method to remove flags on patch.
(ValidatePatch):
(RemoveFlagsOnPatch): Class to remove flags on patch.
(RemoveFlagsOnPatch.start):
(ValidatePatch._addToLog): Moved.
(ValidatePatch.fetch_data_from_url): Moved.
(ValidatePatch.get_patch_json): Moved.
(ValidatePatch.get_bug_json): Moved.
(ValidatePatch.get_bug_id_from_patch): Moved.
(ValidatePatch._is_patch_obsolete): Moved.
(ValidatePatch._is_patch_review_denied): Moved.
(ValidatePatch._is_patch_cq_plus): Moved.
(ValidatePatch._is_bug_closed): Moved.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (256025 => 256026)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-07 16:50:17 UTC (rev 256025)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-07 17:07:34 UTC (rev 256026)
@@ -321,23 +321,11 @@
return None
-class ValidatePatch(buildstep.BuildStep):
-name = 'validate-patch'
-description = ['validate-patch running']
-descriptionDone = ['Validated patch']
-flunkOnFailure = True
-haltOnFailure = True
+class BugzillaMixin(object):
+addURLs = False
bug_open_statuses = ['UNCONFIRMED', 'NEW', 'ASSIGNED', 'REOPENED']
bug_closed_statuses = ['RESOLVED', 'VERIFIED', 'CLOSED']
-def __init__(self, verifyObsolete=True, verifyBugClosed=True, verifyReviewDenied=True, addURLs=True, verifycqplus=False):
-self.verifyObsolete = verifyObsolete
-self.verifyBugClosed = verifyBugClosed
-self.verifyReviewDenied = verifyReviewDenied
-self.verifycqplus = verifycqplus
-self.addURLs = addURLs
-buildstep.BuildStep.__init__(self)
-
@defer.inlineCallbacks
def _addToLog(self, logName, message):
try:
@@ -442,6 +430,36 @@
return 1
return 0
+def get_bugzilla_api_key(self):
+passwords = json.load(open('passwords.json'))
+return passwords['BUGZILLA_API_KEY']
+
+def remove_flags_on_patch(self, patch_id):
+patch_url = '{}rest/bug/attachment/{}'.format(BUG_SERVER_URL, patch_id)
+flags = [{'name': 'review', 'status': 'X'}, {'name': 'commit-queue', 'status': 'X'}]
+try:
+response = requests.put(patch_url, json={'flags': flags, 'Bugzilla_api_key': self.get_bugzilla_api_key()})
+except Exception as e:
+self._addToLog('stdio', 'Error in removing flags on Patch {}'.format(patch_id))
+return FAILURE
+return SUCCESS
+
+
+class ValidatePatch(buildstep.BuildStep, BugzillaMixin):
+name = 'validate-patch'
+description = ['validate-patch running']
+descriptionDone = ['Validated patch']
+flunkOnFailure = True
+haltOnFailure = True
+
+def __init__(self, verifyObsolete=True, verifyBugClosed=True, verifyReviewDenied=True, addURLs=True, verifycqplus=False):
+self.verifyObsolete = verifyObsolete
+self.verifyBugClosed = verifyBugClosed
+self.verifyReviewDenied = verifyReviewDenied
+self.verifycqplus = verifycqplus
+self.addURLs = addURLs
+buildstep.BuildStep.__init__(self)
+
def getResultSummary(self):
if self.results == FAILURE:
return {u'step': unicode(self.descriptionDone)}
@@ -501,6 +519,29 @@
return None
+class RemoveFlagsOnPatch(buildstep.BuildStep, BugzillaMixin):
+name = 'remove-flags-from-patch'
+flunkOnFailure = False
+haltOnFailure = False
+
+def start(self):
+patch_id = self.getProperty('patch_id', '')
+if not patch_id:
+self._addToLog('stdio', 'patch_id build property not found.\n')
+self.descriptionDone = 'No patch id found'
+self.finished(FAILURE)
+return None
+
+rc = self.remove_flags_on_patch(patch_id)
+self.finished(rc)
+return None
+
+def getResultSummary(self):
+if self.results == SUCCESS:
+return {u'step': u'Removed flags on bugzilla patch'}
+return {u'step': u'Failed to remove flags on bugzilla patch'}
+
+
class UnApplyPatchIfRequired(CleanWorkingDirectory):
name = 'unapply-patch'
descriptionDone = ['Unapplied patch']
Modified: trunk/Tools/ChangeLog (256025 => 256026)
--- trunk/Tools/ChangeLog 2020-02-07 16:50:17 UTC (rev 256025)
+++ trunk/Tools/ChangeLog 2020-02-07 17:07:34 UTC (rev 256026)
@@ -1,3 +1,27 @@
+2020-02-05 Aakash Jain
+
+[ews] add commit-queue build step to
[webkit-changes] [256031] trunk/Tools
Title: [256031] trunk/Tools
Revision 256031
Author aakash_j...@apple.com
Date 2020-02-07 10:13:18 -0800 (Fri, 07 Feb 2020)
Log Message
[ews] add commit-queue build step to close the bug
https://bugs.webkit.org/show_bug.cgi?id=207387
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(BugzillaMixin.close_bug): Method to close the bugzilla bug.
(CloseBug): Build step to close bugzilla bug.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (256030 => 256031)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-07 18:10:04 UTC (rev 256030)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-07 18:13:18 UTC (rev 256031)
@@ -444,7 +444,16 @@
return FAILURE
return SUCCESS
+def close_bug(self, bug_id):
+bug_url = '{}rest/bug/{}'.format(BUG_SERVER_URL, bug_id)
+try:
+response = requests.put(bug_url, json={'status': 'RESOLVED', 'resolution': 'FIXED', 'Bugzilla_api_key': self.get_bugzilla_api_key()})
+except Exception as e:
+self._addToLog('stdio', 'Error in closing bug {}'.format(bug_id))
+return FAILURE
+return SUCCESS
+
class ValidatePatch(buildstep.BuildStep, BugzillaMixin):
name = 'validate-patch'
description = ['validate-patch running']
@@ -542,6 +551,29 @@
return {u'step': u'Failed to remove flags on bugzilla patch'}
+class CloseBug(buildstep.BuildStep, BugzillaMixin):
+name = 'close-bugzilla-bug'
+flunkOnFailure = False
+haltOnFailure = False
+
+def start(self):
+self.bug_id = self.getProperty('bug_id', '')
+if not self.bug_id:
+self._addToLog('stdio', 'bug_id build property not found.\n')
+self.descriptionDone = 'No bug id found'
+self.finished(FAILURE)
+return None
+
+rc = self.close_bug(self.bug_id)
+self.finished(rc)
+return None
+
+def getResultSummary(self):
+if self.results == SUCCESS:
+return {u'step': u'Closed bug {}'.format(self.bug_id)}
+return {u'step': u'Failed to close bug {}'.format(self.bug_id)}
+
+
class UnApplyPatchIfRequired(CleanWorkingDirectory):
name = 'unapply-patch'
descriptionDone = ['Unapplied patch']
Modified: trunk/Tools/ChangeLog (256030 => 256031)
--- trunk/Tools/ChangeLog 2020-02-07 18:10:04 UTC (rev 256030)
+++ trunk/Tools/ChangeLog 2020-02-07 18:13:18 UTC (rev 256031)
@@ -1,3 +1,14 @@
+2020-02-07 Aakash Jain
+
+[ews] add commit-queue build step to close the bug
+https://bugs.webkit.org/show_bug.cgi?id=207387
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(BugzillaMixin.close_bug): Method to close the bugzilla bug.
+(CloseBug): Build step to close bugzilla bug.
+
2020-02-05 Aakash Jain
[ews] add commit-queue build step to clear flags on patch
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [256206] trunk/Tools
Title: [256206] trunk/Tools
Revision 256206
Author aakash_j...@apple.com
Date 2020-02-10 13:14:39 -0800 (Mon, 10 Feb 2020)
Log Message
[ews] Use SetBuildSummary instead of buildFinished in Layout tests
https://bugs.webkit.org/show_bug.cgi?id=207492
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(RunWebKitTests.evaluateCommand):
(ReRunWebKitTests.evaluateCommand):
(AnalyzeLayoutTestsResults.report_pre_existing_failures):
* BuildSlaveSupport/ews-build/factories.py:
(TestFactory.__init__):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/factories.py
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (256205 => 256206)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2020-02-10 21:06:45 UTC (rev 256205)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2020-02-10 21:14:39 UTC (rev 256206)
@@ -113,6 +113,7 @@
self.addStep(KillOldProcesses())
if self.LayoutTestClass:
self.addStep(self.LayoutTestClass())
+self.addStep(SetBuildSummary())
if self.APITestClass:
self.addStep(self.APITestClass())
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (256205 => 256206)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-10 21:06:45 UTC (rev 256205)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-10 21:14:39 UTC (rev 256206)
@@ -1434,7 +1434,7 @@
message = 'Passed layout tests'
self.descriptionDone = message
self.build.results = SUCCESS
-self.build.buildFinished([message], SUCCESS)
+self.setProperty('build_summary', message)
else:
self.build.addStepsAfterCurrentStep([
ArchiveTestResults(),
@@ -1475,7 +1475,7 @@
self.build.results = SUCCESS
if not first_results_did_exceed_test_failure_limit:
message = 'Found flaky tests: {}'.format(flaky_failures_string)
-self.build.buildFinished([message], SUCCESS)
+self.setProperty('build_summary', message)
else:
self.setProperty('patchFailedTests', True)
self.build.addStepsAfterCurrentStep([ArchiveTestResults(),
@@ -1545,7 +1545,7 @@
pluralSuffix = 's' if len(clean_tree_failures) > 1 else ''
clean_tree_failures_string = ', '.join([failure_name for failure_name in clean_tree_failures])
message = 'Found {} pre-existing test failure{}: {}'.format(len(clean_tree_failures), pluralSuffix, clean_tree_failures_string)
-self.build.buildFinished([message], SUCCESS)
+self.setProperty('build_summary', message)
return defer.succeed(None)
def retry_build(self, message=''):
Modified: trunk/Tools/ChangeLog (256205 => 256206)
--- trunk/Tools/ChangeLog 2020-02-10 21:06:45 UTC (rev 256205)
+++ trunk/Tools/ChangeLog 2020-02-10 21:14:39 UTC (rev 256206)
@@ -1,3 +1,17 @@
+2020-02-10 Aakash Jain
+
+[ews] Use SetBuildSummary instead of buildFinished in Layout tests
+https://bugs.webkit.org/show_bug.cgi?id=207492
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(RunWebKitTests.evaluateCommand):
+(ReRunWebKitTests.evaluateCommand):
+(AnalyzeLayoutTestsResults.report_pre_existing_failures):
+* BuildSlaveSupport/ews-build/factories.py:
+(TestFactory.__init__):
+
2020-02-10 Truitt Savell
Unreviewed, rolling out r256091.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [256212] trunk/Tools
Title: [256212] trunk/Tools
Revision 256212
Author aakash_j...@apple.com
Date 2020-02-10 14:08:58 -0800 (Mon, 10 Feb 2020)
Log Message
[ews] Display flaky layout test names in build summary
https://bugs.webkit.org/show_bug.cgi?id=207504
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(ReRunWebKitTests.evaluateCommand): Drive-by fix to correct the pluralization.
(AnalyzeLayoutTestsResults.report_pre_existing_failures): Append the flaky failure information.
(AnalyzeLayoutTestsResults.start):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (256211 => 256212)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-10 22:08:49 UTC (rev 256211)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-10 22:08:58 UTC (rev 256212)
@@ -1474,7 +1474,8 @@
self.descriptionDone = message
self.build.results = SUCCESS
if not first_results_did_exceed_test_failure_limit:
-message = 'Found flaky tests: {}'.format(flaky_failures_string)
+pluralSuffix = 's' if len(flaky_failures) > 1 else ''
+message = 'Found flaky test{}: {}'.format(pluralSuffix, flaky_failures_string)
self.setProperty('build_summary', message)
else:
self.setProperty('patchFailedTests', True)
@@ -1538,13 +1539,19 @@
self.build.buildFinished([message], FAILURE)
return defer.succeed(None)
-def report_pre_existing_failures(self, clean_tree_failures):
+def report_pre_existing_failures(self, clean_tree_failures, flaky_failures):
self.finished(SUCCESS)
self.build.results = SUCCESS
self.descriptionDone = 'Passed layout tests'
-pluralSuffix = 's' if len(clean_tree_failures) > 1 else ''
-clean_tree_failures_string = ', '.join([failure_name for failure_name in clean_tree_failures])
-message = 'Found {} pre-existing test failure{}: {}'.format(len(clean_tree_failures), pluralSuffix, clean_tree_failures_string)
+message = ''
+if clean_tree_failures:
+clean_tree_failures_string = ', '.join([failure_name for failure_name in clean_tree_failures])
+pluralSuffix = 's' if len(clean_tree_failures) > 1 else ''
+message = 'Found {} pre-existing test failure{}: {}'.format(len(clean_tree_failures), pluralSuffix, clean_tree_failures_string)
+if flaky_failures:
+flaky_failures_string = ', '.join(flaky_failures)
+pluralSuffix = 's' if len(flaky_failures) > 1 else ''
+message += ' Found flaky test{}: {}'.format(pluralSuffix, flaky_failures_string)
self.setProperty('build_summary', message)
return defer.succeed(None)
@@ -1569,6 +1576,7 @@
second_results_failing_tests = set(self.getProperty('second_run_failures', []))
clean_tree_results_did_exceed_test_failure_limit = self.getProperty('clean_tree_results_exceed_failure_limit')
clean_tree_results_failing_tests = set(self.getProperty('clean_tree_run_failures', []))
+flaky_failures = first_results_failing_tests.union(second_results_failing_tests) - first_results_failing_tests.intersection(second_results_failing_tests)
if first_results_did_exceed_test_failure_limit and second_results_did_exceed_test_failure_limit:
if (len(first_results_failing_tests) - len(clean_tree_results_failing_tests)) <= 5:
@@ -1612,7 +1620,7 @@
# At this point we know that at least one test flaked, but no consistent failures
# were introduced. This is a bit of a grey-zone. It's possible that the patch introduced some flakiness.
# We still mark the build as SUCCESS.
-return self.report_pre_existing_failures(clean_tree_results_failing_tests)
+return self.report_pre_existing_failures(clean_tree_results_failing_tests, flaky_failures)
if clean_tree_results_did_exceed_test_failure_limit:
return self.retry_build()
@@ -1623,7 +1631,7 @@
# At this point, we know that the first and second runs had the exact same failures,
# and that those failures are all present on the clean tree, so we can say with certainty
# that the patch is good.
-return self.report_pre_existing_failures(clean_tree_results_failing_tests)
+return self.report_pre_existing_failures(clean_tree_results_failing_tests, flaky_failures)
class RunWebKit1Tests(RunWebKitTests):
Modified: trunk/Tools/ChangeLog (256211 => 256212)
--- trunk/Tools/ChangeLog 2020-02-10 22:08:49 UTC (rev 256211)
+++ trunk/Tools/ChangeLog 2020-02-10 22:08:58 UTC (rev 256212)
@@ -1,5 +1,17 @@
2020-02-10 Aakash Jain
+[ews] Display flaky layout test names in build summary
+https://bugs.webkit.org/show_bug.cgi?id=207504
+
+Reviewed by Jonathan Bedard.
+
+
[webkit-changes] [256729] trunk/Tools
Title: [256729] trunk/Tools Revision 256729 Author aakash_j...@apple.com Date 2020-02-17 07:09:42 -0800 (Mon, 17 Feb 2020) Log Message [ews] add SetBuildSummary step for Windows EWS https://bugs.webkit.org/show_bug.cgi?id=207556 Reviewed by Jonathan Bedard. * BuildSlaveSupport/ews-build/factories.py: (WindowsFactory.__init__): (GTKBuildAndTestFactory.__init__): * BuildSlaveSupport/ews-build/factories_unittest.py: (TestBuildAndTestsFactory.test_windows_factory): Added unit-test. Modified Paths trunk/Tools/BuildSlaveSupport/ews-build/factories.py trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (256728 => 256729) --- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2020-02-17 12:07:08 UTC (rev 256728) +++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2020-02-17 15:09:42 UTC (rev 256729) @@ -158,6 +158,7 @@ self.addStep(CompileWebKit(skipUpload=True)) self.addStep(ValidatePatch(verifyBugClosed=False, addURLs=False)) self.addStep(RunWebKit1Tests()) +self.addStep(SetBuildSummary()) class WinCairoFactory(Factory): @@ -185,6 +186,7 @@ self.addStep(ValidatePatch(verifyBugClosed=False, addURLs=False)) if self.LayoutTestClass: self.addStep(self.LayoutTestClass()) +self.addStep(SetBuildSummary()) if self.APITestClass: self.addStep(self.APITestClass()) Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py (256728 => 256729) --- trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py 2020-02-17 12:07:08 UTC (rev 256728) +++ trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py 2020-02-17 15:09:42 UTC (rev 256729) @@ -154,3 +154,21 @@ _BuildStepFactory(steps.RunResultsdbpyTests), _BuildStepFactory(steps.RunBuildWebKitOrgUnitTests), ]) + + +class TestBuildAndTestsFactory(TestCase): +def test_windows_factory(self): +factory = factories.WindowsFactory(platform='win', configuration='release', architectures=["x86_64"]) +self.assertBuildSteps(factory.steps, [ +_BuildStepFactory(steps.ConfigureBuild, platform='win', configuration='release', architectures=["x86_64"], buildOnly=False, triggers=None, remotes=None, additionalArguments=None), +_BuildStepFactory(steps.ValidatePatch, verifycqplus=False), +_BuildStepFactory(steps.PrintConfiguration), +_BuildStepFactory(steps.CheckOutSource), +_BuildStepFactory(steps.CheckOutSpecificRevision), +_BuildStepFactory(steps.ApplyPatch), +_BuildStepFactory(steps.KillOldProcesses), +_BuildStepFactory(steps.CompileWebKit, skipUpload=True), +_BuildStepFactory(steps.ValidatePatch, verifyBugClosed=False, addURLs=False), +_BuildStepFactory(steps.RunWebKit1Tests), +_BuildStepFactory(steps.SetBuildSummary), +]) Modified: trunk/Tools/ChangeLog (256728 => 256729) --- trunk/Tools/ChangeLog 2020-02-17 12:07:08 UTC (rev 256728) +++ trunk/Tools/ChangeLog 2020-02-17 15:09:42 UTC (rev 256729) @@ -1,3 +1,16 @@ +2020-02-17 Aakash Jain + +[ews] add SetBuildSummary step for Windows EWS +https://bugs.webkit.org/show_bug.cgi?id=207556 + +Reviewed by Jonathan Bedard. + +* BuildSlaveSupport/ews-build/factories.py: +(WindowsFactory.__init__): +(GTKBuildAndTestFactory.__init__): +* BuildSlaveSupport/ews-build/factories_unittest.py: +(TestBuildAndTestsFactory.test_windows_factory): Added unit-test. + 2020-02-17 Alberto Garcia [WPE] Change the QML plugin install path ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [256737] trunk/Tools
Title: [256737] trunk/Tools
Revision 256737
Author aakash_j...@apple.com
Date 2020-02-17 08:48:00 -0800 (Mon, 17 Feb 2020)
Log Message
EWS should be able to comment on Bugzilla
https://bugs.webkit.org/show_bug.cgi?id=201927
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(BugzillaMixin.comment_on_bug): Method to comment on bugzilla bug.
(BugzillaMixin.remove_flags_on_patch): Drive-by fix to correctly identify failure based on status code.
(BugzillaMixin.close_bug): Ditto.
(CommentOnBug): Build step to comment on bugzilla bug.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (256736 => 256737)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-17 16:45:29 UTC (rev 256736)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-17 16:48:00 UTC (rev 256737)
@@ -439,6 +439,9 @@
flags = [{'name': 'review', 'status': 'X'}, {'name': 'commit-queue', 'status': 'X'}]
try:
response = requests.put(patch_url, json={'flags': flags, 'Bugzilla_api_key': self.get_bugzilla_api_key()})
+if response.status_code not in [200, 201]:
+self._addToLog('stdio', 'Unable to remove flags on patch {}. Unexpected response code from bugzilla: {}'.format(patch_id, response.status_code))
+return FAILURE
except Exception as e:
self._addToLog('stdio', 'Error in removing flags on Patch {}'.format(patch_id))
return FAILURE
@@ -448,12 +451,29 @@
bug_url = '{}rest/bug/{}'.format(BUG_SERVER_URL, bug_id)
try:
response = requests.put(bug_url, json={'status': 'RESOLVED', 'resolution': 'FIXED', 'Bugzilla_api_key': self.get_bugzilla_api_key()})
+if response.status_code not in [200, 201]:
+self._addToLog('stdio', 'Unable to close bug {}. Unexpected response code from bugzilla: {}'.format(bug_id, response.status_code))
+return FAILURE
except Exception as e:
self._addToLog('stdio', 'Error in closing bug {}'.format(bug_id))
return FAILURE
return SUCCESS
+def comment_on_bug(self, bug_id, comment_text):
+bug_comment_url = '{}rest/bug/{}/comment'.format(BUG_SERVER_URL, bug_id)
+if not comment_text:
+return FAILURE
+try:
+response = requests.post(bug_comment_url, data="" comment_text, 'Bugzilla_api_key': self.get_bugzilla_api_key()})
+if response.status_code not in [200, 201]:
+self._addToLog('stdio', 'Unable to comment on bug {}. Unexpected response code from bugzilla: {}'.format(bug_id, response.status_code))
+return FAILURE
+except Exception as e:
+self._addToLog('stdio', 'Error in commenting on bug {}'.format(bug_id))
+return FAILURE
+return SUCCESS
+
class ValidatePatch(buildstep.BuildStep, BugzillaMixin):
name = 'validate-patch'
description = ['validate-patch running']
@@ -574,6 +594,31 @@
return {u'step': u'Failed to close bug {}'.format(self.bug_id)}
+class CommentOnBug(buildstep.BuildStep, BugzillaMixin):
+name = 'comment-on-bugzilla-bug'
+flunkOnFailure = False
+haltOnFailure = False
+
+def start(self):
+self.bug_id = self.getProperty('bug_id', '')
+self.comment_text = self.getProperty('bugzilla_comment_text', '')
+
+if not self.comment_text:
+self._addToLog('stdio', 'bugzilla_comment_text build property not found.\n')
+self.descriptionDone = 'No bugzilla comment found'
+self.finished(WARNINGS)
+return None
+
+rc = self.comment_on_bug(self.bug_id, self.comment_text)
+self.finished(rc)
+return None
+
+def getResultSummary(self):
+if self.results == SUCCESS:
+return {u'step': u'Added comment on bug {}'.format(self.bug_id)}
+return {u'step': u'Failed to add comment on bug {}'.format(self.bug_id)}
+
+
class UnApplyPatchIfRequired(CleanWorkingDirectory):
name = 'unapply-patch'
descriptionDone = ['Unapplied patch']
Modified: trunk/Tools/ChangeLog (256736 => 256737)
--- trunk/Tools/ChangeLog 2020-02-17 16:45:29 UTC (rev 256736)
+++ trunk/Tools/ChangeLog 2020-02-17 16:48:00 UTC (rev 256737)
@@ -1,3 +1,16 @@
+2020-02-17 Aakash Jain
+
+EWS should be able to comment on Bugzilla
+https://bugs.webkit.org/show_bug.cgi?id=201927
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(BugzillaMixin.comment_on_bug): Method to comment on bugzilla bug.
+(BugzillaMixin.remove_flags_on_patch): Drive-by fix to correctly identify failure based on status code.
+(BugzillaMixin.close_bug): Ditto.
+(CommentOnBug): Build step to comment on bugzilla bug.
+
2020-02-17 Antti Koivisto
[
[webkit-changes] [256755] trunk/Tools
Title: [256755] trunk/Tools
Revision 256755
Author aakash_j...@apple.com
Date 2020-02-17 11:40:48 -0800 (Mon, 17 Feb 2020)
Log Message
EWS should be able to file Bugzilla bugs
https://bugs.webkit.org/show_bug.cgi?id=207845
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/ews-build/steps.py:
(BugzillaMixin.create_bug): Method to file bugzilla bug using bugzilla REST API.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (256754 => 256755)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-17 19:28:22 UTC (rev 256754)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-02-17 19:40:48 UTC (rev 256755)
@@ -473,7 +473,29 @@
return FAILURE
return SUCCESS
+def create_bug(self, bug_title, bug_description, component='Tools / Tests', cc_list=None):
+bug_url = '{}rest/bug'.format(BUG_SERVER_URL)
+if not (bug_title and bug_description):
+return FAILURE
+try:
+response = requests.post(bug_url, data="" 'WebKit',
+'component': component,
+'version': 'WebKit Nightly Build',
+'summary': bug_title,
+'description': bug_description,
+'cc': cc_list,
+'Bugzilla_api_key': self.get_bugzilla_api_key()})
+if response.status_code not in [200, 201]:
+self._addToLog('stdio', 'Unable to file bug. Unexpected response code from bugzilla: {}'.format(response.status_code))
+return FAILURE
+except Exception as e:
+self._addToLog('stdio', 'Error in creating bug: {}'.format(bug_title))
+return FAILURE
+self._addToLog('stdio', 'Filed bug: {}'.format(bug_title))
+return SUCCESS
+
+
class ValidatePatch(buildstep.BuildStep, BugzillaMixin):
name = 'validate-patch'
description = ['validate-patch running']
Modified: trunk/Tools/ChangeLog (256754 => 256755)
--- trunk/Tools/ChangeLog 2020-02-17 19:28:22 UTC (rev 256754)
+++ trunk/Tools/ChangeLog 2020-02-17 19:40:48 UTC (rev 256755)
@@ -1,5 +1,15 @@
2020-02-17 Aakash Jain
+EWS should be able to file Bugzilla bugs
+https://bugs.webkit.org/show_bug.cgi?id=207845
+
+Reviewed by Alexey Proskuryakov.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(BugzillaMixin.create_bug): Method to file bugzilla bug using bugzilla REST API.
+
+2020-02-17 Aakash Jain
+
EWS should be able to comment on Bugzilla
https://bugs.webkit.org/show_bug.cgi?id=201927
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [241218] trunk/Tools
Title: [241218] trunk/Tools
Revision 241218
Author aakash_j...@apple.com
Date 2019-02-08 16:24:24 -0800 (Fri, 08 Feb 2019)
Log Message
[ews-build] Add short name to config.json
https://bugs.webkit.org/show_bug.cgi?id=194456
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-build/config.json: Added short name.
* BuildSlaveSupport/ews-build/loadConfig.py:
(loadBuilderConfig): Set the short name as the builder description.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/config.json
trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (241217 => 241218)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-02-09 00:21:56 UTC (rev 241217)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-02-09 00:24:24 UTC (rev 241218)
@@ -205,6 +205,7 @@
"builders": [
{
"name": "Style-EWS",
+ "shortname": "style",
"factory": "StyleFactory",
"platform": "*",
"workernames": ["ews151", "webkit-misc"]
@@ -211,6 +212,7 @@
},
{
"name": "GTK-Webkit2-EWS",
+ "shortname": "gtk",
"factory": "GTKFactory",
"platform": "gtk",
"workernames": ["tanty-gtk-wk2-ews", "ltilve-gtk-wk2-ews"]
@@ -217,6 +219,7 @@
},
{
"name": "iOS-11-Build-EWS",
+ "shortname": "ios",
"factory": "iOSBuildFactory",
"platform": "ios-11",
"configuration": "release",
@@ -225,6 +228,7 @@
},
{
"name": "iOS-11-Simulator-Build-EWS",
+ "shortname": "ios-sim",
"factory": "iOSBuildFactory",
"platform": "ios-simulator-11",
"configuration": "release",
@@ -234,6 +238,7 @@
},
{
"name": "iOS-11-Simulator-WK2-Tests-EWS",
+ "shortname": "ios-wk2",
"factory": "iOSTestsFactory",
"platform": "ios-simulator-11",
"configuration": "release",
@@ -242,6 +247,7 @@
},
{
"name": "macOS-High-Sierra-Release-Build-EWS",
+ "shortname": "mac",
"factory": "macOSBuildFactory",
"platform": "mac-highsierra",
"configuration": "release",
@@ -251,6 +257,7 @@
},
{
"name": "macOS-High-Sierra-Release-WK1-Tests-EWS",
+ "shortname": "mac-wk1",
"factory": "macOSWK1Factory",
"platform": "mac-highsierra",
"configuration": "release",
@@ -259,6 +266,7 @@
},
{
"name": "macOS-High-Sierra-Release-WK2-Tests-EWS",
+ "shortname": "mac-wk2",
"factory": "macOSWK2Factory",
"platform": "mac-highsierra",
"configuration": "release",
@@ -267,6 +275,7 @@
},
{
"name": "macOS-High-Sierra-Debug-Build-EWS",
+ "shortname": "mac-debug",
"factory": "macOSBuildFactory",
"platform": "mac-highsierra",
"configuration": "debug",
@@ -276,6 +285,7 @@
},
{
"name": "macOS-High-Sierra-Debug-WK1-Tests-EWS",
+ "shortname": "mac-debug-wk1",
"factory": "macOSWK1Factory",
"platform": "mac-highsierra",
"configuration": "debug",
@@ -284,6 +294,7 @@
},
{
"name": "macOS-High-Sierra-Release-32bit-Build-EWS",
+ "shortname": "mac-32bit",
"factory": "macOSBuildFactory",
"platform": "mac-highsierra",
"configuration": "release",
@@ -293,6 +304,7 @@
},
{
"name": "macOS-High-Sierra-Release-32bit-WK2-Tests-EWS",
+ "shortname": "mac-32bit-wk2",
"factory": "macOSWK2Factory",
"platform": "mac-highsierra",
"configuration": "release",
@@ -301,6 +313,7 @@
},
{
"name": "Windows-EWS",
+ "shortname": "win",
"factory": "WindowsFactory",
"platform": "win",
"workernames": ["ews200", "ews201", "ews202", "ews203", "ews204", "ews205", "ews206", "ews207", "ews208"]
@@ -307,6 +320,7 @@
},
{
"name": "WinCairo-EWS",
+ "shortname": "wincairo",
"factory": "WinCairoFactory",
"platform": "wincairo",
"workernames": ["wincairo-ews-001", "wincairo-ews-002", "wincairo-ews-003", "wincairo-ews-004"]
@@ -313,6 +327,7 @@
},
{
"name": "WPE-EWS",
+ "shortname": "wpe",
"factory": "WPEFactory",
"platform": "wpe",
"workernames": ["igalia-wpe-ews", "aperez-wpe-gcc5-ews", "aperez-wpe-gcc6-ews"]
@@ -319,6 +334,7 @@
},
{
"name": "JSC-Tests-EWS",
+ "shortname": "jsc",
"factory": "JSCTestsFactory",
"platform": "jsc-only",
"configuration": "release",
@@ -326,6 +342,7 @@
},
{
"name": "Bindings-Tests-EWS",
+ "shortname": "bindings",
"factory": "BindingsFactory",
"platform": "*",
"workernames": ["ews151", "webkit-misc"]
@@ -332,6 +349,7 @@
},
{
"name": "WebKitPy-Tests-EWS",
+ "shortname": "webkitpy",
"factory": "WebKitPyFactory",
"platform": "*",
"workernames": ["ews151", "webkit-misc"]
@@ -338,6 +356,7 @@
},
[webkit-changes] [241221] trunk/Tools
Title: [241221] trunk/Tools
Revision 241221
Author aakash_j...@apple.com
Date 2019-02-08 16:28:19 -0800 (Fri, 08 Feb 2019)
Log Message
[ews-build] Ensure that every builder in config.json has short name
https://bugs.webkit.org/show_bug.cgi?id=194461
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-build/loadConfig.py:
* BuildSlaveSupport/ews-build/loadConfig_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py
trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py (241220 => 241221)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2019-02-09 00:26:40 UTC (rev 241220)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2019-02-09 00:28:19 UTC (rev 241221)
@@ -102,6 +102,9 @@
if not builder.get('name'):
raise Exception('Builder "{}" does not have name defined.'.format(builder))
+if not builder.get('shortname'):
+raise Exception('Builder "{}" does not have short name defined. This name is needed for EWS status bubbles.'.format(builder.get('name')))
+
if not buildbot_identifiers.ident_re.match(builder['name']):
raise Exception('Builder name {} is not a valid buildbot identifier.'.format(builder['name']))
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py (241220 => 241221)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py 2019-02-09 00:26:40 UTC (rev 241220)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py 2019-02-09 00:28:19 UTC (rev 241221)
@@ -39,7 +39,7 @@
cwd = os.path.dirname(os.path.abspath(__file__))
config = json.load(open(os.path.join(cwd, 'config.json')))
valid_builder_keys = ['additionalArguments', 'architectures', 'builddir', 'configuration', 'description',
- 'defaultProperties', 'env', 'factory', 'locks', 'name', 'platform', 'properties', 'tags',
+ 'defaultProperties', 'env', 'factory', 'locks', 'name', 'platform', 'properties', 'shortname', 'tags',
'triggers', 'workernames', 'workerbuilddir']
for builder in config.get('builders', []):
for key in builder:
@@ -107,44 +107,49 @@
loadConfig.checkValidBuilder({}, {'platform': 'mac-sierra'})
self.assertEqual(context.exception.args, ('Builder "{\'platform\': \'mac-sierra\'}" does not have name defined.',))
+def test_builder_with_missing_shortname(self):
+with self.assertRaises(Exception) as context:
+loadConfig.checkValidBuilder({}, {'platform': 'mac-sierra', 'name': 'mac-wk2(test)'})
+self.assertEqual(context.exception.args, ('Builder "mac-wk2(test)" does not have short name defined. This name is needed for EWS status bubbles.',))
+
def test_builder_with_invalid_identifier(self):
with self.assertRaises(Exception) as context:
-loadConfig.checkValidBuilder({}, {'name': 'mac-wk2(test)'})
+loadConfig.checkValidBuilder({}, {'name': 'mac-wk2(test)', 'shortname': 'mac-wk2'})
self.assertEqual(context.exception.args, ('Builder name mac-wk2(test) is not a valid buildbot identifier.',))
def test_builder_with_extra_long_name(self):
longName = 'a' * 71
with self.assertRaises(Exception) as context:
-loadConfig.checkValidBuilder({}, {'name': longName})
+loadConfig.checkValidBuilder({}, {'name': longName, 'shortname': 'a'})
self.assertEqual(context.exception.args, ('Builder name {} is longer than maximum allowed by Buildbot (70 characters).'.format(longName),))
def test_builder_with_invalid_configuration(self):
with self.assertRaises(Exception) as context:
-loadConfig.checkValidBuilder({}, {'name': 'mac-wk2', 'configuration': 'asan'})
+loadConfig.checkValidBuilder({}, {'name': 'mac-wk2', 'shortname': 'mac-wk2', 'configuration': 'asan'})
self.assertEqual(context.exception.args, ('Invalid configuration: asan for builder: mac-wk2',))
def test_builder_with_missing_factory(self):
with self.assertRaises(Exception) as context:
-loadConfig.checkValidBuilder({}, {'name': 'mac-wk2', 'configuration': 'release'})
+loadConfig.checkValidBuilder({}, {'name': 'mac-wk2', 'shortname': 'mac-wk2', 'configuration': 'release'})
self.assertEqual(context.exception.args, ('Builder mac-wk2 does not have factory defined.',))
def test_builder_with_missing_scheduler(self):
with self.assertRaises(Exception) as context:
-loadConfig.checkValidBuilder({}, {'name': 'mac-wk2', 'configuration': 'release', 'factory': 'WK2Factory', 'platform': 'mac-sierra', 'triggers': ['api-tests-mac-ews']})
+loadConfig.checkValidBuilder({}, {'name': 'mac-wk2', 'shortname': 'mac-wk2', 'configuration': 'rel
[webkit-changes] [241326] trunk/Tools
Title: [241326] trunk/Tools Revision 241326 Author aakash_j...@apple.com Date 2019-02-12 16:02:23 -0800 (Tue, 12 Feb 2019) Log Message [ews-app] Add method to fetch patch https://bugs.webkit.org/show_bug.cgi?id=194518 Reviewed by Lucas Forschler. * BuildSlaveSupport/ews-app/ews/models/patch.py: (Patch.get_patch): Modified Paths trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py (241325 => 241326) --- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py 2019-02-13 00:00:25 UTC (rev 241325) +++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py 2019-02-13 00:02:23 UTC (rev 241326) @@ -75,6 +75,13 @@ return Patch.is_existing_patch_id(patch_id) and Patch.objects.get(pk=patch_id).sent_to_buildbot @classmethod +def get_patch(cls, patch_id): +try: +return Patch.objects.get(patch_id=patch_id) +except: +return None + +@classmethod def set_sent_to_buildbot(cls, patch_id): if not Patch.is_existing_patch_id(patch_id): return ERR_NON_EXISTING_PATCH Modified: trunk/Tools/ChangeLog (241325 => 241326) --- trunk/Tools/ChangeLog 2019-02-13 00:00:25 UTC (rev 241325) +++ trunk/Tools/ChangeLog 2019-02-13 00:02:23 UTC (rev 241326) @@ -1,3 +1,13 @@ +2019-02-12 Aakash Jain + +[ews-app] Add method to fetch patch +https://bugs.webkit.org/show_bug.cgi?id=194518 + +Reviewed by Lucas Forschler. + +* BuildSlaveSupport/ews-app/ews/models/patch.py: +(Patch.get_patch): + 2019-02-12 Zalan Bujtas [LFC] Expand tests coverage (60 new tests -> 860) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [241440] trunk/Tools
Title: [241440] trunk/Tools
Revision 241440
Author aakash_j...@apple.com
Date 2019-02-13 10:30:13 -0800 (Wed, 13 Feb 2019)
Log Message
[ews-app] Add status bubble html template
https://bugs.webkit.org/show_bug.cgi?id=194571
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-app/ews/templates: Added.
* BuildSlaveSupport/ews-app/ews/templates/statusbubble.html: Copied from QueueStatusServer/templates/statusbubble.html.
Modified Paths
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/
trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html
Diff
Copied: trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html (from rev 241439, trunk/Tools/QueueStatusServer/templates/statusbubble.html) (0 => 241440)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html (rev 0)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html 2019-02-13 18:30:13 UTC (rev 241440)
@@ -0,0 +1,116 @@
+
+
+
+
+body {
+font-family: Verdana, sans-serif;
+margin: 0px;
+padding: 0px;
+}
+#bubbleContainer {
+display: inline-block;
+white-space: nowrap;
+}
+.status {
+display: block;
+float: left;
+margin: 1px;
+padding: 1px 2px;
+-moz-border-radius: 5px;
+-webkit-border-radius: 5px;
+border-radius: 5px;
+border: 1px solid rgba(1, 1, 1, 0.3);
+background-color: white;
+font-size: 11px;
+cursor: pointer;
+text-decoration: none;
+color: black;
+}
+.status:hover {
+border-color: rgba(1, 1, 1, 0.7);
+}
+.pass {
+background-color: #8FDF5F;
+}
+.fail {
+background-color: #E98080;
+}
+.started {
+background-color: #E1F5FF;
+}
+.provisional-fail {
+background-color: #FFAF05;
+}
+.error {
+ background-color: #E0B0FF;
+}
+.queue_position {
+font-size: 9px;
+}
+form {
+display: inline-block;
+}
+
+
+window.addEventListener("message", function(e) {
+ if (e.data ="" 'containerMetrics') {
+var parentContainer = bubbleContainer.parentElement;
+var originalWidth = parentContainer.style.width;
+parentContainer.style.width = "1000px";
+var clientRect = bubbleContainer.getBoundingClientRect();
+parentContainer.style.width = originalWidth;
+e.source.postMessage({'width': Math.ceil(clientRect.width), 'height': Math.ceil(clientRect.height)}, e.origin);
+ } else
+console.log("Unknown postMessage: " + e.data);
+}, false);
+
+
+
+
+ {% if show_failure_to_apply %}
+
+patch does not apply to trunk of repository
+
+ {% else %}
+ {% for bubble in bubbles %}
+
+{{ bubble.name }}
+{% if bubble.queue_position %}
+#{{ bubble.queue_position }}
+{% endif %}
+
+ {% endfor %}
+ {% endif %}
+
+{% if show_submit_to_ews %}
+
+
+
+
+{% endif %}
+
+
+// Convert from UTC dates to local.
+var bubbles = document.getElementsByClassName("status")
+for (var i = 0; i < bubbles.length; ++i) {
+var bubble = bubbles[i];
+if (bubble.hasAttribute("title")) {
+var newTitle = bubble.getAttribute("title").replace(/\[\[(.+)\]\]/, function(match, isoDateString) {
+return new Date(isoDateString).toString();
+});
+bubble.setAttribute("title", newTitle);
+}
+}
+
+
+
+
Modified: trunk/Tools/ChangeLog (241439 => 241440)
--- trunk/Tools/ChangeLog 2019-02-13 18:06:14 UTC (rev 241439)
+++ trunk/Tools/ChangeLog 2019-02-13 18:30:13 UTC (rev 241440)
@@ -1,3 +1,13 @@
+2019-02-13 Aakash Jain
+
+[ews-app] Add status bubble html template
+https://bugs.webkit.org/show_bug.cgi?id=194571
+
+Reviewed by Lucas Forschler.
+
+* BuildSlaveSupport/ews-app/ews/templates: Added.
+* BuildSlaveSupport/ews-app/ews/templates/statusbubble.html: Copied from QueueStatusServer/templates/statusbubble.html.
+
2019-02-12 Chris Dumez
Regression(PSON) MESSAGE_CHECK() hit under WebPageProxy::didFailProvisionalLoadForFrameShared()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [241443] trunk/Tools
Title: [241443] trunk/Tools
Revision 241443
Author aakash_j...@apple.com
Date 2019-02-13 10:54:32 -0800 (Wed, 13 Feb 2019)
Log Message
[ews-app] Generate status-bubble
https://bugs.webkit.org/show_bug.cgi?id=194572
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble._build_bubble):
(StatusBubble._should_show_bubble_for):
(StatusBubble._build_bubbles_for_patch):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (241442 => 241443)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-02-13 18:50:20 UTC (rev 241442)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-02-13 18:54:32 UTC (rev 241443)
@@ -25,8 +25,73 @@
from django.http import HttpResponse
from django.shortcuts import render
from django.views import View
+from django.views.decorators.clickjacking import xframe_options_exempt
+from ews.models.patch import Patch
+import ews.config as config
class StatusBubble(View):
+def _build_bubble(self, build, patch):
+builder_display_name = build.builder_id # TODO: fetch display name from buildermapping table https://bugs.webkit.org/show_bug.cgi?id=194599
+builder_full_name = build.builder_id # TODO: fetch builder full name from buildermapping table https://bugs.webkit.org/show_bug.cgi?id=194599
+
+bubble = {
+"name": builder_display_name,
+"url": 'https://{}/#/builders/{}/builds/{}'.format(config.BUILDBOT_SERVER_HOST, build.builder_id, build.number),
+}
+
+bubble["details_message"] = '{}\n{}'.format(builder_full_name, build.state_string)
+if build.result is None:
+bubble["state"] = "started"
+elif build.result == 0: # SUCCESS
+bubble["state"] = "pass"
+elif build.result == 1: # WARNINGS
+bubble["state"] = "pass"
+elif build.result == 2: # FAILURE
+bubble["state"] = "fail"
+elif build.result == 3: # SKIPPED
+bubble["state"] = "none"
+elif build.result == 4: # EXCEPTION
+bubble["state"] = "error"
+elif build.result == 5: # RETRY
+bubble["state"] = "provisional-fail"
+else:
+bubble["state"] = "fail"
+
+return bubble
+
+def _should_show_bubble_for(self, patch, build):
+# TODO: https://bugs.webkit.org/show_bug.cgi?id=194597
+return True
+
+def _build_bubbles_for_patch(self, patch):
+show_submit_to_ews = True
+failed_to_apply = False # TODO: https://bugs.webkit.org/show_bug.cgi?id=194598
+bubbles = []
+
+if not patch:
+return (None, show_submit_to_ews, failed_to_apply)
+
+for build in patch.build_set.all():
+show_submit_to_ews = False
+if not self._should_show_bubble_for(patch, build):
+continue
+bubble = self._build_bubble(build, patch)
+if bubble:
+bubbles.append(bubble)
+
+return (bubbles, show_submit_to_ews, failed_to_apply)
+
+@xframe_options_exempt
def get(self, request, patch_id):
-return HttpResponse("Placeholder for status bubble for {}.".format(patch_id))
+patch_id = int(patch_id)
+patch = Patch.get_patch(patch_id)
+bubbles, show_submit_to_ews, show_failure_to_apply = self._build_bubbles_for_patch(patch)
+
+template_values = {
+"bubbles": bubbles,
+"patch_id": patch_id,
+"show_submit_to_ews": show_submit_to_ews,
+"show_failure_to_apply": show_failure_to_apply,
+}
+return render(request, 'statusbubble.html', template_values)
Modified: trunk/Tools/ChangeLog (241442 => 241443)
--- trunk/Tools/ChangeLog 2019-02-13 18:50:20 UTC (rev 241442)
+++ trunk/Tools/ChangeLog 2019-02-13 18:54:32 UTC (rev 241443)
@@ -1,5 +1,17 @@
2019-02-13 Aakash Jain
+[ews-app] Generate status-bubble
+https://bugs.webkit.org/show_bug.cgi?id=194572
+
+Reviewed by Lucas Forschler.
+
+* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+(StatusBubble._build_bubble):
+(StatusBubble._should_show_bubble_for):
+(StatusBubble._build_bubbles_for_patch):
+
+2019-02-13 Aakash Jain
+
[ews-app] Add status bubble html template
https://bugs.webkit.org/show_bug.cgi?id=194571
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [241485] trunk/Tools
Title: [241485] trunk/Tools
Revision 241485
Author aakash_j...@apple.com
Date 2019-02-13 16:16:16 -0800 (Wed, 13 Feb 2019)
Log Message
[ews-app] Fetch builder id to name mapping
https://bugs.webkit.org/show_bug.cgi?id=194355
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-app/ews/common/buildbot.py:
(Buildbot.get_builder_id_to_name_mapping):
(Buildbot._get_display_name_from_builder_name):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py (241484 => 241485)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py 2019-02-14 00:11:52 UTC (rev 241484)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py 2019-02-14 00:16:16 UTC (rev 241485)
@@ -22,8 +22,10 @@
import logging
import os
+import re
import subprocess
+import ews.common.util as util
import ews.config as config
_log = logging.getLogger(__name__)
@@ -49,3 +51,26 @@
_log.warn('Error executing: {}, return code={}'.format(command, return_code))
return return_code
+
+@classmethod
+def get_builder_id_to_name_mapping(cls):
+builder_id_to_name_mapping = {}
+builder_url = 'http://{}/api/v2/builders'.format(config.BUILDBOT_SERVER_HOST)
+builders_data = util.fetch_data_from_url(builder_url)
+if not builders_data:
+return {}
+for builder in builders_data.json().get('builders', []):
+builder_id = builder['builderid']
+builder_name = builder.get('name')
+display_name = builder.get('description')
+if not display_name:
+display_name = Buildbot._get_display_name_from_builder_name(builder_name)
+builder_id_to_name_mapping[builder_id] = {'builder_name': builder_name, 'display_name': display_name}
+return builder_id_to_name_mapping
+
+@classmethod
+def _get_display_name_from_builder_name(cls, builder_name):
+words = re.split('[, \-_:()]+', builder_name)
+if not words:
+return builder_name
+return words[0].lower()
Modified: trunk/Tools/ChangeLog (241484 => 241485)
--- trunk/Tools/ChangeLog 2019-02-14 00:11:52 UTC (rev 241484)
+++ trunk/Tools/ChangeLog 2019-02-14 00:16:16 UTC (rev 241485)
@@ -1,3 +1,14 @@
+2019-02-13 Aakash Jain
+
+[ews-app] Fetch builder id to name mapping
+https://bugs.webkit.org/show_bug.cgi?id=194355
+
+Reviewed by Lucas Forschler.
+
+* BuildSlaveSupport/ews-app/ews/common/buildbot.py:
+(Buildbot.get_builder_id_to_name_mapping):
+(Buildbot._get_display_name_from_builder_name):
+
2019-02-12 Jiewen Tan
Further restricting webarchive loads
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [241488] trunk/Tools
Title: [241488] trunk/Tools
Revision 241488
Author aakash_j...@apple.com
Date 2019-02-13 16:31:23 -0800 (Wed, 13 Feb 2019)
Log Message
[ews-app] Change log level for a log statement
Unreviewed minor fix.
* BuildSlaveSupport/ews-app/ews/models/patch.py:
(Patch.save_patch):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py (241487 => 241488)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py 2019-02-14 00:28:55 UTC (rev 241487)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/patch.py 2019-02-14 00:31:23 UTC (rev 241488)
@@ -48,7 +48,7 @@
return ERR_INVALID_PATCH_ID
if Patch.is_existing_patch_id(patch_id):
-_log.info("Patch id {} already exists in database. Skipped saving.".format(patch_id))
+_log.debug("Patch id {} already exists in database. Skipped saving.".format(patch_id))
return ERR_EXISTING_PATCH
Patch(patch_id, bug_id, obsolete, sent_to_buildbot).save()
_log.info('Saved patch in database, id: {}'.format(patch_id))
Modified: trunk/Tools/ChangeLog (241487 => 241488)
--- trunk/Tools/ChangeLog 2019-02-14 00:28:55 UTC (rev 241487)
+++ trunk/Tools/ChangeLog 2019-02-14 00:31:23 UTC (rev 241488)
@@ -1,3 +1,12 @@
+2019-02-13 Aakash Jain
+
+[ews-app] Change log level for a log statement
+
+Unreviewed minor fix.
+
+* BuildSlaveSupport/ews-app/ews/models/patch.py:
+(Patch.save_patch):
+
2019-02-13 Jer Noble
[Cocoa] Media elements will restart network buffering just before suspending
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [241561] trunk/Tools
Title: [241561] trunk/Tools Revision 241561 Author aakash_j...@apple.com Date 2019-02-14 14:08:58 -0800 (Thu, 14 Feb 2019) Log Message [ews-app] Set Foreign Key in Django build model https://bugs.webkit.org/show_bug.cgi?id=194667 Reviewed by Lucas Forschler. * BuildSlaveSupport/ews-app/ews/models/build.py: (Build): Modified Paths trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py (241560 => 241561) --- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-02-14 21:35:14 UTC (rev 241560) +++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-02-14 22:08:58 UTC (rev 241561) @@ -26,6 +26,7 @@ from django.db import models from ews.config import ERR_UNEXPECTED, SUCCESS +from ews.models.buildermapping import BuilderMapping from ews.models.patch import Patch import ews.common.util as util @@ -35,7 +36,7 @@ class Build(models.Model): patch = models.ForeignKey(Patch, _on_delete_=models.CASCADE) build_id = models.IntegerField(primary_key=True) -builder_id = models.IntegerField() +builder = models.ForeignKey(BuilderMapping, _on_delete_=models.DO_NOTHING) number = models.IntegerField() result = models.IntegerField(null=True, blank=True) state_string = models.TextField() Modified: trunk/Tools/ChangeLog (241560 => 241561) --- trunk/Tools/ChangeLog 2019-02-14 21:35:14 UTC (rev 241560) +++ trunk/Tools/ChangeLog 2019-02-14 22:08:58 UTC (rev 241561) @@ -1,3 +1,13 @@ +2019-02-14 Aakash Jain + +[ews-app] Set Foreign Key in Django build model +https://bugs.webkit.org/show_bug.cgi?id=194667 + +Reviewed by Lucas Forschler. + +* BuildSlaveSupport/ews-app/ews/models/build.py: +(Build): + 2019-02-14 Ross Kirsling [WTF] Add environment variable helpers ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [241562] trunk/Tools
Title: [241562] trunk/Tools
Revision 241562
Author aakash_j...@apple.com
Date 2019-02-14 14:10:37 -0800 (Thu, 14 Feb 2019)
Log Message
[ews-app] status bubble should fetch builder name info from BuilderMapping table
https://bugs.webkit.org/show_bug.cgi?id=194599
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble._build_bubble):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (241561 => 241562)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-02-14 22:08:58 UTC (rev 241561)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-02-14 22:10:37 UTC (rev 241562)
@@ -26,6 +26,7 @@
from django.shortcuts import render
from django.views import View
from django.views.decorators.clickjacking import xframe_options_exempt
+from ews.models.buildermapping import BuilderMapping
from ews.models.patch import Patch
import ews.config as config
@@ -32,8 +33,12 @@
class StatusBubble(View):
def _build_bubble(self, build, patch):
-builder_display_name = build.builder_id # TODO: fetch display name from buildermapping table https://bugs.webkit.org/show_bug.cgi?id=194599
-builder_full_name = build.builder_id # TODO: fetch builder full name from buildermapping table https://bugs.webkit.org/show_bug.cgi?id=194599
+try:
+builder_display_name = build.builder.display_name
+builder_full_name = build.builder.builder_name
+except BuilderMapping.DoesNotExist:
+builder_display_name = build.builder_id
+builder_full_name = ''
bubble = {
"name": builder_display_name,
Modified: trunk/Tools/ChangeLog (241561 => 241562)
--- trunk/Tools/ChangeLog 2019-02-14 22:08:58 UTC (rev 241561)
+++ trunk/Tools/ChangeLog 2019-02-14 22:10:37 UTC (rev 241562)
@@ -1,5 +1,15 @@
2019-02-14 Aakash Jain
+[ews-app] status bubble should fetch builder name info from BuilderMapping table
+https://bugs.webkit.org/show_bug.cgi?id=194599
+
+Reviewed by Lucas Forschler.
+
+* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+(StatusBubble._build_bubble):
+
+2019-02-14 Aakash Jain
+
[ews-app] Set Foreign Key in Django build model
https://bugs.webkit.org/show_bug.cgi?id=194667
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [242065] trunk/Tools
Title: [242065] trunk/Tools
Revision 242065
Author aakash_j...@apple.com
Date 2019-02-25 18:52:33 -0800 (Mon, 25 Feb 2019)
Log Message
[ews-app] Remove BuilderMapping table
https://bugs.webkit.org/show_bug.cgi?id=194961
Reviewed by Stephanie Lewis.
Store builder name directly in build table, instead of having a separate
table for it.
* BuildSlaveSupport/ews-app/ews/models/__init__.py:
* BuildSlaveSupport/ews-app/ews/models/build.py:
* BuildSlaveSupport/ews-app/ews/models/buildermapping.py: Removed.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/__init__.py
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Removed Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildermapping.py
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/__init__.py (242064 => 242065)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/__init__.py 2019-02-26 02:13:10 UTC (rev 242064)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/__init__.py 2019-02-26 02:52:33 UTC (rev 242065)
@@ -1,4 +1,3 @@
-from buildermapping import *
from build import *
from patch import *
from step import *
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py (242064 => 242065)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-02-26 02:13:10 UTC (rev 242064)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-02-26 02:52:33 UTC (rev 242065)
@@ -26,7 +26,6 @@
from django.db import models
from ews.config import ERR_UNEXPECTED, SUCCESS
-from ews.models.buildermapping import BuilderMapping
from ews.models.patch import Patch
import ews.common.util as util
@@ -36,7 +35,9 @@
class Build(models.Model):
patch = models.ForeignKey(Patch, _on_delete_=models.CASCADE)
build_id = models.IntegerField(primary_key=True)
-builder = models.ForeignKey(BuilderMapping, _on_delete_=models.DO_NOTHING)
+builder_id = models.IntegerField()
+builder_name = models.TextField()
+builder_display_name = models.TextField()
number = models.IntegerField()
result = models.IntegerField(null=True, blank=True)
state_string = models.TextField()
Deleted: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildermapping.py (242064 => 242065)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildermapping.py 2019-02-26 02:13:10 UTC (rev 242064)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildermapping.py 2019-02-26 02:52:33 UTC (rev 242065)
@@ -1,85 +0,0 @@
-# Copyright (C) 2018-2019 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from __future__ import unicode_literals
-
-import logging
-
-from django.db import models
-from ews.config import ERR_UNEXPECTED, SUCCESS
-import ews.common.util as util
-
-_log = logging.getLogger(__name__)
-
-
-class BuilderMapping(models.Model):
-builder_id = models.IntegerField(primary_key=True)
-builder_name = models.TextField()
-display_name = models.TextField()
-created = models.DateTimeField(auto_now_add=True)
-modified = models.DateTimeField(auto_now=True)
-
-def __str__(self):
-return "{}: {}".format(self.builder_id, self.display_name)
-
-@classmethod
-def save_mapping(cls, builder_id, builder_name, display_name):
-if not BuilderMapping.is_valid_mapping(builder_id, builder_name, display_name):
-return ERR_UNEXPECTED
-
-mapping = BuilderMapping.get_existing_mapping(builder_id)
-if mapping:
-# If the mapping is updated, e.g.: display name changed.
-return BuilderMapping.update_mapping
[webkit-changes] [242066] trunk/Tools
Title: [242066] trunk/Tools
Revision 242066
Author aakash_j...@apple.com
Date 2019-02-25 18:55:03 -0800 (Mon, 25 Feb 2019)
Log Message
[ews-app] Add model for handling multiple Buildbot instances
https://bugs.webkit.org/show_bug.cgi?id=194863
Reviewed by Stephanie Lewis.
* BuildSlaveSupport/ews-app/ews/models/buildbotinstance.py: Added.
Modified Paths
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildbotinstance.py
Diff
Added: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildbotinstance.py (0 => 242066)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildbotinstance.py (rev 0)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildbotinstance.py 2019-02-26 02:55:03 UTC (rev 242066)
@@ -0,0 +1,36 @@
+# Copyright (C) 2019 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from __future__ import unicode_literals
+
+from django.db import models
+
+
+class BuildbotInstance(models.Model):
+instance_id = models.AutoField(primary_key=True)
+hostname = models.TextField()
+active = models.BooleanField(default=True)
+created = models.DateTimeField(auto_now_add=True)
+modified = models.DateTimeField(auto_now=True)
+
+def __str__(self):
+return '{}_{}'.format(self.instance_id, self.hostname)
Modified: trunk/Tools/ChangeLog (242065 => 242066)
--- trunk/Tools/ChangeLog 2019-02-26 02:52:33 UTC (rev 242065)
+++ trunk/Tools/ChangeLog 2019-02-26 02:55:03 UTC (rev 242066)
@@ -1,5 +1,14 @@
2019-02-25 Aakash Jain
+[ews-app] Add model for handling multiple Buildbot instances
+https://bugs.webkit.org/show_bug.cgi?id=194863
+
+Reviewed by Stephanie Lewis.
+
+* BuildSlaveSupport/ews-app/ews/models/buildbotinstance.py: Added.
+
+2019-02-25 Aakash Jain
+
[ews-app] Remove BuilderMapping table
https://bugs.webkit.org/show_bug.cgi?id=194961
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [242185] trunk/Tools
Title: [242185] trunk/Tools
Revision 242185
Author aakash_j...@apple.com
Date 2019-02-27 17:47:03 -0800 (Wed, 27 Feb 2019)
Log Message
[ews-build] Buildbot should include builder_display_name in the build events
https://bugs.webkit.org/show_bug.cgi?id=195045
Reviewed by Dewei Zhu.
* BuildSlaveSupport/ews-build/events.py:
(Events.buildStarted): Included builder_display_name in event data. Also renamed
buildername to builder_name to be consistent in naming style.
(Events.buildFinished): Ditto.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/events.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/events.py (242184 => 242185)
--- trunk/Tools/BuildSlaveSupport/ews-build/events.py 2019-02-28 00:58:13 UTC (rev 242184)
+++ trunk/Tools/BuildSlaveSupport/ews-build/events.py 2019-02-28 01:47:03 UTC (rev 242185)
@@ -109,6 +109,9 @@
if not build.get('properties'):
build['properties'] = yield self.master.db.builds.getBuildProperties(build.get('buildid'))
+builder = yield self.master.db.builders.getBuilder(build.get('builderid'))
+builder_display_name = builder.get('description')
+
data = {
"type": self.type_prefix + "build",
"status": "started",
@@ -120,7 +123,8 @@
"started_at": build.get('started_at'),
"complete_at": build.get('complete_at'),
"state_string": build.get('state_string'),
-"buildername": self.getBuilderName(build),
+"builder_name": self.getBuilderName(build),
+"builder_display_name": builder_display_name,
}
self.sendData(data)
@@ -132,6 +136,9 @@
if not build.get('steps'):
build['steps'] = yield self.master.db.steps.getSteps(build.get('buildid'))
+builder = yield self.master.db.builders.getBuilder(build.get('builderid'))
+builder_display_name = builder.get('description')
+
data = {
"type": self.type_prefix + "build",
"status": "finished",
@@ -143,7 +150,8 @@
"started_at": build.get('started_at'),
"complete_at": build.get('complete_at'),
"state_string": build.get('state_string'),
-"buildername": self.getBuilderName(build),
+"builder_name": self.getBuilderName(build),
+"builder_display_name": builder_display_name,
"steps": build.get('steps'),
}
Modified: trunk/Tools/ChangeLog (242184 => 242185)
--- trunk/Tools/ChangeLog 2019-02-28 00:58:13 UTC (rev 242184)
+++ trunk/Tools/ChangeLog 2019-02-28 01:47:03 UTC (rev 242185)
@@ -1,3 +1,15 @@
+2019-02-27 Aakash Jain
+
+[ews-build] Buildbot should include builder_display_name in the build events
+https://bugs.webkit.org/show_bug.cgi?id=195045
+
+Reviewed by Dewei Zhu.
+
+* BuildSlaveSupport/ews-build/events.py:
+(Events.buildStarted): Included builder_display_name in event data. Also renamed
+buildername to builder_name to be consistent in naming style.
+(Events.buildFinished): Ditto.
+
2019-02-27 Chris Dumez
Flaky API Test: TestWebKitAPI.ProcessSwap.SessionStorage
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [242198] trunk/Tools
Title: [242198] trunk/Tools
Revision 242198
Author aakash_j...@apple.com
Date 2019-02-28 04:28:34 -0800 (Thu, 28 Feb 2019)
Log Message
[ews-app] Update method to save build to handle builder_display_name
https://bugs.webkit.org/show_bug.cgi?id=195047
Reviewed by Dewei Zhu.
* BuildSlaveSupport/ews-app/ews/models/build.py: Updated to handle builder_name and builder_display_name.
* BuildSlaveSupport/ews-app/ews/views/results.py: Ditto.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py (242197 => 242198)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-02-28 09:02:43 UTC (rev 242197)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-02-28 12:28:34 UTC (rev 242198)
@@ -50,7 +50,7 @@
return str(self.build_id)
@classmethod
-def save_build(cls, patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at=None):
+def save_build(cls, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at=None):
if not Build.is_valid_result(patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at):
return ERR_UNEXPECTED
@@ -57,15 +57,15 @@
build = Build.get_existing_build(build_id)
if build:
# If the build data is already present in database, update it, e.g.: build complete event.
-return Build.update_build(build, patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at)
+return Build.update_build(build, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at)
# Save the new build data, e.g.: build start event.
-Build(patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at).save()
+Build(patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at).save()
_log.info('Saved build {} in database for patch_id: {}'.format(build_id, patch_id))
return SUCCESS
@classmethod
-def update_build(cls, build, patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at):
+def update_build(cls, build, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at):
if build.patch_id != patch_id:
_log.error('patch_id {} does not match with patch_id {}. Ignoring new data.'.format(build.patch_id, patch_id))
return ERR_UNEXPECTED
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py (242197 => 242198)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py 2019-02-28 09:02:43 UTC (rev 242197)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py 2019-02-28 12:28:34 UTC (rev 242198)
@@ -59,7 +59,8 @@
if not patch_id or patch_id < 1:
return HttpResponse("Invalid patch id: {}.".format(patch_id))
-Build.save_build(patch_id=int(patch_id), build_id=data['build_id'], builder_id=data['builder_id'], number=data['number'], result=data['result'],
+Build.save_build(patch_id=int(patch_id), build_id=data['build_id'], builder_id=data['builder_id'], builder_name=data['builder_name'],
+ builder_display_name=data['builder_display_name'], number=data['number'], result=data['result'],
state_string=data['state_string'], started_at=data['started_at'], complete_at=data['complete_at'])
return HttpResponse("Saved data for patch: {}.\n".format(patch_id))
@@ -76,7 +77,8 @@
_log.error("Invalid data type: {}".format(data['type']))
return False
-required_keys = {u'ews-build': ['patch_id', 'build_id', 'builder_id', 'number', 'result', 'state_string', 'started_at', 'complete_at'],
+required_keys = {u'ews-build': ['patch_id', 'build_id', 'builder_id', 'builder_name', 'builder_display_name',
+ 'number', 'result', 'state_string', 'started_at', 'complete_at'],
u'ews-step': ['step_id', 'build_id', 'result', 'state_string', 'started_at', 'complete_at']}
for key in required_keys.get(data.get('type')):
Modified: trunk/Tools/ChangeLog (242197 => 242198)
--- trunk/Tools/ChangeLog 2019-02-28 09:02:43 UTC (rev 242197)
+++ trunk/Tools/ChangeLog 2019-02-28 12:28:34 UTC (rev 242198)
@@ -1,3 +1,13 @@
+2019-02-28 Aakash Jain
+
+[ews-app] Update method to save build to handle builder_display_name
+https://bugs.webkit.org/show_bug.cgi?id=195047
+
+Reviewed by Dewei Zhu.
+
+* BuildSlaveSupport/ews-app/ews/models/build.py
[webkit-changes] [242291] trunk/Tools
Title: [242291] trunk/Tools
Revision 242291
Author aakash_j...@apple.com
Date 2019-03-01 15:09:31 -0800 (Fri, 01 Mar 2019)
Log Message
[ews-app] Update primary keys for handling multiple Buildbot instances
https://bugs.webkit.org/show_bug.cgi?id=195120
Reviewed by Stephanie Lewis.
Use a new primary key uid for build and step tables. Previous primary keys build_id and step_id
were not enough to handle multiple buildbot instances. This new primary key uid would be generated
by a combination of buildbot_instance_id and current primary key. e.g.: buildbot_instance_id + build_id
* BuildSlaveSupport/ews-app/ews/models/build.py: Added new primary key uid.
* BuildSlaveSupport/ews-app/ews/models/step.py: Ditto.
* BuildSlaveSupport/ews-app/ews/models/buildbotinstance.py: Generate uid and instance_id.
* BuildSlaveSupport/ews-app/ews/views/results.py: Updated to receive hostname in events.
* BuildSlaveSupport/ews-build/events.py: Send hostname along-with events.
* BuildSlaveSupport/ews-build/master.cfg: Ditto.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/buildbotinstance.py
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/step.py
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py
trunk/Tools/BuildSlaveSupport/ews-build/events.py
trunk/Tools/BuildSlaveSupport/ews-build/master.cfg
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py (242290 => 242291)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-03-01 22:48:54 UTC (rev 242290)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-03-01 23:09:31 UTC (rev 242291)
@@ -26,6 +26,7 @@
from django.db import models
from ews.config import ERR_UNEXPECTED, SUCCESS
+from ews.models.buildbotinstance import BuildbotInstance
from ews.models.patch import Patch
import ews.common.util as util
@@ -34,7 +35,7 @@
class Build(models.Model):
patch = models.ForeignKey(Patch, _on_delete_=models.CASCADE)
-build_id = models.IntegerField(primary_key=True)
+uid = models.TextField(primary_key=True)
builder_id = models.IntegerField()
builder_name = models.TextField()
builder_display_name = models.TextField()
@@ -47,30 +48,31 @@
modified = models.DateTimeField(auto_now=True)
def __str__(self):
-return str(self.build_id)
+return str(self.uid)
@classmethod
-def save_build(cls, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at=None):
+def save_build(cls, patch_id, hostname, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at=None):
if not Build.is_valid_result(patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at):
return ERR_UNEXPECTED
-build = Build.get_existing_build(build_id)
+uid = BuildbotInstance.get_uid(hostname, build_id)
+build = Build.get_existing_build(uid)
if build:
# If the build data is already present in database, update it, e.g.: build complete event.
-return Build.update_build(build, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at)
+return Build.update_build(build, patch_id, uid, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at)
# Save the new build data, e.g.: build start event.
-Build(patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at).save()
-_log.info('Saved build {} in database for patch_id: {}'.format(build_id, patch_id))
+Build(patch_id, uid, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at).save()
+_log.info('Saved build {} in database for patch_id: {}'.format(uid, patch_id))
return SUCCESS
@classmethod
-def update_build(cls, build, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at):
+def update_build(cls, build, patch_id, uid, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at):
if build.patch_id != patch_id:
_log.error('patch_id {} does not match with patch_id {}. Ignoring new data.'.format(build.patch_id, patch_id))
return ERR_UNEXPECTED
-if build.build_id != build_id:
-_log.error('build_id {} does not match with build_id {}. Ignoring new data.'.format(build.build_id, build_id))
+if build.uid != uid:
+_log.error('uid {} does not match with uid {}. Ignoring new data.'.format(build.uid, uid))
return ERR_UNEXPECTED
if build.builder_id !=
[webkit-changes] [288145] trunk/Tools/CISupport/ews-build/master.cfg
Title: [288145] trunk/Tools/CISupport/ews-build/master.cfg
Revision 288145
Author aakash_j...@apple.com
Date 2022-01-18 13:43:10 -0800 (Tue, 18 Jan 2022)
Log Message
[ews] Load credentials from passwords.json in master.cfg
https://bugs.webkit.org/show_bug.cgi?id=235296
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/master.cfg:
Canonical link: https://commits.webkit.org/246145@main
Modified Paths
trunk/Tools/CISupport/ews-build/master.cfg
Diff
Modified: trunk/Tools/CISupport/ews-build/master.cfg (288144 => 288145)
--- trunk/Tools/CISupport/ews-build/master.cfg 2022-01-18 21:11:45 UTC (rev 288144)
+++ trunk/Tools/CISupport/ews-build/master.cfg 2022-01-18 21:43:10 UTC (rev 288145)
@@ -1,3 +1,4 @@
+import json
import os
import socket
import sys
@@ -28,7 +29,7 @@
from buildbot.process.buildstep import BuildStep
BuildStep.warn_deprecated_if_oldstyle_subclass = lambda self, name: None
-is_test_mode_enabled = os.getenv('BUILDBOT_PRODUCTION') is None
+is_test_mode_enabled = load_password('BUILDBOT_PRODUCTION') is None
c = BuildmasterConfig = {}
@@ -79,10 +80,10 @@
c['db_url'] = 'sqlite:///state.sqlite?serialize_access=1'
else:
c['buildbotURL'] = 'https://ews-build.webkit.org/'
-db_url = os.getenv('DB_URL', None)
-db_name = os.getenv('DB_NAME', None)
-db_username = os.getenv('DB_USERNAME', None)
-db_password = os.getenv('DB_PASSWORD', None)
+db_url = load_password('DB_URL', None)
+db_name = load_password('DB_NAME', None)
+db_username = load_password('DB_USERNAME', None)
+db_password = load_password('DB_PASSWORD', None)
if None in [db_url, db_name, db_username, db_password]:
print('Environment variables for DB not found. Please ensure these variables are set.')
sys.exit(1)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288230] trunk/Tools/CISupport/ews-build
Title: [288230] trunk/Tools/CISupport/ews-build
Revision 288230
Author aakash_j...@apple.com
Date 2022-01-19 12:23:22 -0800 (Wed, 19 Jan 2022)
Log Message
[ews] Improve support for required changes for ews uat instance
https://bugs.webkit.org/show_bug.cgi?id=235355
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/events.py:
* Tools/CISupport/ews-build/master.cfg:
* Tools/CISupport/ews-build/send_email.py:
* Tools/CISupport/ews-build/steps.py:
Canonical link: https://commits.webkit.org/246187@main
Modified Paths
trunk/Tools/CISupport/ews-build/events.py
trunk/Tools/CISupport/ews-build/master.cfg
trunk/Tools/CISupport/ews-build/send_email.py
trunk/Tools/CISupport/ews-build/steps.py
Diff
Modified: trunk/Tools/CISupport/ews-build/events.py (288229 => 288230)
--- trunk/Tools/CISupport/ews-build/events.py 2022-01-19 20:21:54 UTC (rev 288229)
+++ trunk/Tools/CISupport/ews-build/events.py 2022-01-19 20:23:22 UTC (rev 288230)
@@ -37,6 +37,7 @@
from twisted.web.iweb import IBodyProducer
from zope.interface import implementer
+custom_suffix = '-uat' if os.getenv('BUILDBOT_UAT') else ''
@implementer(IBodyProducer)
class JSONProducer(object):
@@ -74,7 +75,7 @@
class Events(service.BuildbotService):
-EVENT_SERVER_ENDPOINT = b'https://ews.webkit.org/results/'
+EVENT_SERVER_ENDPOINT = 'https://ews.webkit{}.org/results/'.format(custom_suffix).encode()
def __init__(self, master_hostname, type_prefix='', name='Events'):
"""
Modified: trunk/Tools/CISupport/ews-build/master.cfg (288229 => 288230)
--- trunk/Tools/CISupport/ews-build/master.cfg 2022-01-19 20:21:54 UTC (rev 288229)
+++ trunk/Tools/CISupport/ews-build/master.cfg 2022-01-19 20:23:22 UTC (rev 288230)
@@ -30,6 +30,7 @@
BuildStep.warn_deprecated_if_oldstyle_subclass = lambda self, name: None
is_test_mode_enabled = load_password('BUILDBOT_PRODUCTION') is None
+custom_suffix = '-uat' if load_password('BUILDBOT_UAT') else ''
c = BuildmasterConfig = {}
@@ -72,14 +73,14 @@
c['protocols'] = {'pb': {'port': 17000}}
-c['projectName'] = 'WebKit EWS'
-c['projectURL'] = 'https://ews-build.webkit.org/'
+c['projectName'] = 'WebKit EWS{}'.format(custom_suffix.upper())
+c['projectURL'] = 'https://ews-build.webkit{}.org/'.format(custom_suffix)
if is_test_mode_enabled:
c['buildbotURL'] = 'http://localhost:8010/'
c['db_url'] = 'sqlite:///state.sqlite?serialize_access=1'
else:
-c['buildbotURL'] = 'https://ews-build.webkit.org/'
+c['buildbotURL'] = 'https://ews-build.webkit{}.org/'.format(custom_suffix)
db_url = load_password('DB_URL', None)
db_name = load_password('DB_NAME', None)
db_username = load_password('DB_USERNAME', None)
Modified: trunk/Tools/CISupport/ews-build/send_email.py (288229 => 288230)
--- trunk/Tools/CISupport/ews-build/send_email.py 2022-01-19 20:21:54 UTC (rev 288229)
+++ trunk/Tools/CISupport/ews-build/send_email.py 2022-01-19 20:23:22 UTC (rev 288230)
@@ -28,10 +28,11 @@
from email.mime.text import MIMEText
is_test_mode_enabled = os.getenv('BUILDBOT_PRODUCTION') is None
+custom_suffix = '-uat' if os.getenv('BUILDBOT_UAT') else ''
CURRENT_HOSTNAME = socket.gethostname().strip()
EWS_BUILD_HOSTNAME = 'ews-build.webkit.org'
-FROM_EMAIL = 'e...@webkit.org'
+FROM_EMAIL = 'ews@webkit{}.org'.format(custom_suffix)
IGALIA_JSC_QUEUES_PATTERNS = ['armv7', 'mips', 'i386']
IGALIA_GTK_WPE_QUEUES_PATTERNS = ['gtk', 'wpe']
SERVER = 'localhost'
Modified: trunk/Tools/CISupport/ews-build/steps.py (288229 => 288230)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-01-19 20:21:54 UTC (rev 288229)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-01-19 20:23:22 UTC (rev 288230)
@@ -44,10 +44,11 @@
print('ERROR: Please use Python 3. This code is not compatible with Python 2.')
sys.exit(1)
+custom_suffix = '-uat' if os.getenv('BUILDBOT_UAT') else ''
BUG_SERVER_URL = 'https://bugs.webkit.org/'
COMMITS_INFO_URL = 'https://commits.webkit.org/'
S3URL = 'https://s3-us-west-2.amazonaws.com/'
-S3_RESULTS_URL = 'https://ews-build.s3-us-west-2.amazonaws.com/'
+S3_RESULTS_URL = 'https://ews-build{}.s3-us-west-2.amazonaws.com/'.format(custom_suffix)
CURRENT_HOSTNAME = socket.gethostname().strip()
EWS_BUILD_HOSTNAME = 'ews-build.webkit.org'
EWS_URL = 'https://ews.webkit.org/'
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288443] trunk/Tools
Title: [288443] trunk/Tools
Revision 288443
Author aakash_j...@apple.com
Date 2022-01-24 08:13:21 -0800 (Mon, 24 Jan 2022)
Log Message
Allow configuring multiple user credentials on ews
https://bugs.webkit.org/show_bug.cgi?id=235301
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/master.cfg:
Canonical link: https://commits.webkit.org/246332@main
Modified Paths
trunk/Tools/CISupport/ews-build/master.cfg
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/master.cfg (288442 => 288443)
--- trunk/Tools/CISupport/ews-build/master.cfg 2022-01-24 16:05:24 UTC (rev 288442)
+++ trunk/Tools/CISupport/ews-build/master.cfg 2022-01-24 16:13:21 UTC (rev 288443)
@@ -57,17 +57,16 @@
)
if not is_test_mode_enabled:
-admin_username = os.getenv('EWS_ADMIN_USERNAME')
-admin_password = os.getenv('EWS_ADMIN_PASSWORD')
-if not admin_username or not admin_password:
-print('Environment variables for admin username/password not found. Please ensure these variables are set.')
+credentials = load_password('EWS_CREDENTIALS')
+if not credentials:
+print('EWS credentials not found. Please ensure EWS_CREDENTIALS is configured either in env variables or in passwords.json')
sys.exit(1)
# See https://docs.buildbot.net/current/manual/configuration/www.html#example-configs
authz = util.Authz(
allowRules=[util.AnyControlEndpointMatcher(role="admin")],
-roleMatchers=[util.RolesFromEmails(admin=[admin_username])]
+roleMatchers=[util.RolesFromEmails(admin=list(credentials.keys()))]
)
-auth = util.UserPasswordAuth({admin_username: admin_password})
+auth = util.UserPasswordAuth(credentials)
c['www']['auth'] = auth
c['www']['authz'] = authz
Modified: trunk/Tools/ChangeLog (288442 => 288443)
--- trunk/Tools/ChangeLog 2022-01-24 16:05:24 UTC (rev 288442)
+++ trunk/Tools/ChangeLog 2022-01-24 16:13:21 UTC (rev 288443)
@@ -1,3 +1,12 @@
+2022-01-24 Aakash Jain
+
+Allow configuring multiple user credentials on ews
+https://bugs.webkit.org/show_bug.cgi?id=235301
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/master.cfg:
+
2022-01-24 Joseph Griego
[Shadow Realms] Use WebCore module loaders for shadow realm importValue
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288468] trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy
Title: [288468] trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy
Revision 288468
Author aakash_j...@apple.com
Date 2022-01-24 14:31:14 -0800 (Mon, 24 Jan 2022)
Log Message
Incorrect pull-request url printed by git-webkit
https://bugs.webkit.org/show_bug.cgi?id=235513
Reviewed by Jonathan Bedard.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py:
(GitHub.PRGenerator.PullRequest):
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
Canonical link: https://commits.webkit.org/246353@main
Modified Paths
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py
Diff
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py (288467 => 288468)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py 2022-01-24 22:22:46 UTC (rev 288467)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py 2022-01-24 22:31:14 UTC (rev 288468)
@@ -57,7 +57,7 @@
generator=self,
metadata=dict(
issue=data.get('_links', {}).get('issue', {}).get('href'),
-), url=''.format(self.repository.url, data['number']),
+), url=''.format(self.repository.url, data['number']),
)
def get(self, number):
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py (288467 => 288468)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py 2022-01-24 22:22:46 UTC (rev 288467)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py 2022-01-24 22:31:14 UTC (rev 288468)
@@ -330,7 +330,7 @@
captured.stdout.getvalue(),
"Created the local development branch 'eng/pr-branch'!\n"
"Created 'PR 1 | [Testing] Creating commits'!\n"
-"https://github.example.com/WebKit/WebKit/pulls/1\n",
+"https://github.example.com/WebKit/WebKit/pull/1\n",
)
self.assertEqual(captured.stderr.getvalue(), '')
log = captured.root.log.getvalue().splitlines()
@@ -366,7 +366,7 @@
self.assertEqual(
captured.stdout.getvalue(),
"Updated 'PR 1 | [Testing] Amending commits'!\n"
-"https://github.example.com/WebKit/WebKit/pulls/1\n",
+"https://github.example.com/WebKit/WebKit/pull/1\n",
)
self.assertEqual(captured.stderr.getvalue(), '')
log = captured.root.log.getvalue().splitlines()
@@ -408,7 +408,7 @@
"'eng/pr-branch' is already associated with 'PR 1 | [Testing] Creating commits', which is closed.\n"
'Would you like to create a new pull-request? (Yes/[No]): \n'
"Updated 'PR 1 | [Testing] Amending commits'!\n"
-"https://github.example.com/WebKit/WebKit/pulls/1\n",
+"https://github.example.com/WebKit/WebKit/pull/1\n",
)
self.assertEqual(captured.stderr.getvalue(), '')
log = captured.root.log.getvalue().splitlines()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288545] trunk/Tools/CISupport/ews-build/send_email.py
Title: [288545] trunk/Tools/CISupport/ews-build/send_email.py
Revision 288545
Author aakash_j...@apple.com
Date 2022-01-25 04:00:39 -0800 (Tue, 25 Jan 2022)
Log Message
[ews] Remove redundant check for test mode in send_email.py
https://bugs.webkit.org/show_bug.cgi?id=235552
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/send_email.py:
Canonical link: https://commits.webkit.org/246377@main
Modified Paths
trunk/Tools/CISupport/ews-build/send_email.py
Diff
Modified: trunk/Tools/CISupport/ews-build/send_email.py (288544 => 288545)
--- trunk/Tools/CISupport/ews-build/send_email.py 2022-01-25 09:57:44 UTC (rev 288544)
+++ trunk/Tools/CISupport/ews-build/send_email.py 2022-01-25 12:00:39 UTC (rev 288545)
@@ -27,7 +27,6 @@
from email.mime.text import MIMEText
-is_test_mode_enabled = os.getenv('BUILDBOT_PRODUCTION') is None
custom_suffix = '-uat' if os.getenv('BUILDBOT_UAT') else ''
CURRENT_HOSTNAME = socket.gethostname().strip()
@@ -49,8 +48,6 @@
def send_email(to_emails, subject, text, reference=''):
-if is_test_mode_enabled:
-return
if CURRENT_HOSTNAME != EWS_BUILD_HOSTNAME:
# Only allow EWS production instance to send emails.
return
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288548] trunk/Tools/CISupport/ews-build/steps.py
Title: [288548] trunk/Tools/CISupport/ews-build/steps.py
Revision 288548
Author aakash_j...@apple.com
Date 2022-01-25 07:52:38 -0800 (Tue, 25 Jan 2022)
Log Message
ews is displaying PR by even on patch based builds
https://bugs.webkit.org/show_bug.cgi?id=235578
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/steps.py:
(ConfigureBuild.add_pr_details):
Canonical link: https://commits.webkit.org/246380@main
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (288547 => 288548)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-01-25 14:39:22 UTC (rev 288547)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-01-25 15:52:38 UTC (rev 288548)
@@ -313,16 +313,16 @@
self.addURL('Patch {}'.format(patch_id), Bugzilla.patch_url(patch_id))
def add_pr_details(self):
+pr_number = self.getProperty('github.number')
+if not pr_number:
+return
repository_url = self.getProperty('repository', '')
-pr_number = self.getProperty('github.number')
title = self.getProperty('github.title', '')
owners = self.getProperty('owners', [])
revision = self.getProperty('github.head.sha')
-if pr_number and title:
+if title:
self.addURL('PR {}: {}'.format(pr_number, title), GitHub.pr_url(pr_number, repository_url))
-if pr_number and revision:
-self.addURL('Hash: {}'.format(revision[:HASH_LENGTH_TO_DISPLAY]), GitHub.commit_url(revision, repository_url))
if owners:
contributors, errors = Contributors.load(use_network=False)
for error in errors:
@@ -334,6 +334,8 @@
if display_name != github_username:
display_name = '{} ({})'.format(display_name, github_username)
self.addURL('PR by: {}'.format(display_name), '{}{}'.format(GITHUB_URL, github_username))
+if revision:
+self.addURL('Hash: {}'.format(revision[:HASH_LENGTH_TO_DISPLAY]), GitHub.commit_url(revision, repository_url))
class CheckOutSource(git.Git):
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288563] trunk/Tools/CISupport
Title: [288563] trunk/Tools/CISupport
Revision 288563
Author aakash_j...@apple.com
Date 2022-01-25 10:30:40 -0800 (Tue, 25 Jan 2022)
Log Message
[buildbot] Detailed bot information should be displayed inside PrintConfiguration step instead of workers page
https://bugs.webkit.org/show_bug.cgi?id=235583
Reviewed by Jonathan Bedard and Ryan Haddad.
* Tools/CISupport/build-webkit-org/steps.py:
(PrintConfiguration): run 'system_profiler SPSoftwareDataType SPHardwareDataType' command in PrintConfiguration.
* Tools/CISupport/ews-build/steps.py: Ditto.
* Tools/CISupport/ews-build/steps_unittest.py: Updated unit-tests.
* Tools/CISupport/build-webkit-org/steps_unittest.py: Updated unit-tests.
Canonical link: https://commits.webkit.org/246391@main
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (288562 => 288563)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2022-01-25 17:48:21 UTC (rev 288562)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2022-01-25 18:30:40 UTC (rev 288563)
@@ -1176,7 +1176,7 @@
warnOnFailure = False
logEnviron = False
command_list_generic = [['hostname']]
-command_list_apple = [['df', '-hl'], ['date'], ['sw_vers'], ['xcodebuild', '-sdk', '-version'], ['uptime']]
+command_list_apple = [['df', '-hl'], ['date'], ['sw_vers'], ['system_profiler', 'SPSoftwareDataType', 'SPHardwareDataType'], ['xcodebuild', '-sdk', '-version']]
command_list_linux = [['df', '-hl'], ['date'], ['uname', '-a'], ['uptime']]
command_list_win = [['df', '-hl']]
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (288562 => 288563)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2022-01-25 17:48:21 UTC (rev 288562)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2022-01-25 18:30:40 UTC (rev 288563)
@@ -1121,6 +1121,8 @@
+ ExpectShell.log('stdio', stdout='''ProductName: macOS
ProductVersion: 12.0.1
BuildVersion: 21A558'''),
+ExpectShell(command=['system_profiler', 'SPSoftwareDataType', 'SPHardwareDataType'], workdir='wkdir', timeout=60, logEnviron=False) + 0
++ ExpectShell.log('stdio', stdout='Configuration version: Software: System Software Overview: System Version: macOS 11.4 (20F71) Kernel Version: Darwin 20.5.0 Boot Volume: Macintosh HD Boot Mode: Normal Computer Name: bot1020 User Name: WebKit Build Worker (buildbot) Secure Virtual Memory: Enabled System Integrity Protection: Enabled Time since boot: 27 seconds Hardware: Hardware Overview: Model Name: Mac mini Model Identifier: Macmini8,1 Processor Name: 6-Core Intel Core i7 Processor Speed: 3.2 GHz Number of Processors: 1 Total Number of Cores: 6 L2 Cache (per Core): 256 KB L3 Cache: 12 MB Hyper-Threading Technology: Enabled Memory: 32 GB System Firmware Version: 1554.120.19.0.0 (iBridge: 18.16.14663.0.0,0) Serial Number (system): C07D Hardware UUID: F724DE6E-706A-5A54-8D16- Provisioning UDID: E724DE6E-006A-5A54-8D16- Activation Lock Status: Disabled Xcode 12.5 Build version 12E262'),
ExpectShell(command=['xcodebuild', '-sdk', '-version'], workdir='wkdir', timeout=60, logEnviron=False)
+ ExpectShell.log('stdio', stdout='''MacOSX12.0.sdk - macOS 12.0 (macosx12.0)
SDKVersion: 12.0
@@ -1137,8 +1139,6 @@
Xcode 13.1
Build version 13A1030d''')
+ 0,
-ExpectShell(command=['uptime'], workdir='wkdir', timeout=60, logEnviron=False) + 0
-+ ExpectShell.log('stdio', stdout=' 6:31 up 1 day, 19:05, 24 users, load averages: 4.17 7.23 5.45'),
)
self.expectOutcome(result=SUCCESS, state_string='OS: Monterey (12.0.1), Xcode: 13.1')
return self.runStep()
@@ -1162,6 +1162,8 @@
+ ExpectShell.log('stdio', stdout='''ProductName: macOS
ProductVersion: 11.6
BuildVersion: 20G165'''),
+ExpectShell(command=['system_profiler', 'SPSoftwareDataType', 'SPHardwareDataType'], workdir='wkdir', timeout=60, logEnviron=False) + 0
++ ExpectShell.log('stdio', stdout='Sample system information'),
ExpectShell(command=['xcodebuild', '-sdk', '-version'], workdir='wkdir', timeout=60, logEnviron=False)
+ ExpectShell.log('stdio', stdout='''iPhoneSimulator15.0.sdk - Simulator - iOS 15.0 (iphonesimulator15.0)
SDKVersion: 15.0
@@ -1177,8 +1179,6 @@
Xcode 13.0
Build version 13A233''')
+ 0,
-ExpectShell(command=['uptime'], workdir='wkdir', timeout=60, logEnviron=False) + 0
-+ ExpectShell.log('stdio', stdout=' 6:31 up 1 day, 19:05, 24 users, load averages: 4.17 7.23 5.45'),
)
self.expectOutcome(result=SUCCESS, state_string='OS: Big Sur (11.6), Xcode: 13.0')
return self.runStep()
@@ -1195,10 +1195,10 @@
[webkit-changes] [288634] trunk/Tools/CISupport/ews-build/loadConfig.py
Title: [288634] trunk/Tools/CISupport/ews-build/loadConfig.py
Revision 288634
Author aakash_j...@apple.com
Date 2022-01-26 11:31:02 -0800 (Wed, 26 Jan 2022)
Log Message
[ews] Allow triggering individual EWS queues
https://bugs.webkit.org/show_bug.cgi?id=235620
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/loadConfig.py:
(loadBuilderConfig): Allow ForceScheduler in production, configure it appropriately.
Canonical link: https://commits.webkit.org/246448@main
Modified Paths
trunk/Tools/CISupport/ews-build/loadConfig.py
Diff
Modified: trunk/Tools/CISupport/ews-build/loadConfig.py (288633 => 288634)
--- trunk/Tools/CISupport/ews-build/loadConfig.py 2022-01-26 19:24:02 UTC (rev 288633)
+++ trunk/Tools/CISupport/ews-build/loadConfig.py 2022-01-26 19:31:02 UTC (rev 288634)
@@ -27,7 +27,7 @@
from buildbot.scheduler import AnyBranchScheduler, Periodic, Dependent, Triggerable, Nightly
from buildbot.schedulers.trysched import Try_Userpass
-from buildbot.schedulers.forcesched import ForceScheduler, StringParameter, FixedParameter, CodebaseParameter
+from buildbot.schedulers.forcesched import ForceScheduler, IntParameter, StringParameter, FixedParameter, CodebaseParameter
from buildbot.worker import Worker
from buildbot.util import identifiers as buildbot_identifiers
@@ -86,22 +86,22 @@
scheduler['userpass'] = [(os.getenv('BUILDBOT_TRY_USERNAME', 'sampleuser'), os.getenv('BUILDBOT_TRY_PASSWORD', 'samplepass'))]
c['schedulers'].append(schedulerClass(**scheduler))
-if is_test_mode_enabled:
-forceScheduler = ForceScheduler(
-name="force_build",
-buttonName="Force Build",
-builderNames=[str(builder['name']) for builder in config['builders']],
-# Disable default enabled input fields: branch, repository, project, additional properties
-codebases=[CodebaseParameter("",
- revision=FixedParameter(name="revision", default=""),
- repository=FixedParameter(name="repository", default=""),
- project=FixedParameter(name="project", default=""),
- branch=FixedParameter(name="branch", default=""))],
-# Add custom properties needed
-properties=[StringParameter(name="patch_id", label="Patch attachment id number (not bug number)", required=True, maxsize=7),
-StringParameter(name="ews_revision", label="WebKit git sha1 hash to checkout before trying patch (optional)", required=False, maxsize=40)],
-)
-c['schedulers'].append(forceScheduler)
+forceScheduler = ForceScheduler(
+name='try_build',
+buttonName='Try Build',
+reason=StringParameter(name='reason', default='Trying patch', size=20),
+builderNames=[str(builder['name']) for builder in config['builders']],
+# Disable default enabled input fields: branch, repository, project, additional properties
+codebases=[CodebaseParameter('',
+ revision=FixedParameter(name='revision', default=''),
+ repository=FixedParameter(name='repository', default=''),
+ project=FixedParameter(name='project', default=''),
+ branch=FixedParameter(name='branch', default=''))],
+# Add custom properties needed
+properties=[IntParameter(name='patch_id', label='Patch id (not bug number)', required=True, maxsize=6),
+StringParameter(name='ews_revision', label='WebKit git hash to checkout before trying patch (optional)', required=False, maxsize=40)],
+)
+c['schedulers'].append(forceScheduler)
def prioritizeBuilders(buildmaster, builders):
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288673] trunk/Tools/CISupport/ews-app/ews
Title: [288673] trunk/Tools/CISupport/ews-app/ews
Revision 288673
Author aakash_j...@apple.com
Date 2022-01-27 08:03:29 -0800 (Thu, 27 Jan 2022)
Log Message
[ews] Display status-bubble for try builds (builds for specific ews queues)
https://bugs.webkit.org/show_bug.cgi?id=235679
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-app/ews/models/build.py:
(Build.save_build): Save the patch information in database.
* Tools/CISupport/ews-app/ews/views/statusbubble.py:
(StatusBubble._build_bubble):
(StatusBubble._should_show_bubble_for_build):
(StatusBubble._build_bubbles_for_patch):
Canonical link: https://commits.webkit.org/246479@main
Modified Paths
trunk/Tools/CISupport/ews-app/ews/models/build.py
trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py
Diff
Modified: trunk/Tools/CISupport/ews-app/ews/models/build.py (288672 => 288673)
--- trunk/Tools/CISupport/ews-app/ews/models/build.py 2022-01-27 15:36:23 UTC (rev 288672)
+++ trunk/Tools/CISupport/ews-app/ews/models/build.py 2022-01-27 16:03:29 UTC (rev 288673)
@@ -65,6 +65,10 @@
# If the build data is already present in database, update it, e.g.: build complete event.
return Build.update_build(build, patch_id, uid, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at)
+if not Patch.is_existing_patch_id(patch_id):
+Patch.save_patch(patch_id)
+_log.info('Received result for unknown patch. Saved patch {} to database'.format(patch_id))
+
# Save the new build data, e.g.: build start event.
Build(patch_id, uid, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at).save()
_log.info('Saved build {} in database for patch_id: {}'.format(uid, patch_id))
Modified: trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py (288672 => 288673)
--- trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2022-01-27 15:36:23 UTC (rev 288672)
+++ trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2022-01-27 16:03:29 UTC (rev 288673)
@@ -80,7 +80,7 @@
BUILD_RETRY_MSG = 'retrying build'
UNKNOWN_QUEUE_POSITION = '?'
-def _build_bubble(self, patch, queue, hide_icons=False):
+def _build_bubble(self, patch, queue, hide_icons=False, sent_to_buildbot=True):
bubble = {
'name': queue,
}
@@ -97,7 +97,7 @@
if builds:
build = builds[0]
builds = builds[:10] # Limit number of builds to display in status-bubble hover over message
-if not self._should_show_bubble_for_build(build):
+if not self._should_show_bubble_for_build(build, sent_to_buildbot):
return None
if not build:
@@ -292,9 +292,11 @@
failed_builds.append(build)
return failed_builds
-def _should_show_bubble_for_build(self, build):
+def _should_show_bubble_for_build(self, build, sent_to_buildbot=True):
if build and build.result == Buildbot.SKIPPED and re.search(r'Patch .* doesn\'t have relevant changes', build.state_string):
return False
+if (not build) and (not sent_to_buildbot):
+return False
return True
def _queue_position(self, patch, queue, parent_queue=None):
@@ -342,14 +344,12 @@
if not patch:
return (None, show_submit_to_ews, failed_to_apply, show_retry)
-if patch.sent_to_buildbot:
-for queue in StatusBubble.ALL_QUEUES:
-bubble = self._build_bubble(patch, queue, hide_icons)
-if bubble:
-show_submit_to_ews = False
-bubbles.append(bubble)
-if bubble['state'] in ('fail', 'error'):
-show_retry = True
+for queue in StatusBubble.ALL_QUEUES:
+bubble = self._build_bubble(patch, queue, hide_icons, patch.sent_to_buildbot)
+if bubble:
+bubbles.append(bubble)
+if bubble['state'] in ('fail', 'error'):
+show_retry = True
if patch.sent_to_commit_queue:
if not patch.sent_to_buildbot:
@@ -358,6 +358,7 @@
if cq_bubble:
bubbles.insert(0, cq_bubble)
+show_submit_to_ews = not patch.sent_to_buildbot
return (bubbles, show_submit_to_ews, failed_to_apply, show_retry)
@xframe_options_exempt
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288735] trunk/Tools/CISupport/ews-build/loadConfig.py
Title: [288735] trunk/Tools/CISupport/ews-build/loadConfig.py
Revision 288735
Author aakash_j...@apple.com
Date 2022-01-28 03:35:36 -0800 (Fri, 28 Jan 2022)
Log Message
[ews] validate-change step fails while running for a try build
https://bugs.webkit.org/show_bug.cgi?id=235750
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/loadConfig.py:
(loadBuilderConfig):
Canonical link: https://commits.webkit.org/246528@main
Modified Paths
trunk/Tools/CISupport/ews-build/loadConfig.py
Diff
Modified: trunk/Tools/CISupport/ews-build/loadConfig.py (288734 => 288735)
--- trunk/Tools/CISupport/ews-build/loadConfig.py 2022-01-28 07:58:57 UTC (rev 288734)
+++ trunk/Tools/CISupport/ews-build/loadConfig.py 2022-01-28 11:35:36 UTC (rev 288735)
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 Apple Inc. All rights reserved.
+# Copyright (C) 2018-2022 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
from buildbot.scheduler import AnyBranchScheduler, Periodic, Dependent, Triggerable, Nightly
from buildbot.schedulers.trysched import Try_Userpass
-from buildbot.schedulers.forcesched import ForceScheduler, IntParameter, StringParameter, FixedParameter, CodebaseParameter
+from buildbot.schedulers.forcesched import ForceScheduler, StringParameter, FixedParameter, CodebaseParameter
from buildbot.worker import Worker
from buildbot.util import identifiers as buildbot_identifiers
@@ -98,7 +98,7 @@
project=FixedParameter(name='project', default=''),
branch=FixedParameter(name='branch', default=''))],
# Add custom properties needed
-properties=[IntParameter(name='patch_id', label='Patch id (not bug number)', required=True, maxsize=6),
+properties=[StringParameter(name='patch_id', label='Patch id (not bug number)', regex='^[4-9]\d{5}$', required=True, maxsize=6),
StringParameter(name='ews_revision', label='WebKit git hash to checkout before trying patch (optional)', required=False, maxsize=40)],
)
c['schedulers'].append(forceScheduler)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288811] trunk/Tools/CISupport/ews-build
Title: [288811] trunk/Tools/CISupport/ews-build
Revision 288811
Author aakash_j...@apple.com
Date 2022-01-31 05:29:25 -0800 (Mon, 31 Jan 2022)
Log Message
[ews] Cleanup code by removing patchFailedToBuild and patchFailedTests properties
https://bugs.webkit.org/show_bug.cgi?id=235860
Reviewed by Ryan Haddad.
Cleanup code by removing patchFailedToBuild and patchFailedTests properties. Those were added in very early days of ews bringup, when corresponding steps (e.g.: UnApplyPatchIfRequired) were listed statically in factories.py. Later on we started invoking steps dynamically using addStepsAfterCurrentStep and UnApplyPatchIfRequired is no longer called in factories.py. We can just remove all these patchFailedToBuild and patchFailedTests properties logic.
Also rename UnApplyPatchIfRequired to UnApplyPatch since this step is run only when it is required
* Tools/CISupport/ews-build/steps.py:
(UnApplyPatchIfRequired):
(CompileWebKit.evaluateCommand):
(RunJavaScriptCoreTests.evaluateCommand):
(ReRunWebKitTests.evaluateCommand):
(RunWebKitTestsRedTree.evaluateCommand):
(RunWebKitTestsRepeatFailuresRedTree.evaluateCommand):
(ReRunAPITests.evaluateCommand):
(UnApplyPatchIfRequired.doStepIf): Deleted.
(UnApplyPatchIfRequired.hideStepIf): Deleted.
(CompileWebKitWithoutPatch.doStepIf): Deleted.
(CompileWebKitWithoutPatch.hideStepIf): Deleted.
* Tools/CISupport/ews-build/steps_unittest.py: Updated unit-tests.
Canonical link: https://commits.webkit.org/246587@main
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (288810 => 288811)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-01-31 12:46:42 UTC (rev 288810)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-01-31 13:29:25 UTC (rev 288811)
@@ -1458,17 +1458,11 @@
return CURRENT_HOSTNAME == EWS_BUILD_HOSTNAME
-class UnApplyPatchIfRequired(CleanWorkingDirectory):
+class UnApplyPatch(CleanWorkingDirectory):
name = 'unapply-patch'
descriptionDone = ['Unapplied patch']
-def doStepIf(self, step):
-return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedTests')
-def hideStepIf(self, results, step):
-return not self.doStepIf(step)
-
-
class Trigger(trigger.Trigger):
def __init__(self, schedulerNames, include_revision=True, triggers=None, patch=True, pull_request=False, **kwargs):
self.include_revision = include_revision
@@ -1926,8 +1920,7 @@
def evaluateCommand(self, cmd):
if cmd.didFail():
-self.setProperty('patchFailedToBuild', True)
-steps_to_add = [UnApplyPatchIfRequired(), ValidateChange(verifyBugClosed=False, addURLs=False)]
+steps_to_add = [UnApplyPatch(), ValidateChange(verifyBugClosed=False, addURLs=False)]
platform = self.getProperty('platform')
if platform == 'wpe':
steps_to_add.append(InstallWpeDependencies())
@@ -1972,12 +1965,6 @@
self.retry_build_on_failure = retry_build_on_failure
super(CompileWebKitWithoutPatch, self).__init__(**kwargs)
-def doStepIf(self, step):
-return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedTests')
-
-def hideStepIf(self, results, step):
-return not self.doStepIf(step)
-
def evaluateCommand(self, cmd):
rc = shell.Compile.evaluateCommand(self, cmd)
if rc == FAILURE and self.retry_build_on_failure:
@@ -2209,8 +2196,7 @@
self.build.results = SUCCESS
self.build.buildFinished([message], SUCCESS)
else:
-self.setProperty('patchFailedTests', True)
-self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(),
+self.build.addStepsAfterCurrentStep([UnApplyPatch(),
ValidateChange(verifyBugClosed=False, addURLs=False),
CompileJSCWithoutPatch(),
ValidateChange(verifyBugClosed=False, addURLs=False),
@@ -2726,11 +2712,10 @@
self.send_email_for_flaky_failure(flaky_failure)
self.setProperty('build_summary', message)
else:
-self.setProperty('patchFailedTests', True)
self.build.addStepsAfterCurrentStep([ArchiveTestResults(),
UploadTestResults(identifier='rerun'),
ExtractTestResults(identifier='rerun'),
-UnApplyPatchIfRequired(),
+UnApplyPatch(),
ValidateChange(verifyBugClosed=False, addURLs=False),
CompileWebKitWithoutPatch(retry_build_on_failure=True),
[webkit-changes] [288952] trunk/Tools/CISupport/ews-build/loadConfig.py
Title: [288952] trunk/Tools/CISupport/ews-build/loadConfig.py
Revision 288952
Author aakash_j...@apple.com
Date 2022-02-02 07:37:47 -0800 (Wed, 02 Feb 2022)
Log Message
[ews] Read buildbot try credentials from passwords.json instead of env variables
https://bugs.webkit.org/show_bug.cgi?id=236015
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/loadConfig.py:
(loadBuilderConfig):
Canonical link: https://commits.webkit.org/246681@main
Modified Paths
trunk/Tools/CISupport/ews-build/loadConfig.py
Diff
Modified: trunk/Tools/CISupport/ews-build/loadConfig.py (288951 => 288952)
--- trunk/Tools/CISupport/ews-build/loadConfig.py 2022-02-02 13:20:58 UTC (rev 288951)
+++ trunk/Tools/CISupport/ews-build/loadConfig.py 2022-02-02 15:37:47 UTC (rev 288952)
@@ -83,7 +83,7 @@
schedulerClass = globals()[schedulerClassName]
if (schedulerClassName == 'Try_Userpass'):
# FIXME: Read the credentials from local file on disk.
-scheduler['userpass'] = [(os.getenv('BUILDBOT_TRY_USERNAME', 'sampleuser'), os.getenv('BUILDBOT_TRY_PASSWORD', 'samplepass'))]
+scheduler['userpass'] = [(passwords.get('BUILDBOT_TRY_USERNAME', 'sampleuser'), passwords.get('BUILDBOT_TRY_PASSWORD', 'samplepass'))]
c['schedulers'].append(schedulerClass(**scheduler))
forceScheduler = ForceScheduler(
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [289364] trunk/Tools/CISupport/ews-build/master.cfg
Title: [289364] trunk/Tools/CISupport/ews-build/master.cfg
Revision 289364
Author aakash_j...@apple.com
Date 2022-02-08 03:59:07 -0800 (Tue, 08 Feb 2022)
Log Message
[ews] Do not configure GitHub hooks on local testing instance
https://bugs.webkit.org/show_bug.cgi?id=236266
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/master.cfg:
Canonical link: https://commits.webkit.org/246952@main
Modified Paths
trunk/Tools/CISupport/ews-build/master.cfg
Diff
Modified: trunk/Tools/CISupport/ews-build/master.cfg (289363 => 289364)
--- trunk/Tools/CISupport/ews-build/master.cfg 2022-02-08 11:53:14 UTC (rev 289363)
+++ trunk/Tools/CISupport/ews-build/master.cfg 2022-02-08 11:59:07 UTC (rev 289364)
@@ -42,22 +42,23 @@
'Builders.buildFetchLimit': 1000,
'Workers.showWorkerBuilders': True,
}
-c['www']['change_hook_dialects'] = dict(
-github={
-'class': GitHubEventHandlerNoEdits,
-'secret': load_password('GITHUB_HOOK_SECRET'),
-'github_property_whitelist': [
-'github.number',
-'github.title',
-'github.head.ref',
-'github.head.sha',
-'github.base.sha',
-'github.head.repo.full_name',
-], 'token': load_password('GITHUB_COM_ACCESS_TOKEN'),
-},
-)
if not is_test_mode_enabled:
+c['www']['change_hook_dialects'] = dict(
+github={
+'class': GitHubEventHandlerNoEdits,
+'secret': load_password('GITHUB_HOOK_SECRET'),
+'github_property_whitelist': [
+'github.number',
+'github.title',
+'github.head.ref',
+'github.head.sha',
+'github.base.sha',
+'github.head.repo.full_name',
+], 'token': load_password('GITHUB_COM_ACCESS_TOKEN'),
+},
+)
+
credentials = load_password('EWS_CREDENTIALS')
if not credentials:
print('EWS credentials not found. Please ensure EWS_CREDENTIALS is configured either in env variables or in passwords.json')
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [289690] trunk/Tools
Title: [289690] trunk/Tools
Revision 289690
Author aakash_j...@apple.com
Date 2022-02-12 06:20:42 -0800 (Sat, 12 Feb 2022)
Log Message
Unreviewed, reverting r289687.
https://bugs.webkit.org/show_bug.cgi?id=236539
broke commit queue
Reverted changeset:
"git-webkit setup should allow changing the credentials"
https://bugs.webkit.org/show_bug.cgi?id=235297
https://commits.webkit.org/r289687
Patch by Commit Queue on 2022-02-12
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/libraries/webkitbugspy/setup.py
trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/__init__.py
trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/bugzilla.py
trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/github.py
trunk/Tools/Scripts/libraries/webkitcorepy/setup.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py
trunk/Tools/Scripts/libraries/webkitscmpy/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/git_hub.py
Diff
Modified: trunk/Tools/ChangeLog (289689 => 289690)
--- trunk/Tools/ChangeLog 2022-02-12 02:29:56 UTC (rev 289689)
+++ trunk/Tools/ChangeLog 2022-02-12 14:20:42 UTC (rev 289690)
@@ -1,3 +1,16 @@
+2022-02-12 Commit Queue
+
+Unreviewed, reverting r289687.
+https://bugs.webkit.org/show_bug.cgi?id=236539
+
+broke commit queue
+
+Reverted changeset:
+
+"git-webkit setup should allow changing the credentials"
+https://bugs.webkit.org/show_bug.cgi?id=235297
+https://commits.webkit.org/r289687
+
2022-02-08 Jonathan Bedard
git-webkit setup should allow changing the credentials
Modified: trunk/Tools/Scripts/libraries/webkitbugspy/setup.py (289689 => 289690)
--- trunk/Tools/Scripts/libraries/webkitbugspy/setup.py 2022-02-12 02:29:56 UTC (rev 289689)
+++ trunk/Tools/Scripts/libraries/webkitbugspy/setup.py 2022-02-12 14:20:42 UTC (rev 289690)
@@ -30,7 +30,7 @@
setup(
name='webkitbugspy',
-version='0.3.3',
+version='0.3.2',
description='Library containing a shared API for various bug trackers.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/__init__.py (289689 => 289690)
--- trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/__init__.py 2022-02-12 02:29:56 UTC (rev 289689)
+++ trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/__init__.py 2022-02-12 14:20:42 UTC (rev 289690)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url `"
)
-version = Version(0, 3, 3)
+version = Version(0, 3, 2)
from .user import User
from .issue import Issue
Modified: trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/bugzilla.py (289689 => 289690)
--- trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/bugzilla.py 2022-02-12 02:29:56 UTC (rev 289689)
+++ trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/bugzilla.py 2022-02-12 14:20:42 UTC (rev 289690)
@@ -110,19 +110,11 @@
return self.issue(int(match.group('id')))
return None
-def credentials(self, required=True, validate=False):
-def validater(username, password):
-response = requests.get('{}/rest/user/{}?login={}&password={}'.format(self.url, username, username, password))
-if response.status_code == 200:
-return True
-sys.stderr.write('Login to {} for {} failed\n'.format(self.url, username))
-return False
-
+def credentials(self, required=True):
return webkitcorepy.credentials(
url=""
required=required,
prompt=self.url.split('//')[-1],
-validater=validater if validate else None,
)
def _login_arguments(self, required=False, query=None):
Modified: trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/github.py (289689 => 289690)
--- trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/github.py 2022-02-12 02:29:56 UTC (rev 289689)
+++ trunk/Tools/Scripts/libraries/webkitbugspy/webkitbugspy/github.py 2022-02-12 14:20:42 UTC (rev 289690)
@@ -86,23 +86,9 @@
return self.issue(int(match.group('id')))
return None
-def credentials(self, required=True, validate=False):
-def validater(username, access_token):
-if '@' in username:
-sys.stderr.write("Provided username contains an '@' symbol. Please make sure to enter your GitHub username, not an email associated with the account\n")
-return False
-response = requests.get(
-'{}/user'.format(self.api_url),
-headers=dict(Accept='application/vnd.github.v3+json'),
-auth=HTTPBasicAuth(username, acce
[webkit-changes] [294051] trunk/Tools/CISupport/build-webkit-org
Title: [294051] trunk/Tools/CISupport/build-webkit-org Revision 294051 Author aakash_j...@apple.com Date 2022-05-11 07:27:02 -0700 (Wed, 11 May 2022) Log Message [build.webkit.org] Allow users to specify custom revision to checkout https://bugs.webkit.org/show_bug.cgi?id=240307 Reviewed by Ryan Haddad. * Tools/CISupport/build-webkit-org/factories.py: (Factory.__init__): * Tools/CISupport/build-webkit-org/loadConfig.py: (loadBuilderConfig): * Tools/CISupport/build-webkit-org/steps.py: (CheckOutSpecificRevision): (CheckOutSpecificRevision.__init__): (CheckOutSpecificRevision.doStepIf): (CheckOutSpecificRevision.hideStepIf): (CheckOutSpecificRevision.start): (ShowIdentifier.start): (ShowIdentifier.evaluateCommand): Canonical link: https://commits.webkit.org/250457@main Modified Paths trunk/Tools/CISupport/build-webkit-org/factories.py trunk/Tools/CISupport/build-webkit-org/factories_unittest.py trunk/Tools/CISupport/build-webkit-org/loadConfig.py trunk/Tools/CISupport/build-webkit-org/steps.py Property Changed trunk/Tools/CISupport/build-webkit-org/factories.py Diff Modified: trunk/Tools/CISupport/build-webkit-org/factories.py (294050 => 294051) --- trunk/Tools/CISupport/build-webkit-org/factories.py 2022-05-11 04:27:58 UTC (rev 294050) +++ trunk/Tools/CISupport/build-webkit-org/factories.py 2022-05-11 14:27:02 UTC (rev 294051) @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2021 Apple Inc. All rights reserved. +# Copyright (C) 2017-2022 Apple Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -32,6 +32,7 @@ self.addStep(ConfigureBuild(platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, additionalArguments=additionalArguments, device_model=device_model)) self.addStep(PrintConfiguration()) self.addStep(CheckOutSource()) +self.addStep(CheckOutSpecificRevision()) self.addStep(ShowIdentifier()) if not (platform == "jsc-only"): self.addStep(KillOldProcesses()) Property changes on: trunk/Tools/CISupport/build-webkit-org/factories.py ___ Added: svn:executable +* \ No newline at end of property Modified: trunk/Tools/CISupport/build-webkit-org/factories_unittest.py (294050 => 294051) --- trunk/Tools/CISupport/build-webkit-org/factories_unittest.py 2022-05-11 04:27:58 UTC (rev 294050) +++ trunk/Tools/CISupport/build-webkit-org/factories_unittest.py 2022-05-11 14:27:02 UTC (rev 294051) @@ -32,6 +32,7 @@ 'configure-build', 'configuration', 'clean-and-update-working-directory', +'checkout-specific-revision', 'show-identifier', 'kill-old-processes', 'delete-WebKitBuild-directory', @@ -48,6 +49,7 @@ 'configure-build', 'configuration', 'clean-and-update-working-directory', +'checkout-specific-revision', 'show-identifier', 'kill-old-processes', 'delete-WebKitBuild-directory', @@ -60,6 +62,7 @@ 'configure-build', 'configuration', 'clean-and-update-working-directory', +'checkout-specific-revision', 'show-identifier', 'kill-old-processes', 'delete-WebKitBuild-directory', @@ -72,6 +75,7 @@ 'configure-build', 'configuration', 'clean-and-update-working-directory', +'checkout-specific-revision', 'show-identifier', 'kill-old-processes', 'delete-WebKitBuild-directory', @@ -97,6 +101,7 @@ 'configure-build', 'configuration', 'clean-and-update-working-directory', +'checkout-specific-revision', 'show-identifier', 'kill-old-processes', 'delete-WebKitBuild-directory', @@ -122,6 +127,7 @@ 'configure-build', 'configuration', 'clean-and-update-working-directory', +'checkout-specific-revision', 'show-identifier', 'kill-old-processes', 'delete-WebKitBuild-directory', @@ -147,6 +153,7 @@ 'configure-build', 'configuration', 'clean-and-update-working-directory', +'checkout-specific-revision', 'show-identifier', 'kill-old-processes', 'delete-WebKitBuild-directory', @@ -172,6 +179,7 @@ 'configure-build', 'configuration', 'clean-and-update-working-directory', +'checkout-specific-revision', 'show-identifier', 'kill-old-processes', 'delete-WebKitBuild-directory', @@ -188,6 +196,7 @@ 'configure-build', 'c
[webkit-changes] [294115] trunk/Tools/CISupport/build-webkit-org
Title: [294115] trunk/Tools/CISupport/build-webkit-org Revision 294115 Author aakash_j...@apple.com Date 2022-05-12 13:03:18 -0700 (Thu, 12 May 2022) Log Message [build.webkit.org] Upload steps should be properly named https://bugs.webkit.org/show_bug.cgi?id=240351 Reviewed by Ryan Haddad. * Tools/CISupport/build-webkit-org/factories_unittest.py: (TestExpectedBuildSteps): * Tools/CISupport/build-webkit-org/steps.py: (ArchiveMinifiedBuiltProduct): (UploadBuiltProduct): (UploadMinifiedBuiltProduct): Canonical link: https://commits.webkit.org/250496@main Modified Paths trunk/Tools/CISupport/build-webkit-org/factories_unittest.py trunk/Tools/CISupport/build-webkit-org/steps.py Diff Modified: trunk/Tools/CISupport/build-webkit-org/factories_unittest.py (294114 => 294115) --- trunk/Tools/CISupport/build-webkit-org/factories_unittest.py 2022-05-12 18:51:32 UTC (rev 294114) +++ trunk/Tools/CISupport/build-webkit-org/factories_unittest.py 2022-05-12 20:03:18 UTC (rev 294115) @@ -39,9 +39,9 @@ 'delete-stale-build-files', 'compile-webkit', 'archive-built-product', -'upload', -'archive-built-product', -'upload', +'upload-built-product', +'archive-minified-built-product', +'upload-minified-built-product', 'transfer-to-s3', 'trigger' ], @@ -186,9 +186,9 @@ 'delete-stale-build-files', 'compile-webkit', 'archive-built-product', -'upload', -'archive-built-product', -'upload', +'upload-built-product', +'archive-minified-built-product', +'upload-minified-built-product', 'transfer-to-s3', 'trigger' ], @@ -346,9 +346,9 @@ 'delete-stale-build-files', 'compile-webkit', 'archive-built-product', -'upload', -'archive-built-product', -'upload', +'upload-built-product', +'archive-minified-built-product', +'upload-minified-built-product', 'transfer-to-s3', 'trigger' ], @@ -531,9 +531,9 @@ 'delete-stale-build-files', 'compile-webkit', 'archive-built-product', -'upload', -'archive-built-product', -'upload', +'upload-built-product', +'archive-minified-built-product', +'upload-minified-built-product', 'transfer-to-s3', 'trigger' ], @@ -713,9 +713,9 @@ 'delete-stale-build-files', 'compile-webkit', 'archive-built-product', -'upload', -'archive-built-product', -'upload', +'upload-built-product', +'archive-minified-built-product', +'upload-minified-built-product', 'transfer-to-s3', 'trigger' ], @@ -730,9 +730,9 @@ 'delete-stale-build-files', 'compile-webkit', 'archive-built-product', -'upload', -'archive-built-product', -'upload', +'upload-built-product', +'archive-minified-built-product', +'upload-minified-built-product', 'transfer-to-s3', 'trigger' ], @@ -942,7 +942,7 @@ 'compile', 'compile-webkit', 'archive-built-product', -'upload', +'upload-built-product', 'transfer-to-s3', 'trigger' ], @@ -958,7 +958,7 @@ 'compile', 'compile-webkit', 'archive-built-product', -'upload', +'upload-built-product', 'transfer-to-s3', 'trigger' ], @@ -1024,7 +1024,7 @@ 'generate-jsc-bundle', 'install-built-product', 'archive-built-product', -'upload', +'upload-built-product', 'transfer-to-s3', 'trigger' ], @@ -1106,7 +1106,7 @@ 'compile-webkit', 'install-built-product', 'archive-built-product', -'upload', +'upload-built-product', 'transfer-to-s3', 'trigger' ], @@ -1305,7 +1305,7 @@ 'delete-stale-build-files', 'compile-webkit', 'archive-built-product', -'upload', +'upload-built-product', 'transfer-to-s3', 'trigger' ], @@ -1356,7 +1356,7 @@ 'delete-stale-build-files', 'compile-webkit', 'archive-built-product', -'upload', +'upload-built-product', 'transfer-to-s3', 'trigger' ], @@ -1474,7 +1474,7 @@
[webkit-changes] [294116] trunk/Tools/CISupport/build-webkit-org/steps.py
Title: [294116] trunk/Tools/CISupport/build-webkit-org/steps.py
Revision 294116
Author aakash_j...@apple.com
Date 2022-05-12 13:08:08 -0700 (Thu, 12 May 2022)
Log Message
[build.webkit.org] Upload minified archives while building custom revision
https://bugs.webkit.org/show_bug.cgi?id=240354
Reviewed by Ryan Haddad.
* Tools/CISupport/build-webkit-org/steps.py:
(CompileWebKit.evaluateCommand):
(TransferToS3.__init__):
(TransferToS3.finished):
Canonical link: https://commits.webkit.org/250497@main
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps.py
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (294115 => 294116)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2022-05-12 20:03:18 UTC (rev 294115)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2022-05-12 20:08:08 UTC (rev 294116)
@@ -347,7 +347,13 @@
log = yield self.addLog(logName)
log.addStdout(message)
+def evaluateCommand(self, cmd):
+rc = shell.ShellCommand.evaluateCommand(self, cmd)
+if rc in (SUCCESS, WARNINGS) and self.getProperty('user_provided_git_hash'):
+self.build.addStepsAfterCurrentStep([ArchiveMinifiedBuiltProduct(), UploadMinifiedBuiltProduct(), TransferToS3(terminate_build=True)])
+return rc
+
class CompileLLINTCLoop(CompileWebKit):
command = ["perl", "Tools/Scripts/build-jsc", "--cloop", WithProperties("--%(configuration)s")]
@@ -1174,9 +1180,10 @@
command = ["python3", "../Shared/transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
haltOnFailure = True
-def __init__(self, **kwargs):
+def __init__(self, terminate_build=False, **kwargs):
kwargs['command'] = self.command
kwargs['logEnviron'] = False
+self.terminate_build = terminate_build
master.MasterShellCommand.__init__(self, **kwargs)
def start(self):
@@ -1183,7 +1190,10 @@
return master.MasterShellCommand.start(self)
def finished(self, result):
-return master.MasterShellCommand.finished(self, result)
+rc = master.MasterShellCommand.finished(self, result)
+if self.terminate_build and self.getProperty('user_provided_git_hash'):
+self.build.buildFinished([f"Uploaded archive with hash {self.getProperty('user_provided_git_hash', '')[:8]}"], SUCCESS)
+return rc
def doStepIf(self, step):
return CURRENT_HOSTNAME == BUILD_WEBKIT_HOSTNAME
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [294320] trunk/Tools/CISupport/ews-build/config.json
Title: [294320] trunk/Tools/CISupport/ews-build/config.json
Revision 294320
Author aakash_j...@apple.com
Date 2022-05-17 06:13:45 -0700 (Tue, 17 May 2022)
Log Message
[ews] Move few bots from mac wk1 queues to wk2 queue
https://bugs.webkit.org/show_bug.cgi?id=240513
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/config.json:
Canonical link: https://commits.webkit.org/250640@main
Modified Paths
trunk/Tools/CISupport/ews-build/config.json
Diff
Modified: trunk/Tools/CISupport/ews-build/config.json (294319 => 294320)
--- trunk/Tools/CISupport/ews-build/config.json 2022-05-17 12:12:38 UTC (rev 294319)
+++ trunk/Tools/CISupport/ews-build/config.json 2022-05-17 13:13:45 UTC (rev 294320)
@@ -186,7 +186,7 @@
"factory": "macOSWK2Factory", "platform": "mac-bigsur",
"configuration": "release", "architectures": ["x86_64"],
"triggered_by": ["macos-bigsur-release-build-ews"],
- "workernames": ["ews104", "ews106", "ews107"]
+ "workernames": ["ews104", "ews106", "ews107", "ews113", "ews115"]
},
{
"name": "macOS-Release-WK2-Stress-Tests-EWS", "shortname": "mac-wk2-stress", "icon": "testOnly",
@@ -200,7 +200,7 @@
"factory": "macOSBuildFactory", "platform": "mac-bigsur",
"configuration": "debug", "architectures": ["x86_64"],
"triggers": ["macos-bigsur-debug-wk1-tests-ews"],
- "workernames": ["ews112", "ews113", "ews115", "ews117", "ews153"]
+ "workernames": ["ews112", "ews117", "ews153"]
},
{
"name": "macOS-BigSur-Debug-WK1-Tests-EWS", "shortname": "mac-debug-wk1", "icon": "testOnly",
@@ -207,7 +207,7 @@
"factory": "macOSWK1Factory", "platform": "mac-bigsur",
"configuration": "debug", "architectures": ["x86_64"],
"triggered_by": ["macos-bigsur-debug-build-ews"],
- "workernames": ["ews112", "ews113", "ews115", "ews117"]
+ "workernames": ["ews112"]
},
{
"name": "watchOS-8-Build-EWS", "shortname": "watch", "icon": "buildOnly",
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [294646] trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py
Title: [294646] trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py
Revision 294646
Author aakash_j...@apple.com
Date 2022-05-23 09:09:19 -0700 (Mon, 23 May 2022)
Log Message
Disable mac-debug-wk1 ews status bubble
https://bugs.webkit.org/show_bug.cgi?id=240803
Reviewed by Ryan Haddad.
* Tools/CISupport/ews-app/ews/views/statusbubble.py:
(StatusBubble):
Canonical link: https://commits.webkit.org/250870@main
Modified Paths
trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py
Diff
Modified: trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py (294645 => 294646)
--- trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2022-05-23 16:04:24 UTC (rev 294645)
+++ trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2022-05-23 16:09:19 UTC (rev 294646)
@@ -44,7 +44,7 @@
# FIXME: Auto-generate this list https://bugs.webkit.org/show_bug.cgi?id=195640
# Note: This list is sorted in the order of which bubbles appear in bugzilla.
ALL_QUEUES = ['style', 'ios', 'ios-sim', 'mac', 'mac-debug', 'mac-AS-debug', 'tv', 'tv-sim', 'watch', 'watch-sim', 'gtk', 'wpe', 'wincairo', 'win',
- 'ios-wk2', 'mac-wk1', 'mac-wk2', 'mac-wk2-stress', 'mac-debug-wk1', 'mac-AS-debug-wk2', 'gtk-wk2', 'api-ios', 'api-mac', 'api-gtk',
+ 'ios-wk2', 'mac-wk1', 'mac-wk2', 'mac-wk2-stress', 'mac-AS-debug-wk2', 'gtk-wk2', 'api-ios', 'api-mac', 'api-gtk',
'bindings', 'jsc', 'jsc-armv7', 'jsc-armv7-tests', 'jsc-mips', 'jsc-mips-tests', 'jsc-i386', 'webkitperl', 'webkitpy', 'services']
# FIXME: Auto-generate the queue's trigger relationship
QUEUE_TRIGGERS = {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [295053] trunk/Tools/CISupport/ews-build/steps.py
Title: [295053] trunk/Tools/CISupport/ews-build/steps.py
Revision 295053
Author aakash_j...@apple.com
Date 2022-05-31 08:41:53 -0700 (Tue, 31 May 2022)
Log Message
EWS should email PR author in case Merge-Queue silently fails on their PR
https://bugs.webkit.org/show_bug.cgi?id=241101
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/steps.py:
(ValidateChange.validate_github):
(ValidateChange.send_email_for_github_failure):
Canonical link: https://commits.webkit.org/251148@main
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (295052 => 295053)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-05-31 15:22:39 UTC (rev 295052)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-05-31 15:41:53 UTC (rev 295053)
@@ -1568,10 +1568,15 @@
self.skip_build("PR {} has been marked as '{}'".format(pr_number, self.BLOCKED_LABEL))
return False
-merge_queue = self._is_pr_in_merge_queue(pr_json) if self.verifyMergeQueue else 1
-if merge_queue == 0:
-self.skip_build("PR {} does not have a merge queue label".format(pr_number))
-return False
+if self.verifyMergeQueue:
+if not pr_json:
+self.send_email_for_github_failure()
+self.skip_build("Infrastructure issue: unable to check PR status")
+return False
+merge_queue = self._is_pr_in_merge_queue(pr_json)
+if merge_queue == 0:
+self.skip_build("PR {} does not have a merge queue label".format(pr_number))
+return False
draft = self._is_pr_draft(pr_json) if self.verifyNoDraftForMergeQueue else 0
if draft == 1:
@@ -1578,13 +1583,45 @@
self.fail_build("PR {} is a draft pull request".format(pr_number))
return False
-if -1 in (obsolete, pr_closed, blocked, merge_queue, draft):
+if -1 in (obsolete, pr_closed, blocked, draft):
self.finished(WARNINGS)
return False
return True
+def send_email_for_github_failure(self):
+try:
+pr_number = self.getProperty('github.number', '')
+sha = self.getProperty('github.head.sha', '')[:HASH_LENGTH_TO_DISPLAY]
+change_string = 'Hash {}'.format(sha)
+change_author, errors = GitHub.email_for_owners(self.getProperty('owners', []))
+for error in errors:
+print(error)
+self._addToLog('stdio', error)
+
+if not change_author:
+self._addToLog('stderr', 'Unable to determine email address for {} from metadata/contributors.json. Skipping sending email.'.format(self.getProperty('owners', [])))
+return
+
+builder_name = self.getProperty('buildername', '')
+title = self.getProperty('github.title', '')
+worker_name = self.getProperty('workername', '')
+build_url = '{}#/builders/{}/builds/{}'.format(self.master.config.buildbotURL, self.build._builderid, self.build.number)
+
+email_subject = f'Infrastructure failure on {builder_name} for PR #{pr_number}: {title}'
+email_text = f'EWS has encountered infrastructure failure on {builder_name}'
+repository = self.getProperty('repository')
+email_text += ' while testing class ValidateCommitterAndReviewer(buildstep.BuildStep, GitHubMixin, AddToLogMixin):
name = 'validate-commiter-and-reviewer'
descriptionDone = ['Validated commiter and reviewer']
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [291405] trunk/Tools
Title: [291405] trunk/Tools
Revision 291405
Author aakash_j...@apple.com
Date 2022-03-17 07:42:30 -0700 (Thu, 17 Mar 2022)
Log Message
XSS in EWS App
https://bugs.webkit.org/show_bug.cgi?id=236633
Reported by Iman Sharafaldin - Forward Security.
Reviewed by Darin Adler.
* CISupport/ews-app/ews/views/submittoews.py:
(SubmitToEWS.post):
Modified Paths
trunk/Tools/CISupport/ews-app/ews/views/submittoews.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-app/ews/views/submittoews.py (291404 => 291405)
--- trunk/Tools/CISupport/ews-app/ews/views/submittoews.py 2022-03-17 14:27:51 UTC (rev 291404)
+++ trunk/Tools/CISupport/ews-app/ews/views/submittoews.py 2022-03-17 14:42:30 UTC (rev 291405)
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 Apple Inc. All rights reserved.
+# Copyright (C) 2019-2022 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -47,7 +47,7 @@
patch_id = request.POST.get('patch_id')
patch_id = int(patch_id)
except:
-return HttpResponse("Invalid patch id {}".format(request.POST.get('patch_id')))
+return HttpResponse('Invalid patch id provided, should be an integer.')
_log.info('SubmitToEWS::patch: {}'.format(patch_id))
if Patch.is_patch_sent_to_buildbot(patch_id):
Modified: trunk/Tools/ChangeLog (291404 => 291405)
--- trunk/Tools/ChangeLog 2022-03-17 14:27:51 UTC (rev 291404)
+++ trunk/Tools/ChangeLog 2022-03-17 14:42:30 UTC (rev 291405)
@@ -1,3 +1,15 @@
+2022-03-17 Aakash Jain
+
+XSS in EWS App
+https://bugs.webkit.org/show_bug.cgi?id=236633
+
+Reported by Iman Sharafaldin - Forward Security.
+
+Reviewed by Darin Adler.
+
+* CISupport/ews-app/ews/views/submittoews.py:
+(SubmitToEWS.post):
+
2022-03-16 Jonathan Bedard
[reporelaypy] Support credentialed https repositories
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [291825] trunk/Tools
Title: [291825] trunk/Tools
Revision 291825
Author aakash_j...@apple.com
Date 2022-03-24 16:37:18 -0700 (Thu, 24 Mar 2022)
Log Message
[ews] Set bug_title property appropriately
https://bugs.webkit.org/show_bug.cgi?id=238342
Reviewed by Ryan Haddad.
* CISupport/ews-build/steps.py:
(BugzillaMixin._is_bug_closed):
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (291824 => 291825)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-03-24 23:29:30 UTC (rev 291824)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-03-24 23:37:18 UTC (rev 291825)
@@ -1175,11 +1175,11 @@
return -1
bug_title = bug_json.get('summary')
-self.setProperty('bug_title', bug_title)
sensitive = bug_json.get('product') == 'Security'
if sensitive:
self.setProperty('sensitive', True)
bug_title = ''
+self.setProperty('bug_title', bug_title)
if self.addURLs:
self.addURL('Bug {} {}'.format(bug_id, bug_title), Bugzilla.bug_url(bug_id))
if bug_json.get('status') in self.bug_closed_statuses:
Modified: trunk/Tools/ChangeLog (291824 => 291825)
--- trunk/Tools/ChangeLog 2022-03-24 23:29:30 UTC (rev 291824)
+++ trunk/Tools/ChangeLog 2022-03-24 23:37:18 UTC (rev 291825)
@@ -1,3 +1,13 @@
+2022-03-24 Aakash Jain
+
+[ews] Set bug_title property appropriately
+https://bugs.webkit.org/show_bug.cgi?id=238342
+
+Reviewed by Ryan Haddad.
+
+* CISupport/ews-build/steps.py:
+(BugzillaMixin._is_bug_closed):
+
2022-03-24 Brent Fulgham
Disable RTCRtpScriptTransform in CaptivePortal mode
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [291936] trunk
Title: [291936] trunk Revision 291936 Author aakash_j...@apple.com Date 2022-03-26 07:07:38 -0700 (Sat, 26 Mar 2022) Log Message Update my github username. Unreviewed. * metadata/contributors.json: Modified Paths trunk/ChangeLog trunk/metadata/contributors.json Diff Modified: trunk/ChangeLog (291935 => 291936) --- trunk/ChangeLog 2022-03-26 11:38:22 UTC (rev 291935) +++ trunk/ChangeLog 2022-03-26 14:07:38 UTC (rev 291936) @@ -1,3 +1,11 @@ +2022-03-26 Aakash Jain + +Update my github username. + +Unreviewed. + +* metadata/contributors.json: + 2022-03-22 Per Arne Vollan REGRESSION(r291587): Unintentionally removed contributors change Modified: trunk/metadata/contributors.json (291935 => 291936) --- trunk/metadata/contributors.json 2022-03-26 11:38:22 UTC (rev 291935) +++ trunk/metadata/contributors.json 2022-03-26 14:07:38 UTC (rev 291936) @@ -4,7 +4,7 @@ "aakash_j...@apple.com", "aj...@cornell.edu" ], - "github" : "jain-aakash", + "github" : "aj062", "name" : "Aakash Jain", "nicks" : [ "aakash_jain" @@ -7169,4 +7169,4 @@ ], "status" : "reviewer" } -] \ No newline at end of file +] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [291965] trunk/Tools
Title: [291965] trunk/Tools
Revision 291965
Author aakash_j...@apple.com
Date 2022-03-28 07:51:41 -0700 (Mon, 28 Mar 2022)
Log Message
[ews] Update contributors in ews unit tests
https://bugs.webkit.org/show_bug.cgi?id=238416
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps_unittest.py: Use mocked info in unit-tests.
Modified Paths
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (291964 => 291965)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-03-28 14:22:20 UTC (rev 291964)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-03-28 14:51:41 UTC (rev 291965)
@@ -5012,7 +5012,7 @@
def get_patch(self, title='Patch', obsolete=0):
return json.loads('''{{"bug_id": 224460,
- "creator":"aakash_j...@apple.com",
+ "creator":"revie...@apple.com",
"data": "patch-contents",
"file_name":"bug-224460-20210412192105.patch",
"flags": [{{"creation_date" : "2021-04-12T23:21:06Z", "id": 445872, "modification_date": "2021-04-12T23:55:36Z", "name": "review", "setter": "a...@webkit.org", "status": "+", "type_id": 1}}],
@@ -5163,8 +5163,8 @@
def mock_load_contributors(*args, **kwargs):
return {
-'aakash_j...@apple.com': {'name': 'Aakash Jain', 'status': 'reviewer'},
-'jain-aakash': {'name': 'Aakash Jain', 'status': 'reviewer'},
+'revie...@apple.com': {'name': 'WebKit Reviewer', 'status': 'reviewer'},
+'webkit-reviewer': {'name': 'WebKit Reviewer', 'status': 'reviewer'},
'commit...@webkit.org': {'name': 'WebKit Committer', 'status': 'committer'},
'webkit-commit-queue': {'name': 'WebKit Committer', 'status': 'committer'},
}, []
@@ -5179,7 +5179,7 @@
self.setupStep(ValidateCommitterAndReviewer())
self.setProperty('patch_id', '1234')
self.setProperty('patch_committer', 'commit...@webkit.org')
-self.setProperty('reviewer', 'aakash_j...@apple.com')
+self.setProperty('reviewer', 'revie...@apple.com')
self.expectHidden(False)
self.assertEqual(ValidateCommitterAndReviewer.haltOnFailure, False)
self.expectOutcome(result=SUCCESS, state_string='Validated commiter and reviewer')
@@ -5187,7 +5187,7 @@
def test_success_pr(self):
self.setupStep(ValidateCommitterAndReviewer())
-ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: ['jain-aakash']
+ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: ['webkit-reviewer']
self.setProperty('github.number', '1234')
self.setProperty('owners', ['webkit-commit-queue'])
self.expectHidden(False)
@@ -5198,7 +5198,7 @@
def test_success_no_reviewer_patch(self):
self.setupStep(ValidateCommitterAndReviewer())
self.setProperty('patch_id', '1234')
-self.setProperty('patch_committer', 'aakash_j...@apple.com')
+self.setProperty('patch_committer', 'revie...@apple.com')
self.expectHidden(False)
self.expectOutcome(result=SUCCESS, state_string='Validated committer')
return self.runStep()
@@ -5207,7 +5207,7 @@
self.setupStep(ValidateCommitterAndReviewer())
ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: []
self.setProperty('github.number', '1234')
-self.setProperty('owners', ['jain-aakash'])
+self.setProperty('owners', ['webkit-reviewer'])
self.expectHidden(False)
self.expectOutcome(result=SUCCESS, state_string='Validated committer')
return self.runStep()
@@ -5249,7 +5249,7 @@
def test_failure_invalid_reviewer_patch(self):
self.setupStep(ValidateCommitterAndReviewer())
self.setProperty('patch_id', '1234')
-self.setProperty('patch_committer', 'aakash_j...@apple.com')
+self.setProperty('patch_committer', 'revie...@apple.com')
self.setProperty('reviewer', 'commit...@webkit.org')
self.expectHidden(False)
self.expectOutcome(result=FAILURE, state_string='commit...@webkit.org does not have reviewer permissions')
@@ -5259,7 +5259,7 @@
self.setupStep(ValidateCommitterAndReviewer())
ValidateCommitterAndReviewer.get_reviewers = lambda x, pull_request, repository_url=None: ['webkit-commit-queue']
self.setProperty('github.number', '1234')
-self.setProperty('owners', ['jain-aakash'])
+self.setProperty('owners', ['webkit-reviewer'])
self.expectHidden(False)
self.expectOutcome(result=FAILURE, state_string='webkit-commit-queue does not have reviewer permissions')
return self.runStep()
Modified: trunk/Tools/ChangeLog (291964 => 291965)
--- trun
[webkit-changes] [293016] trunk/Tools
Title: [293016] trunk/Tools
Revision 293016
Author aakash_j...@apple.com
Date 2022-04-19 08:45:08 -0700 (Tue, 19 Apr 2022)
Log Message
Delete old buildbot code from bot watchers dashboard
https://bugs.webkit.org/show_bug.cgi?id=239497
Reviewed by Jonathan Bedard.
* Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js:
* Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js:
* Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotQueue.js:
* Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js:
Canonical link: https://commits.webkit.org/249755@main
Modified Paths
trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js
trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js
trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotQueue.js
trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js (293015 => 293016)
--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js 2022-04-19 12:32:02 UTC (rev 293015)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js 2022-04-19 15:45:08 UTC (rev 293016)
@@ -43,12 +43,9 @@
this._authenticationStatus = Buildbot.AuthenticationStatus.Unauthenticated;
this.baseURLForResults = options ? options.baseURLForResults : null;
-this.VERSION_LESS_THAN_09 = options && options.USE_BUILDBOT_VERSION_LESS_THAN_09;
-if (!this.VERSION_LESS_THAN_09) {
-this._builderNameToIDMap = {};
-this._computeBuilderNameToIDMap();
-}
+this._builderNameToIDMap = {};
+this._computeBuilderNameToIDMap();
for (var id in queuesInfo) {
if (queuesInfo[id].combinedQueues) {
@@ -168,9 +165,6 @@
buildPageURLForIteration: function(iteration)
{
-if (this.VERSION_LESS_THAN_09)
-return this.baseURL + "builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id;
-
// FIXME: Remove this._builderNameToIDMap lookup after is fixed.
return this.baseURL + "#/builders/" + encodeURIComponent(this._builderNameToIDMap[iteration.queue.id]) + "/builds/" + iteration.id;
},
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js (293015 => 293016)
--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js 2022-04-19 12:32:02 UTC (rev 293015)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js 2022-04-19 15:45:08 UTC (rev 293016)
@@ -163,17 +163,7 @@
if (!this.failed)
return undefined;
-if (!this.queue.buildbot.VERSION_LESS_THAN_09)
-return this.queue.buildbot.buildPageURLForIteration(this);
-
-console.assert(this._firstFailedStep);
-
-for (var i = 0; i < this._firstFailedStep.logs.length; ++i) {
-if (this._firstFailedStep.logs[i][0] == kind)
-return this._firstFailedStep.logs[i][1];
-}
-
-return undefined;
+return this.queue.buildbot.buildPageURLForIteration(this);
},
get failureLogs()
@@ -202,7 +192,6 @@
_parseData: function(data)
{
-data = ""
console.assert(!this.id || this.id === data.number);
this.id = data.number;
@@ -246,8 +235,6 @@
// The changes array is generally meaningful for svn triggered queues (such as builders),
// but not for internally triggered ones (such as testers), due to coalescing.
this.changes = [];
-if (this.queue.buildbot.VERSION_LESS_THAN_09)
-console.assert(data.sourceStamp || data.sourceStamps)
if (data.sourceStamp)
this.changes = sourceStampChanges(data.sourceStamp);
else if (data.sourceStamps)
@@ -316,61 +303,11 @@
_stdioURLForStep: function(step)
{
-if (this.queue.buildbot.VERSION_LESS_THAN_09) {
-try {
-return step.logs[0][1];
-} catch (ex) {
-return;
-}
-}
-
// FIXME: Update this logic after is fixed. Buildbot 0.9 does
// not provide a URL to stdio for a build step in the REST API, so we are manually constructing the url here.
return this.queue.buildbot.buildPageURLForIteration(this) + "/steps/" + step.number + "/logs/stdio";
},
-// FIXME: Remove this method after https://bugs.webkit.org/show_bug.cgi?id=175056 is fixed.
-_adjustBuildDataForBuildbot09: function(data)
-{
-if (!this.queue.buildbot.VERSION_LESS_THAN_09)
-return data;
-
-data.started_at = data.times[0];
-data.complete_at = data.times[1];
-delete data["times"
[webkit-changes] [293022] trunk/Tools/CISupport/.gitignore
Title: [293022] trunk/Tools/CISupport/.gitignore Revision 293022 Author aakash_j...@apple.com Date 2022-04-19 10:31:42 -0700 (Tue, 19 Apr 2022) Log Message Remove public_html from .gitignore file for CISupport https://bugs.webkit.org/show_bug.cgi?id=239501 Reviewed by Ross Kirsling. * Tools/CISupport/.gitignore: Canonical link: https://commits.webkit.org/249761@main Modified Paths trunk/Tools/CISupport/.gitignore Diff Modified: trunk/Tools/CISupport/.gitignore (293021 => 293022) --- trunk/Tools/CISupport/.gitignore 2022-04-19 17:24:58 UTC (rev 293021) +++ trunk/Tools/CISupport/.gitignore 2022-04-19 17:31:42 UTC (rev 293022) @@ -5,5 +5,4 @@ twistd.pid state.sqlite passwords.json -public_html/ workers/ ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [293325] trunk/Tools/CISupport/build-webkit-org/config.json
Title: [293325] trunk/Tools/CISupport/build-webkit-org/config.json
Revision 293325
Author aakash_j...@apple.com
Date 2022-04-25 07:12:15 -0700 (Mon, 25 Apr 2022)
Log Message
[build.webkit.org] Delete builddir key from config.json
https://bugs.webkit.org/show_bug.cgi?id=239718
Reviewed by Jonathan Bedard.
* Tools/CISupport/build-webkit-org/config.json:
Canonical link: https://commits.webkit.org/249948@main
Modified Paths
trunk/Tools/CISupport/build-webkit-org/config.json
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/config.json (293324 => 293325)
--- trunk/Tools/CISupport/build-webkit-org/config.json 2022-04-25 13:58:25 UTC (rev 293324)
+++ trunk/Tools/CISupport/build-webkit-org/config.json 2022-04-25 14:12:15 UTC (rev 293325)
@@ -139,7 +139,7 @@
],
"builders": [
-{ "name": "Apple-Monterey-Release-Build", "factory": "BuildFactory", "builddir": "monterey-release",
+{ "name": "Apple-Monterey-Release-Build", "factory": "BuildFactory",
"platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
"triggers": [
"monterey-applesilicon-release-tests-test262" ,"monterey-release-tests-test262", "monterey-release-tests-wk1", "monterey-release-tests-wk2",
@@ -147,35 +147,35 @@
],
"workernames": ["bot185", "bot187"]
},
-{ "name": "Apple-Monterey-AppleSilicon-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "monterey-applesilicon-release-tests-test262",
+{ "name": "Apple-Monterey-AppleSilicon-Release-Test262-Tests", "factory": "Test262Factory",
"platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
"workernames": ["bot165"]
},
-{ "name": "Apple-Monterey-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "monterey-release-tests-test262",
+{ "name": "Apple-Monterey-Release-Test262-Tests", "factory": "Test262Factory",
"platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
"workernames": ["bot632"]
},
-{ "name": "Apple-Monterey-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "monterey-release-tests-wk1",
+{ "name": "Apple-Monterey-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory",
"platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
"additionalArguments": ["--no-retry-failures"],
"workernames": ["bot1021"]
},
-{ "name": "Apple-Monterey-Release-AppleSilicon-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "monterey-release-applesilicon-tests-wk2",
+{ "name": "Apple-Monterey-Release-AppleSilicon-WK2-Tests", "factory": "TestAllButJSCFactory",
"platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
"additionalArguments": ["--no-retry-failures"],
"workernames": ["bot135"]
},
-{ "name": "Apple-Monterey-Release-AppleSilicon-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "monterey-release-applesilicon-tests-wk1",
+{ "name": "Apple-Monterey-Release-AppleSilicon-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory",
"platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
"additionalArguments": ["--no-retry-failures"],
"workernames": ["bot138"]
},
-{ "name": "Apple-Monterey-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "monterey-release-tests-wk2",
+{ "name": "Apple-Monterey-Release-WK2-Tests", "factory": "TestAllButJSCFactory",
"platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
"additionalArguments": ["--no-retry-failures"],
"workernames": ["bot1023"]
},
-{ "name": "Apple-Monterey-Debug-Build", "factory": "BuildFactory", "builddir": "monterey-debug",
+{ "name": "Apple-Monterey-Debug-Build", "factory": "BuildFactory",
"platform": "mac-monterey", "configuration": "debug", "architectures": ["x86_64", "arm64"],
"triggers": [
"monterey-debug-tests-test262", "monterey-debug-tests-wk1", "monterey-de
[webkit-changes] [293573] trunk/Tools/CISupport/ews-build/steps.py
Title: [293573] trunk/Tools/CISupport/ews-build/steps.py
Revision 293573
Author aakash_j...@apple.com
Date 2022-04-28 09:20:18 -0700 (Thu, 28 Apr 2022)
Log Message
Merge-queue error message about missing user permissions from contributors.json should indicate how to fix it
https://bugs.webkit.org/show_bug.cgi?id=239851
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/steps.py:
(ValidateCommitterAndReviewer.fail_build):
Canonical link: https://commits.webkit.org/250087@main
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (293572 => 293573)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-04-28 15:12:24 UTC (rev 293572)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-04-28 16:20:18 UTC (rev 293573)
@@ -1528,6 +1528,7 @@
if patch_id:
comment += f'\n\nRejecting attachment {patch_id} from commit queue.'
elif pr_number:
+comment += f'\n\nIf you do have {status} permmissions, please ensure that your GitHub username is added to contributors.json.'
comment += f'\n\nRejecting {self.getProperty("github.head.sha", f"#{pr_number}")} from merge queue.'
self.setProperty('comment_text', comment)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [290363] trunk/Tools/CISupport/ews-build/steps_unittest.py
Title: [290363] trunk/Tools/CISupport/ews-build/steps_unittest.py
Revision 290363
Author aakash_j...@apple.com
Date 2022-02-23 03:49:04 -0800 (Wed, 23 Feb 2022)
Log Message
Use python 3 f-strings in EWS - part 1
https://bugs.webkit.org/show_bug.cgi?id=237053
Reviewed by Ryan Haddad.
* Tools/CISupport/ews-build/steps_unittest.py: Used f-strings for formatting.
(ExpectMasterShellCommand.__repr__):
(BuildStepMixinAdditions._checkSpawnProcess):
(BuildStepMixinAdditions._send_email):
(TestStepNameShouldBeValidIdentifier.test_step_names_are_valid):
(test_success):
(test_unexpected_failure):
Canonical link: https://commits.webkit.org/247681@main
Modified Paths
trunk/Tools/CISupport/ews-build/steps_unittest.py
Diff
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (290362 => 290363)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-02-23 11:44:43 UTC (rev 290362)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-02-23 11:49:04 UTC (rev 290363)
@@ -97,7 +97,7 @@
return self
def __repr__(self):
-return 'ExpectMasterShellCommand({0})'.format(repr(self.args))
+return f'ExpectMasterShellCommand({repr(self.args)})'
class BuildStepMixinAdditions(BuildStepMixin, TestReactorMixin):
@@ -165,7 +165,7 @@
def _checkSpawnProcess(self, processProtocol, executable, args, env, path, usePTY, **kwargs):
got = (executable, args, env, path, usePTY)
if not self._expected_local_commands:
-self.fail('got local command {0} when no further commands were expected'.format(got))
+self.fail(f'got local command {got} when no further commands were expected')
local_command = self._expected_local_commands.pop(0)
try:
self.assertEqual(got, (local_command.args[0], local_command.args, local_command.env, local_command.path, local_command.usePTY))
@@ -200,7 +200,7 @@
if not subject or not text:
self._emails_list.append('Error: skipping email since no subject or text is specified')
return False
-self._emails_list.append('Subject: {}\nTo: {}\nReference: {}\nBody:\n\n{}'.format(subject, to_emails, reference, text))
+self._emails_list.append(f'Subject: {subject}\nTo: {to_emails}\nReference: {reference}\nBody:\n\n{text}')
return True
def runStep(self):
@@ -273,8 +273,8 @@
for build_step in build_step_classes:
if 'name' in vars(build_step[1]):
name = build_step[1].name
-self.assertFalse(' ' in name, 'step name "{}" contain space.'.format(name))
-self.assertTrue(buildbot_identifiers.ident_re.match(name), 'step name "{}" is not a valid buildbot identifier.'.format(name))
+self.assertFalse(' ' in name, f'step name "{name}" contain space.')
+self.assertTrue(buildbot_identifiers.ident_re.match(name), f'step name "{name}" is not a valid buildbot identifier.')
class TestCheckStyle(BuildStepMixinAdditions, unittest.TestCase):
@@ -464,7 +464,7 @@
ExpectShell(workdir='wkdir',
timeout=300,
logEnviron=False,
-command=['python3', 'Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(self.jsonFileName)],
+command=['python3', 'Tools/Scripts/run-bindings-tests', f'--json-output={self.jsonFileName}'],
logfiles={'json': self.jsonFileName},
)
+ 0,
@@ -478,7 +478,7 @@
ExpectShell(workdir='wkdir',
timeout=300,
logEnviron=False,
-command=['python3', 'Tools/Scripts/run-bindings-tests', '--json-output={0}'.format(self.jsonFileName)],
+command=['python3', 'Tools/Scripts/run-bindings-tests', f'--json-output={self.jsonFileName}'],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='FAIL: (JS) JSTestInterface.cpp')
@@ -547,7 +547,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
-command=['python', 'Tools/Scripts/test-webkitpy', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+command=['python', 'Tools/Scripts/test-webkitpy', '--verbose', f'--json-output={self.jsonFileName}'],
logfiles={'json': self.jsonFileName},
timeout=120,
)
@@ -561,7 +561,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
-command=['python', 'Tools/Scripts/test-webkitpy', '--verbose', '--json-output={0}'.format(self.jsonFileName)],
+command=['python', 'Tools/Scripts/test-webkitpy'
[webkit-changes] [244923] trunk/Tools
Title: [244923] trunk/Tools Revision 244923 Author aakash_j...@apple.com Date 2019-05-03 14:58:25 -0700 (Fri, 03 May 2019) Log Message webkit-patch --no-review upload does not submit patch to New EWS https://bugs.webkit.org/show_bug.cgi?id=197519 Reviewed by Lucas Forschler. * Scripts/webkitpy/tool/steps/submittoews.py: (SubmitToEWS.run): Submit to both old and new EWS. * Scripts/webkitpy/common/config/urls.py: Added url for new EWS server. * Scripts/webkitpy/common/net/ewsserver.py: Added. (EWSServer._server_url): Method to return server url. (EWSServer._post_patch_to_ews): Method to post patch to ews. (EWSServer.submit_to_ews): Method to submit the patch to ews using NetworkTransaction. * Scripts/webkitpy/common/net/ewsserver_mock.py: Added Mock EWS Server. * Scripts/webkitpy/common/net/ewsserver_unittest.py: Added unit-test for EWS Server. * Scripts/webkitpy/common/net/statusserver_mock.py: (MockStatusServer.submit_to_ews): Updated the log text. * Scripts/webkitpy/tool/commands/queues_unittest.py: Updated unit-tests. * Scripts/webkitpy/tool/commands/upload_unittest.py: Ditto. * Scripts/webkitpy/tool/main.py: (WebKitPatch.__init__): Initialize ews_server. * Scripts/webkitpy/tool/mocktool.py: (MockTool.__init__): Ditto. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/common/config/urls.py trunk/Tools/Scripts/webkitpy/common/net/statusserver.py trunk/Tools/Scripts/webkitpy/common/net/statusserver_mock.py trunk/Tools/Scripts/webkitpy/common/net/web_mock.py trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py trunk/Tools/Scripts/webkitpy/tool/main.py trunk/Tools/Scripts/webkitpy/tool/mocktool.py trunk/Tools/Scripts/webkitpy/tool/steps/submittoews.py Added Paths trunk/Tools/Scripts/webkitpy/common/net/ewsserver.py trunk/Tools/Scripts/webkitpy/common/net/ewsserver_mock.py trunk/Tools/Scripts/webkitpy/common/net/ewsserver_unittest.py Diff Modified: trunk/Tools/ChangeLog (244922 => 244923) --- trunk/Tools/ChangeLog 2019-05-03 21:47:37 UTC (rev 244922) +++ trunk/Tools/ChangeLog 2019-05-03 21:58:25 UTC (rev 244923) @@ -1,3 +1,29 @@ +2019-05-03 Aakash Jain + +webkit-patch --no-review upload does not submit patch to New EWS +https://bugs.webkit.org/show_bug.cgi?id=197519 + + +Reviewed by Lucas Forschler. + +* Scripts/webkitpy/tool/steps/submittoews.py: +(SubmitToEWS.run): Submit to both old and new EWS. +* Scripts/webkitpy/common/config/urls.py: Added url for new EWS server. +* Scripts/webkitpy/common/net/ewsserver.py: Added. +(EWSServer._server_url): Method to return server url. +(EWSServer._post_patch_to_ews): Method to post patch to ews. +(EWSServer.submit_to_ews): Method to submit the patch to ews using NetworkTransaction. +* Scripts/webkitpy/common/net/ewsserver_mock.py: Added Mock EWS Server. +* Scripts/webkitpy/common/net/ewsserver_unittest.py: Added unit-test for EWS Server. +* Scripts/webkitpy/common/net/statusserver_mock.py: +(MockStatusServer.submit_to_ews): Updated the log text. +* Scripts/webkitpy/tool/commands/queues_unittest.py: Updated unit-tests. +* Scripts/webkitpy/tool/commands/upload_unittest.py: Ditto. +* Scripts/webkitpy/tool/main.py: +(WebKitPatch.__init__): Initialize ews_server. +* Scripts/webkitpy/tool/mocktool.py: +(MockTool.__init__): Ditto. + 2019-05-03 Chris Dumez ASSERTION FAILED: [weakThis->m_view window] == weakThis->m_targetWindowForMovePreparation Modified: trunk/Tools/Scripts/webkitpy/common/config/urls.py (244922 => 244923) --- trunk/Tools/Scripts/webkitpy/common/config/urls.py 2019-05-03 21:47:37 UTC (rev 244922) +++ trunk/Tools/Scripts/webkitpy/common/config/urls.py 2019-05-03 21:58:25 UTC (rev 244923) @@ -1,4 +1,5 @@ # Copyright (c) 2010, Google Inc. All rights reserved. +# Copyright (c) 2019 Apple Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -55,6 +56,7 @@ svn_server_realm = " Mac OS Forge" statusserver_default_host = "webkit-queues.webkit.org" +ewsserver_default_host = "ews.webkit.org" def parse_bug_id(string): Added: trunk/Tools/Scripts/webkitpy/common/net/ewsserver.py (0 => 244923) --- trunk/Tools/Scripts/webkitpy/common/net/ewsserver.py (rev 0) +++ trunk/Tools/Scripts/webkitpy/common/net/ewsserver.py 2019-05-03 21:58:25 UTC (rev 244923) @@ -0,0 +1,51 @@ +# Copyright (C) 2019 Apple Inc. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistri
[webkit-changes] [244930] trunk/Tools
Title: [244930] trunk/Tools
Revision 244930
Author aakash_j...@apple.com
Date 2019-05-03 15:06:57 -0700 (Fri, 03 May 2019)
Log Message
New EWS: patches on recently added queues listed as #1 for older bugs
https://bugs.webkit.org/show_bug.cgi?id=197496
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble._build_bubble):
(StatusBubble._queue_position):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (244929 => 244930)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-05-03 22:06:30 UTC (rev 244929)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-05-03 22:06:57 UTC (rev 244930)
@@ -62,6 +62,8 @@
bubble['state'] = 'none'
queue_position = self._queue_position(patch, queue, self._get_parent_queue(queue))
bubble['queue_position'] = queue_position
+if not queue_position:
+return None
bubble['details_message'] = 'Waiting in queue, processing has not started yet.\n\nPosition in queue: {}'.format(queue_position)
return bubble
@@ -181,6 +183,12 @@
DAYS_TO_CHECK = 3
from_timestamp = timezone.now() - datetime.timedelta(days=DAYS_TO_CHECK)
+if patch.modified < from_timestamp:
+# Do not display bubble for old patch for which no build has been reported on given queue.
+# Most likely the patch would never be processed on this queue, since either the queue was
+# added after the patch was submitted, or build request for that patch was cancelled.
+return None
+
previously_sent_patches = set(Patch.objects
.filter(modified__gte=from_timestamp)
.filter(sent_to_buildbot=True)
Modified: trunk/Tools/ChangeLog (244929 => 244930)
--- trunk/Tools/ChangeLog 2019-05-03 22:06:30 UTC (rev 244929)
+++ trunk/Tools/ChangeLog 2019-05-03 22:06:57 UTC (rev 244930)
@@ -1,5 +1,16 @@
2019-05-03 Aakash Jain
+New EWS: patches on recently added queues listed as #1 for older bugs
+https://bugs.webkit.org/show_bug.cgi?id=197496
+
+Reviewed by Lucas Forschler.
+
+* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+(StatusBubble._build_bubble):
+(StatusBubble._queue_position):
+
+2019-05-03 Aakash Jain
+
webkit-patch --no-review upload does not submit patch to New EWS
https://bugs.webkit.org/show_bug.cgi?id=197519
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [244940] trunk/Tools
Title: [244940] trunk/Tools
Revision 244940
Author aakash_j...@apple.com
Date 2019-05-03 17:17:25 -0700 (Fri, 03 May 2019)
Log Message
New EWS: Clicking on white bubble navigates to page with only bubbles
https://bugs.webkit.org/show_bug.cgi?id=197520
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-app/ews/templates/statusbubble.html: Disable clicking if bubble doesn't have any url.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html (244939 => 244940)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html 2019-05-03 23:57:21 UTC (rev 244939)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/templates/statusbubble.html 2019-05-04 00:17:25 UTC (rev 244940)
@@ -77,7 +77,9 @@
{% else %}
{% for bubble in bubbles %}
+ {% if bubble.url %}
href="" bubble.url }}"
+ {% endif %}
{% if bubble.details_message %}
title="{{ bubble.details_message }}"
{% endif %}
Modified: trunk/Tools/ChangeLog (244939 => 244940)
--- trunk/Tools/ChangeLog 2019-05-03 23:57:21 UTC (rev 244939)
+++ trunk/Tools/ChangeLog 2019-05-04 00:17:25 UTC (rev 244940)
@@ -1,3 +1,12 @@
+2019-05-03 Aakash Jain
+
+New EWS: Clicking on white bubble navigates to page with only bubbles
+https://bugs.webkit.org/show_bug.cgi?id=197520
+
+Reviewed by Lucas Forschler.
+
+* BuildSlaveSupport/ews-app/ews/templates/statusbubble.html: Disable clicking if bubble doesn't have any url.
+
2019-05-03 Daniel Bates
[lldb-webkit] Support adding pretty-printing for qualified types
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245136] trunk/Tools
Title: [245136] trunk/Tools
Revision 245136
Author aakash_j...@apple.com
Date 2019-05-09 09:09:35 -0700 (Thu, 09 May 2019)
Log Message
[ews-app] Production and Development env should configure DEBUG appropriately
https://bugs.webkit.org/show_bug.cgi?id=197700
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-app/ews-app/settings.py:
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews-app/settings.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews-app/settings.py (245135 => 245136)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews-app/settings.py 2019-05-09 14:42:35 UTC (rev 245135)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews-app/settings.py 2019-05-09 16:09:35 UTC (rev 245136)
@@ -33,6 +33,8 @@
import os
+is_test_mode_enabled = os.getenv('EWS_PRODUCTION') is None
+
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -43,8 +45,10 @@
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = os.environ.get('EWS_SECRET_KEY', 'secret')
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
+if is_test_mode_enabled:
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
ALLOWED_HOSTS = ['*']
@@ -95,7 +99,6 @@
# Database
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
-is_test_mode_enabled = os.getenv('EWS_PRODUCTION') is None
if is_test_mode_enabled:
DATABASES = {
'default': {
Modified: trunk/Tools/ChangeLog (245135 => 245136)
--- trunk/Tools/ChangeLog 2019-05-09 14:42:35 UTC (rev 245135)
+++ trunk/Tools/ChangeLog 2019-05-09 16:09:35 UTC (rev 245136)
@@ -1,3 +1,12 @@
+2019-05-09 Aakash Jain
+
+[ews-app] Production and Development env should configure DEBUG appropriately
+https://bugs.webkit.org/show_bug.cgi?id=197700
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-app/ews-app/settings.py:
+
2019-05-09 Xan López
[CMake] Detect SSE2 at compile time
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245141] trunk/Tools
Title: [245141] trunk/Tools
Revision 245141
Author aakash_j...@apple.com
Date 2019-05-09 10:13:47 -0700 (Thu, 09 May 2019)
Log Message
[ews-build] Fix formatting issues and typos
https://bugs.webkit.org/show_bug.cgi?id=197737
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(CompileWebKit.evaluateCommand): Removed extra empty line.
* BuildSlaveSupport/ews-build/steps_unittest.py:
(TestRunWebKitPerlTests): Fixed typo.
* BuildSlaveSupport/ews-app/ews/models/step.py:
(Step.save_step): Changed log level to info so that it is logged in production.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/models/step.py
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/step.py (245140 => 245141)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/step.py 2019-05-09 16:57:25 UTC (rev 245140)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/step.py 2019-05-09 17:13:47 UTC (rev 245141)
@@ -64,7 +64,7 @@
# Save the new step data, e.g.: step start event.
Step(step_uid, build_uid, result, state_string, started_at, complete_at).save()
-_log.debug('Saved step {} in database for build: {}'.format(step_uid, build_uid))
+_log.info('Saved step {} in database for build: {}'.format(step_uid, build_uid))
return SUCCESS
@classmethod
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (245140 => 245141)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-09 16:57:25 UTC (rev 245140)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-09 17:13:47 UTC (rev 245141)
@@ -617,7 +617,6 @@
else:
self.build.addStepsAfterCurrentStep([ArchiveBuiltProduct(), UploadBuiltProduct()])
-
return super(CompileWebKit, self).evaluateCommand(cmd)
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (245140 => 245141)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-05-09 16:57:25 UTC (rev 245140)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-05-09 17:13:47 UTC (rev 245141)
@@ -318,7 +318,7 @@
return self.runStep()
-class TestunWebKitPerlTests(BuildStepMixinAdditions, unittest.TestCase):
+class TestRunWebKitPerlTests(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
return self.setUpBuildStep()
@@ -1234,7 +1234,7 @@
self.expectOutcome(result=FAILURE, state_string='4 api tests failed or timed out (failure)')
return self.runStep()
-def test_unexpecte_failure(self):
+def test_unexpected_failure(self):
self.setupStep(RunAPITests())
self.setProperty('fullPlatform', 'mac-mojave')
self.setProperty('platform', 'mac')
Modified: trunk/Tools/ChangeLog (245140 => 245141)
--- trunk/Tools/ChangeLog 2019-05-09 16:57:25 UTC (rev 245140)
+++ trunk/Tools/ChangeLog 2019-05-09 17:13:47 UTC (rev 245141)
@@ -1,5 +1,19 @@
2019-05-09 Aakash Jain
+[ews-build] Fix formatting issues and typos
+https://bugs.webkit.org/show_bug.cgi?id=197737
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(CompileWebKit.evaluateCommand): Removed extra empty line.
+* BuildSlaveSupport/ews-build/steps_unittest.py:
+(TestRunWebKitPerlTests): Fixed typo.
+* BuildSlaveSupport/ews-app/ews/models/step.py:
+(Step.save_step): Changed log level to info so that it is logged in production.
+
+2019-05-09 Aakash Jain
+
[ews-app] Production and Development env should configure DEBUG appropriately
https://bugs.webkit.org/show_bug.cgi?id=197700
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245143] trunk/Tools
Title: [245143] trunk/Tools
Revision 245143
Author aakash_j...@apple.com
Date 2019-05-09 10:26:11 -0700 (Thu, 09 May 2019)
Log Message
[ews-app] Add migrations file to repository
https://bugs.webkit.org/show_bug.cgi?id=197729
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-app/ews/migrations/0001_initial.py: Added. Auto-generated by Django based on models' information.
Modified Paths
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/migrations/0001_initial.py
Diff
Added: trunk/Tools/BuildSlaveSupport/ews-app/ews/migrations/0001_initial.py (0 => 245143)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/migrations/0001_initial.py (rev 0)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/migrations/0001_initial.py 2019-05-09 17:26:11 UTC (rev 245143)
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-03-26 20:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+initial = True
+
+dependencies = [
+]
+
+operations = [
+migrations.CreateModel(
+name='Build',
+fields=[
+('uid', models.TextField(primary_key=True, serialize=False)),
+('builder_id', models.IntegerField()),
+('builder_name', models.TextField()),
+('builder_display_name', models.TextField()),
+('number', models.IntegerField()),
+('result', models.IntegerField(blank=True, null=True)),
+('state_string', models.TextField()),
+('started_at', models.IntegerField(blank=True, null=True)),
+('complete_at', models.IntegerField(blank=True, null=True)),
+('created', models.DateTimeField(auto_now_add=True)),
+('modified', models.DateTimeField(auto_now=True)),
+],
+),
+migrations.CreateModel(
+name='BuildbotInstance',
+fields=[
+('instance_id', models.AutoField(primary_key=True, serialize=False)),
+('hostname', models.TextField()),
+('active', models.BooleanField(default=True)),
+('created', models.DateTimeField(auto_now_add=True)),
+('modified', models.DateTimeField(auto_now=True)),
+],
+),
+migrations.CreateModel(
+name='Patch',
+fields=[
+('patch_id', models.IntegerField(primary_key=True, serialize=False)),
+('bug_id', models.IntegerField()),
+('obsolete', models.BooleanField(default=False)),
+('sent_to_buildbot', models.BooleanField(default=False)),
+('created', models.DateTimeField(auto_now_add=True)),
+('modified', models.DateTimeField(auto_now=True)),
+],
+),
+migrations.CreateModel(
+name='Step',
+fields=[
+('uid', models.TextField(primary_key=True, serialize=False)),
+('result', models.IntegerField(blank=True, null=True)),
+('state_string', models.TextField()),
+('started_at', models.IntegerField(blank=True, null=True)),
+('complete_at', models.IntegerField(blank=True, null=True)),
+('created', models.DateTimeField(auto_now_add=True)),
+('modified', models.DateTimeField(auto_now=True)),
+('build_uid', models.ForeignKey(db_column='build_uid', db_constraint=False, _on_delete_=django.db.models.deletion.CASCADE, to='ews.Build')),
+],
+),
+migrations.AddField(
+model_name='build',
+name='patch',
+field=models.ForeignKey(db_constraint=False, _on_delete_=django.db.models.deletion.CASCADE, to='ews.Patch'),
+),
+]
Modified: trunk/Tools/ChangeLog (245142 => 245143)
--- trunk/Tools/ChangeLog 2019-05-09 17:14:06 UTC (rev 245142)
+++ trunk/Tools/ChangeLog 2019-05-09 17:26:11 UTC (rev 245143)
@@ -1,5 +1,14 @@
2019-05-09 Aakash Jain
+[ews-app] Add migrations file to repository
+https://bugs.webkit.org/show_bug.cgi?id=197729
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-app/ews/migrations/0001_initial.py: Added. Auto-generated by Django based on models' information.
+
+2019-05-09 Aakash Jain
+
[ews-build] Fix formatting issues and typos
https://bugs.webkit.org/show_bug.cgi?id=197737
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245282] trunk/Tools
Title: [245282] trunk/Tools
Revision 245282
Author aakash_j...@apple.com
Date 2019-05-14 09:18:24 -0700 (Tue, 14 May 2019)
Log Message
[ews-app] Status bubble should turn orange when any build step fails
https://bugs.webkit.org/show_bug.cgi?id=197812
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble._build_bubble): Turn status-bubble orange if there is any failed step in the on-going build.
(StatusBubble._does_build_contains_any_failed_step): Method to check if build contains any failed step.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (245281 => 245282)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-05-14 15:49:35 UTC (rev 245281)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-05-14 16:18:24 UTC (rev 245282)
@@ -71,7 +71,10 @@
builder_full_name = build.builder_name.replace('-', ' ')
if build.result is None: # In-progress build
-bubble['state'] = 'started'
+if self._does_build_contains_any_failed_step(build):
+bubble['state'] = 'provisional-fail'
+else:
+bubble['state'] = 'started'
bubble['details_message'] = 'Build is in-progress. Recent messages:\n\n' + self._steps_messages(build)
elif build.result == Buildbot.SUCCESS:
if is_parent_build:
@@ -150,6 +153,12 @@
def _should_display_step(self, step):
return not filter(lambda step_to_hide: re.search(step_to_hide, step.state_string), StatusBubble.STEPS_TO_HIDE)
+def _does_build_contains_any_failed_step(self, build):
+for step in build.step_set.all():
+if step.result and step.result != Buildbot.SUCCESS:
+return True
+return False
+
def _most_recent_step_message(self, build):
recent_step = build.step_set.last()
if not recent_step:
Modified: trunk/Tools/ChangeLog (245281 => 245282)
--- trunk/Tools/ChangeLog 2019-05-14 15:49:35 UTC (rev 245281)
+++ trunk/Tools/ChangeLog 2019-05-14 16:18:24 UTC (rev 245282)
@@ -1,3 +1,14 @@
+2019-05-14 Aakash Jain
+
+[ews-app] Status bubble should turn orange when any build step fails
+https://bugs.webkit.org/show_bug.cgi?id=197812
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+(StatusBubble._build_bubble): Turn status-bubble orange if there is any failed step in the on-going build.
+(StatusBubble._does_build_contains_any_failed_step): Method to check if build contains any failed step.
+
2019-05-14 Alex Christensen
Add a unit test for client certificate authentication
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245359] trunk/Tools
Title: [245359] trunk/Tools
Revision 245359
Author aakash_j...@apple.com
Date 2019-05-15 15:21:24 -0700 (Wed, 15 May 2019)
Log Message
[ews-build] Enabling uploading EWS archives to S3
https://bugs.webkit.org/show_bug.cgi?id=197914
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/Shared: Added.
* BuildSlaveSupport/Shared/transfer-archive-to-s3: Moved from Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3.
(archiveExists): Replace tab with space.
(main): Added main method.
* BuildSlaveSupport/build.webkit.org-config/steps.py:
(TransferToS3): Updated path to the script.
* BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3: Moved to Shared folder.
Modified Paths
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/BuildSlaveSupport/Shared/
trunk/Tools/BuildSlaveSupport/Shared/transfer-archive-to-s3
Removed Paths
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3
Diff
Copied: trunk/Tools/BuildSlaveSupport/Shared/transfer-archive-to-s3 (from rev 245358, trunk/Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3) (0 => 245359)
--- trunk/Tools/BuildSlaveSupport/Shared/transfer-archive-to-s3 (rev 0)
+++ trunk/Tools/BuildSlaveSupport/Shared/transfer-archive-to-s3 2019-05-15 22:21:24 UTC (rev 245359)
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+import argparse
+import boto3
+import os
+import sys
+
+S3_DEFAULT_BUCKET = 'archives.webkit.org'
+S3_EWS_BUCKET = 'ews-archives.webkit.org'
+S3_MINIFIED_BUCKET = 'minified-archives.webkit.org'
+S3_REGION_PREFIX = 'https://s3-us-west-2.amazonaws.com'
+
+def uploadToS3(archive_path, bucket, identifier, revision):
+print 'Transferring {} to S3...'.format(archive_path)
+key = '/'.join([identifier, revision + '.zip'])
+print '\tS3 Bucket: {}\n\tS3 Key: {}'.format(bucket, key)
+s3 = boto3.client('s3')
+s3.upload_file(archive_path, bucket, key)
+print('\tS3 URL: {}/{}/{}'.format(S3_REGION_PREFIX, bucket, key))
+
+def archiveExists(archive):
+if archive:
+if os.path.exists(archive):
+return True
+else:
+print 'WARNING: Archive does not exist: {}'.format(archive)
+return False
+
+def main():
+parser = argparse.ArgumentParser(add_help=True)
+
+group = parser.add_mutually_exclusive_group(required=True)
+group.add_argument('--revision', action="" help='Revision number or patch_id for the built archive')
+group.add_argument('--patch_id', action="" help='patch_id of the patch')
+
+parser.add_argument('--identifier', action="" required=True, help='S3 destination identifier, in the form of fullPlatform-architecture-configuration. [mac-mojave-x86_64-release]')
+parser.add_argument('--archive', action="" required=True, help='Path to the full size archive. [path/to/123456.zip]')
+args = parser.parse_args()
+
+parentdir, filename = os.path.split(str(args.archive))
+minifiedArchive = os.path.join(parentdir, 'minified-' + filename)
+
+s3_bucket = S3_DEFAULT_BUCKET
+if args.patch_id:
+s3_bucket = S3_EWS_BUCKET
+
+if archiveExists(args.archive):
+uploadToS3(args.archive, s3_bucket, args.identifier, args.revision or args.patch_id)
+if not args.patch_id and archiveExists(minifiedArchive):
+uploadToS3(minifiedArchive, S3_MINIFIED_BUCKET, args.identifier, args.revision)
+
+if __name__ == "__main__":
+main()
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (245358 => 245359)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2019-05-15 22:15:49 UTC (rev 245358)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2019-05-15 22:21:24 UTC (rev 245359)
@@ -874,7 +874,7 @@
minifiedArchive = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/minified-%(got_revision)s.zip")
identifier = WithProperties("%(fullPlatform)s-%(architecture)s-%(configuration)s")
revision = WithProperties("%(got_revision)s")
-command = ["python", "./transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
+command = ["python", "../Shared/transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
haltOnFailure = True
def __init__(self, **kwargs):
Deleted: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3 (245358 => 245359)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3 2019-05-15 22:15:49 UTC (rev 245358)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3 2019-05-15 22:21:24 UTC (rev 245359)
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-import argparse
-import boto3
-import os
-import os.path
-import sys
-
-S3_BUCKET = 'archives.webkit.org'
-S3_MINIFIED_BUCKET = 'minified-archives.webkit.org'
-S3_REGION_PREFIX = 'htt
[webkit-changes] [245365] trunk/Tools
Title: [245365] trunk/Tools
Revision 245365
Author aakash_j...@apple.com
Date 2019-05-15 15:41:59 -0700 (Wed, 15 May 2019)
Log Message
Replace double-quotes with single quotes in steps.py
https://bugs.webkit.org/show_bug.cgi?id=197921
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (245364 => 245365)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-15 22:39:57 UTC (rev 245364)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-15 22:41:59 UTC (rev 245365)
@@ -39,9 +39,9 @@
class ConfigureBuild(buildstep.BuildStep):
-name = "configure-build"
-description = ["configuring build"]
-descriptionDone = ["Configured build"]
+name = 'configure-build'
+description = ['configuring build']
+descriptionDone = ['Configured build']
def __init__(self, platform, configuration, architectures, buildOnly, triggers, additionalArguments):
super(ConfigureBuild, self).__init__()
@@ -50,7 +50,7 @@
self.platform = platform.split('-', 1)[0]
self.fullPlatform = platform
self.configuration = configuration
-self.architecture = " ".join(architectures) if architectures else None
+self.architecture = ' '.join(architectures) if architectures else None
self.buildOnly = buildOnly
self.triggers = triggers
self.additionalArguments = additionalArguments
@@ -65,11 +65,11 @@
if self.architecture:
self.setProperty('architecture', self.architecture, 'config.json')
if self.buildOnly:
-self.setProperty("buildOnly", self.buildOnly, 'config.json')
+self.setProperty('buildOnly', self.buildOnly, 'config.json')
if self.triggers:
self.setProperty('triggers', self.triggers, 'config.json')
if self.additionalArguments:
-self.setProperty("additionalArguments", self.additionalArguments, 'config.json')
+self.setProperty('additionalArguments', self.additionalArguments, 'config.json')
self.add_patch_id_url()
self.finished(SUCCESS)
@@ -153,34 +153,34 @@
haltOnFailure = True
bindings_paths = [
-"Source/WebCore",
-"Tools",
+'Source/WebCore',
+'Tools',
]
jsc_paths = [
-"JSTests/",
-"Source/_javascript_Core/",
-"Source/WTF/",
-"Source/bmalloc/",
-"Makefile",
-"Makefile.shared",
-"Source/Makefile",
-"Source/Makefile.shared",
-"Tools/Scripts/build-webkit",
-"Tools/Scripts/build-jsc",
-"Tools/Scripts/jsc-stress-test-helpers/",
-"Tools/Scripts/run-jsc",
-"Tools/Scripts/run-jsc-benchmarks",
-"Tools/Scripts/run-jsc-stress-tests",
-"Tools/Scripts/run-_javascript_core-tests",
-"Tools/Scripts/run-layout-jsc",
-"Tools/Scripts/update-_javascript_core-test-results",
-"Tools/Scripts/webkitdirs.pm",
+'JSTests/',
+'Source/_javascript_Core/',
+'Source/WTF/',
+'Source/bmalloc/',
+'Makefile',
+'Makefile.shared',
+'Source/Makefile',
+'Source/Makefile.shared',
+'Tools/Scripts/build-webkit',
+'Tools/Scripts/build-jsc',
+'Tools/Scripts/jsc-stress-test-helpers/',
+'Tools/Scripts/run-jsc',
+'Tools/Scripts/run-jsc-benchmarks',
+'Tools/Scripts/run-jsc-stress-tests',
+'Tools/Scripts/run-_javascript_core-tests',
+'Tools/Scripts/run-layout-jsc',
+'Tools/Scripts/update-_javascript_core-test-results',
+'Tools/Scripts/webkitdirs.pm',
]
webkitpy_paths = [
-"Tools/Scripts/webkitpy/",
-"Tools/QueueStatusServer/",
+'Tools/Scripts/webkitpy/',
+'Tools/QueueStatusServer/',
]
group_to_paths_mapping = {
@@ -242,8 +242,8 @@
descriptionDone = ['Validated patch']
flunkOnFailure = True
haltOnFailure = True
-bug_open_statuses = ["UNCONFIRMED", "NEW", "ASSIGNED", "REOPENED"]
-bug_closed_statuses = ["RESOLVED", "VERIFIED", "CLOSED"]
+bug_open_statuses = ['UNCONFIRMED', 'NEW', 'ASSIGNED', 'REOPENED']
+bug_closed_statuses = ['RESOLVED', 'VERIFIED', 'CLOSED']
@defer.inlineCallbacks
def _addToLog(self, logName, message):
@@ -404,7 +404,7 @@
class TestWithFailureCount(shell.Test):
-failedTestsFormatString = "%d test%s failed"
+failedTestsFormatString = '%d test%s failed'
failedTestCount = 0
def start(self):
@@ -418,7 +418,7 @@
def commandComplete(self, cmd):
shell.Test.commandComplete(self, cmd)
self.failedTestCount = self.countFailures(cmd)
-self.failedTestPluralSuffix = "" if self.failedTestCount == 1 else "s"
+self.failedTestPluralSuffix = '' if self.failedTestCount =
[webkit-changes] [245433] trunk/Tools
Title: [245433] trunk/Tools
Revision 245433
Author aakash_j...@apple.com
Date 2019-05-16 21:30:32 -0700 (Thu, 16 May 2019)
Log Message
[ews-build] Download archives from S3
https://bugs.webkit.org/show_bug.cgi?id=197949
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(DownloadBuiltProduct): Updated to use S3 URL.
(DownloadBuiltProduct.getResultSummary): Method to display custom failure string.
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (245432 => 245433)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-17 02:21:51 UTC (rev 245432)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-17 04:30:32 UTC (rev 245433)
@@ -33,7 +33,7 @@
import requests
BUG_SERVER_URL = 'https://bugs.webkit.org/'
-EWS_URL = 'https://ews-build.webkit.org/'
+S3URL = 'https://s3-us-west-2.amazonaws.com/'
WithProperties = properties.WithProperties
Interpolate = properties.Interpolate
@@ -785,8 +785,8 @@
class DownloadBuiltProduct(shell.ShellCommand):
command = ['python', 'Tools/BuildSlaveSupport/download-built-product',
-WithProperties('--platform=%(platform)s'), WithProperties('--%(configuration)s'),
-WithProperties(EWS_URL + 'archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
+WithProperties('--%(configuration)s'),
+WithProperties(S3URL + 'ews-archives.webkit.org/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
name = 'download-built-product'
description = ['downloading built product']
descriptionDone = ['Downloaded built product']
@@ -793,7 +793,12 @@
haltOnFailure = True
flunkOnFailure = True
+def getResultSummary(self):
+if self.results != SUCCESS:
+return {u'step': u'Failed to download built product from S3'}
+return super(DownloadBuiltProduct, self).getResultSummary()
+
class ExtractBuiltProduct(shell.ShellCommand):
command = ['python', 'Tools/BuildSlaveSupport/built-product-archive',
WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'extract']
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (245432 => 245433)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-05-17 02:21:51 UTC (rev 245432)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-05-17 04:30:32 UTC (rev 245433)
@@ -1007,7 +1007,6 @@
def test_success(self):
self.setupStep(DownloadBuiltProduct())
-self.setProperty('platform', 'ios')
self.setProperty('fullPlatform', 'ios-simulator-12')
self.setProperty('configuration', 'release')
self.setProperty('architecture', 'x86_64')
@@ -1014,7 +1013,7 @@
self.setProperty('patch_id', '1234')
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
-command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--platform=ios', '--release', 'https://ews-build.webkit.org/archives/ios-simulator-12-x86_64-release/1234.zip'],
+command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--release', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/ios-simulator-12-x86_64-release/1234.zip'],
)
+ 0,
)
@@ -1023,7 +1022,6 @@
def test_failure(self):
self.setupStep(DownloadBuiltProduct())
-self.setProperty('platform', 'mac')
self.setProperty('fullPlatform', 'mac-sierra')
self.setProperty('configuration', 'debug')
self.setProperty('architecture', 'x86_64')
@@ -1030,12 +1028,12 @@
self.setProperty('patch_id', '123456')
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
-command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--platform=mac', '--debug', 'https://ews-build.webkit.org/archives/mac-sierra-x86_64-debug/123456.zip'],
+command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--debug', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/mac-sierra-x86_64-debug/123456.zip'],
)
+ ExpectShell.log('stdio', stdout='Unexpected failure.')
+ 2,
)
-self.expectOutcome(result=FAILURE, state_string='Downloaded built product (failure)')
+self.expectOutcome(result=FAILURE, state_string='Failed to download built product from S3')
return self.runStep()
Modified: trunk/Tools/ChangeLog (245432 => 245433)
--- trunk/Tools/ChangeLog 2019-05-17 02:21:51 UTC (rev 245432)
+++ trunk/Tools/ChangeLog 2019-05-17 04:30:32 UTC (rev 245433)
@@ -1,3 +
[webkit-changes] [245461] trunk/Tools
Title: [245461] trunk/Tools
Revision 245461
Author aakash_j...@apple.com
Date 2019-05-17 07:32:17 -0700 (Fri, 17 May 2019)
Log Message
[ews-build] Add build step to Transfer archive to S3
https://bugs.webkit.org/show_bug.cgi?id=197922
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(TransferToS3):
(TransferToS3.finished): Invoke triggers after transfer is successful.
(TransferToS3.getResultSummary): Create more readable failure string.
(UploadBuiltProduct.finished): Deleted. Moved the trigger invocation after TransferToS3.
* BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (245460 => 245461)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-17 12:39:30 UTC (rev 245460)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-17 14:32:17 UTC (rev 245461)
@@ -615,7 +615,7 @@
self.setProperty('patchFailedToBuild', True)
self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(), CompileWebKitToT()])
else:
-self.build.addStepsAfterCurrentStep([ArchiveBuiltProduct(), UploadBuiltProduct()])
+self.build.addStepsAfterCurrentStep([ArchiveBuiltProduct(), UploadBuiltProduct(), TransferToS3()])
return super(CompileWebKit, self).evaluateCommand(cmd)
@@ -769,6 +769,27 @@
kwargs['blocksize'] = 1024 * 256
transfer.FileUpload.__init__(self, **kwargs)
+def getResultSummary(self):
+if self.results != SUCCESS:
+return {u'step': u'Failed to upload built product'}
+return super(UploadBuiltProduct, self).getResultSummary()
+
+
+class TransferToS3(master.MasterShellCommand):
+name = 'transfer-to-s3'
+description = ['transferring to s3']
+descriptionDone = ['Transferred archive to S3']
+archive = WithProperties('public_html/archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')
+identifier = WithProperties('%(fullPlatform)s-%(architecture)s-%(configuration)s')
+patch_id = WithProperties('%(patch_id)s')
+command = ['python', '../Shared/transfer-archive-to-s3', '--patch_id', patch_id, '--identifier', identifier, '--archive', archive]
+haltOnFailure = True
+flunkOnFailure = True
+
+def __init__(self, **kwargs):
+kwargs['command'] = self.command
+master.MasterShellCommand.__init__(self, logEnviron=False, **kwargs)
+
def finished(self, results):
if results == SUCCESS:
triggers = self.getProperty('triggers', None)
@@ -775,12 +796,12 @@
if triggers:
self.build.addStepsAfterCurrentStep([Trigger(schedulerNames=triggers)])
-return super(UploadBuiltProduct, self).finished(results)
+return super(TransferToS3, self).finished(results)
def getResultSummary(self):
if self.results != SUCCESS:
-return {u'step': u'Failed to upload built product'}
-return super(UploadBuiltProduct, self).getResultSummary()
+return {u'step': u'Failed to transfer archive to S3'}
+return super(TransferToS3, self).getResultSummary()
class DownloadBuiltProduct(shell.ShellCommand):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (245460 => 245461)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-05-17 12:39:30 UTC (rev 245460)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-05-17 14:32:17 UTC (rev 245461)
@@ -40,8 +40,8 @@
DownloadBuiltProduct, ExtractBuiltProduct, ExtractTestResults, KillOldProcesses,
PrintConfiguration, ReRunAPITests, ReRunJavaScriptCoreTests, RunAPITests, RunAPITestsWithoutPatch,
RunBindingsTests, RunJavaScriptCoreTests, RunJavaScriptCoreTestsToT, RunWebKit1Tests, RunWebKitPerlTests,
- RunWebKitPyTests, RunWebKitTests, TestWithFailureCount, Trigger, UnApplyPatchIfRequired, UploadBuiltProduct,
- UploadTestResults, ValidatePatch)
+ RunWebKitPyTests, RunWebKitTests, TestWithFailureCount, Trigger, TransferToS3, UnApplyPatchIfRequired,
+ UploadBuiltProduct, UploadTestResults, ValidatePatch)
# Workaround for https://github.com/buildbot/buildbot/issues/4669
from buildbot.test.fake.fakebuild import FakeBuild
@@ -1073,6 +1073,51 @@
return self.runStep()
+class TestTransferToS3(BuildStepMixinAdditions, unittest.TestCase):
+def setUp(self):
+self.longMessage = True
+return self.setUpBuildStep()
+
+def tearDown(self):
+return self.tearDownBuildStep()
+
+def test_success(self):
+self.setupStep(TransferToS3())
+self.setProperty('fullPlatform', 'mac-highsierra')
+self.setProperty('configuratio
[webkit-changes] [245487] trunk/Tools
Title: [245487] trunk/Tools Revision 245487 Author aakash_j...@apple.com Date 2019-05-17 16:41:47 -0700 (Fri, 17 May 2019) Log Message [ews-app] Status bubble should not turn orange when any build step has warnings https://bugs.webkit.org/show_bug.cgi?id=198000 Reviewed by Jonathan Bedard. * BuildSlaveSupport/ews-app/ews/views/statusbubble.py: (StatusBubble._does_build_contains_any_failed_step): Modified Paths trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (245486 => 245487) --- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-05-17 23:11:02 UTC (rev 245486) +++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-05-17 23:41:47 UTC (rev 245487) @@ -155,7 +155,7 @@ def _does_build_contains_any_failed_step(self, build): for step in build.step_set.all(): -if step.result and step.result != Buildbot.SUCCESS: +if step.result and step.result != Buildbot.SUCCESS and step.result != Buildbot.WARNINGS: return True return False Modified: trunk/Tools/ChangeLog (245486 => 245487) --- trunk/Tools/ChangeLog 2019-05-17 23:11:02 UTC (rev 245486) +++ trunk/Tools/ChangeLog 2019-05-17 23:41:47 UTC (rev 245487) @@ -1,3 +1,13 @@ +2019-05-17 Aakash Jain + +[ews-app] Status bubble should not turn orange when any build step has warnings +https://bugs.webkit.org/show_bug.cgi?id=198000 + +Reviewed by Jonathan Bedard. + +* BuildSlaveSupport/ews-app/ews/views/statusbubble.py: +(StatusBubble._does_build_contains_any_failed_step): + 2019-05-17 Alex Christensen Add SPI to set a list of hosts to which to send custom header fields cross-origin ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245489] trunk/Tools
Title: [245489] trunk/Tools
Revision 245489
Author aakash_j...@apple.com
Date 2019-05-17 16:45:38 -0700 (Fri, 17 May 2019)
Log Message
[ews-build] Add clickable url in UI for uploaded S3 archive
https://bugs.webkit.org/show_bug.cgi?id=197996
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (245488 => 245489)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-17 23:44:23 UTC (rev 245488)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-05-17 23:45:38 UTC (rev 245489)
@@ -790,7 +790,18 @@
kwargs['command'] = self.command
master.MasterShellCommand.__init__(self, logEnviron=False, **kwargs)
+def start(self):
+self.log_observer = logobserver.BufferLogObserver(wantStderr=True)
+self.addLogObserver('stdio', self.log_observer)
+return super(TransferToS3, self).start()
+
def finished(self, results):
+log_text = self.log_observer.getStdout() + self.log_observer.getStderr()
+match = re.search(r'S3 URL: (?P[^\s]+)', log_text)
+# Sample log: S3 URL: https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/ios-simulator-12-x86_64-release/123456.zip
+if match:
+self.addURL('uploaded archive', match.group('url'))
+
if results == SUCCESS:
triggers = self.getProperty('triggers', None)
if triggers:
Modified: trunk/Tools/ChangeLog (245488 => 245489)
--- trunk/Tools/ChangeLog 2019-05-17 23:44:23 UTC (rev 245488)
+++ trunk/Tools/ChangeLog 2019-05-17 23:45:38 UTC (rev 245489)
@@ -1,5 +1,14 @@
2019-05-17 Aakash Jain
+[ews-build] Add clickable url in UI for uploaded S3 archive
+https://bugs.webkit.org/show_bug.cgi?id=197996
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+
+2019-05-17 Aakash Jain
+
[ews-app] Status bubble should not turn orange when any build step has warnings
https://bugs.webkit.org/show_bug.cgi?id=198000
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245541] trunk/Tools
Title: [245541] trunk/Tools
Revision 245541
Author aakash_j...@apple.com
Date 2019-05-20 17:12:23 -0700 (Mon, 20 May 2019)
Log Message
Windows 10 test results missing on flakiness dashboard
https://bugs.webkit.org/show_bug.cgi?id=198058
Rubber-stamped by Alexey Proskuryakov.
* TestResultServer/static-dashboards/flakiness_dashboard.js:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js
Diff
Modified: trunk/Tools/ChangeLog (245540 => 245541)
--- trunk/Tools/ChangeLog 2019-05-21 00:07:39 UTC (rev 245540)
+++ trunk/Tools/ChangeLog 2019-05-21 00:12:23 UTC (rev 245541)
@@ -1,3 +1,12 @@
+2019-05-20 Aakash Jain
+
+Windows 10 test results missing on flakiness dashboard
+https://bugs.webkit.org/show_bug.cgi?id=198058
+
+Rubber-stamped by Alexey Proskuryakov.
+
+* TestResultServer/static-dashboards/flakiness_dashboard.js:
+
2019-05-20 Sihui Liu
Move Web Storage to Network Process
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (245540 => 245541)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2019-05-21 00:07:39 UTC (rev 245540)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2019-05-21 00:12:23 UTC (rev 245541)
@@ -67,7 +67,8 @@
expectationsDirectory: 'win',
subPlatforms: {
'XP': { fallbackPlatforms: ['APPLE_WIN'] },
-'WIN7': { fallbackPlatforms: ['APPLE_WIN'] }
+'WIN7': { fallbackPlatforms: ['APPLE_WIN'] },
+'WIN10': { fallbackPlatforms: ['APPLE_WIN'] }
}
}
}
@@ -343,6 +344,8 @@
function determineBuilderPlatform(builderNameUpperCase)
{
+if (string.contains(builderNameUpperCase, 'WIN 10'))
+return 'APPLE_WIN_WIN10';
if (string.contains(builderNameUpperCase, 'WIN 7'))
return 'APPLE_WIN_WIN7';
if (string.contains(builderNameUpperCase, 'WIN XP'))
@@ -710,6 +713,7 @@
'HighSierra': 'HIGHSIERRA',
'Mojave': 'MOJAVE',
'Win7': 'WIN7',
+'Win10': 'WIN10',
'XP': 'XP',
'Vista': 'VISTA',
'Android': 'ANDROID',
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245603] trunk/Tools
Title: [245603] trunk/Tools
Revision 245603
Author aakash_j...@apple.com
Date 2019-05-21 17:34:15 -0700 (Tue, 21 May 2019)
Log Message
[ews-build] Use custom templates for Buildbot
https://bugs.webkit.org/show_bug.cgi?id=198076
Rubber-stamped by Jonathan Bedard.
* BuildSlaveSupport/ews-build/master.cfg:
* BuildSlaveSupport/ews-build/templates: Added.
* BuildSlaveSupport/ews-build/templates/build.jade: Copied from https://github.com/buildbot/buildbot/blob/v1.7.0/www/base/src/app/builders/builds/build.tpl.jade
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/master.cfg
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/BuildSlaveSupport/ews-build/templates/
trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/master.cfg (245602 => 245603)
--- trunk/Tools/BuildSlaveSupport/ews-build/master.cfg 2019-05-22 00:12:49 UTC (rev 245602)
+++ trunk/Tools/BuildSlaveSupport/ews-build/master.cfg 2019-05-22 00:34:15 UTC (rev 245603)
@@ -12,6 +12,7 @@
c = BuildmasterConfig = {}
c['www'] = dict(port=8010, allowed_origins=["*"])
+c['www']['custom_templates_dir'] = 'templates'
c['www']['ui_default_config'] = {
'Builders.show_workers_name': True,
Added: trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade (0 => 245603)
--- trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade (rev 0)
+++ trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade 2019-05-22 00:34:15 UTC (rev 245603)
@@ -0,0 +1,48 @@
+.container
+ .alert.alert-danger(ng-show="error") {{error}}
+ nav
+ul.pager
+ li.previous(ng-class="{'disabled': build.number == 1}")
+a(ng-if="build.number > 1 ", ui-sref="build({build:prevbuild.number})")
+span.badge-status(ng-class="results2class(prevbuild, 'pulse')") ←
+span.nomobile Previous
+span(ng-if="build.number == 1") ←
+span.nomobile Previous
+ li(ng-if="build.complete" title="{{ build.complete_at | dateformat:'LLL' }}") Finished {{ build.complete_at | timeago }}
+ li.next(ng-class="{'disabled': last_build}")
+a(ng-if="!last_build", ui-sref="build({build:nextbuild.number})")
+span.nomobile Next
+span.badge-status(ng-class="results2class(nextbuild, 'pulse')") →
+span(ng-if="last_build")
+span.nomobile Next
+span →
+ .row
+ uib-tabset
+ uib-tab(heading="Build stepsA")
+ buildsummary(ng-if="build", build="build", parentbuild="parent_build",
+ parentrelationship="buildset.parent_relationship")
+ uib-tab(heading="Build Properties")
+ properties(properties="properties")
+ uib-tab(heading="Worker: {{worker.name}}")
+table.table.table-hover.table-striped.table-condensed
+ tbody
+tr
+ td.text-left name
+ td.text-center {{worker.name}}
+tr(ng-repeat="(name, value) in worker.workerinfo")
+ td.text-left {{ name }}
+ td.text-right {{ value }}
+ uib-tab(heading="Responsible UsersA")
+ul.list-group
+li.list-group-item(ng-repeat="(author, email) in responsibles")
+.change-avatar
+img(ng-src=""
+a(ng-href=""
+| {{ author }}
+ uib-tab(heading="ChangesAA")
+ changelist(changes="changes")
+ uib-tab(heading="Debug")
+ h4
+ a(ui-sref="buildrequest({buildrequest:buildrequest.buildrequestid})")
+ | Buildrequest:
+ rawdata(data=""
Modified: trunk/Tools/ChangeLog (245602 => 245603)
--- trunk/Tools/ChangeLog 2019-05-22 00:12:49 UTC (rev 245602)
+++ trunk/Tools/ChangeLog 2019-05-22 00:34:15 UTC (rev 245603)
@@ -1,3 +1,14 @@
+2019-05-21 Aakash Jain
+
+[ews-build] Use custom templates for Buildbot
+https://bugs.webkit.org/show_bug.cgi?id=198076
+
+Rubber-stamped by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/master.cfg:
+* BuildSlaveSupport/ews-build/templates: Added.
+* BuildSlaveSupport/ews-build/templates/build.jade: Copied from https://github.com/buildbot/buildbot/blob/v1.7.0/www/base/src/app/builders/builds/build.tpl.jade
+
2019-05-21 Chris Dumez
[PSON] Assertion hit when navigating back after a process swap forced by the client
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245605] trunk/Tools
Title: [245605] trunk/Tools
Revision 245605
Author aakash_j...@apple.com
Date 2019-05-21 17:43:37 -0700 (Tue, 21 May 2019)
Log Message
[ews-build] Use custom templates for Buildbot (follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=198076
Unreviewed minor follow-up fix.
* BuildSlaveSupport/ews-build/templates/build.jade:
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade (245604 => 245605)
--- trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade 2019-05-22 00:38:26 UTC (rev 245604)
+++ trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade 2019-05-22 00:43:37 UTC (rev 245605)
@@ -18,7 +18,7 @@
span →
.row
uib-tabset
- uib-tab(heading="Build stepsA")
+ uib-tab(heading="Build steps")
buildsummary(ng-if="build", build="build", parentbuild="parent_build",
parentrelationship="buildset.parent_relationship")
uib-tab(heading="Build Properties")
@@ -32,7 +32,7 @@
tr(ng-repeat="(name, value) in worker.workerinfo")
td.text-left {{ name }}
td.text-right {{ value }}
- uib-tab(heading="Responsible UsersA")
+ uib-tab(heading="Responsible Users")
ul.list-group
li.list-group-item(ng-repeat="(author, email) in responsibles")
.change-avatar
@@ -39,7 +39,7 @@
img(ng-src=""
a(ng-href=""
| {{ author }}
- uib-tab(heading="ChangesAA")
+ uib-tab(heading="Changes")
changelist(changes="changes")
uib-tab(heading="Debug")
h4
Modified: trunk/Tools/ChangeLog (245604 => 245605)
--- trunk/Tools/ChangeLog 2019-05-22 00:38:26 UTC (rev 245604)
+++ trunk/Tools/ChangeLog 2019-05-22 00:43:37 UTC (rev 245605)
@@ -1,3 +1,12 @@
+2019-05-21 Aakash Jain
+
+[ews-build] Use custom templates for Buildbot (follow-up fix)
+https://bugs.webkit.org/show_bug.cgi?id=198076
+
+Unreviewed minor follow-up fix.
+
+* BuildSlaveSupport/ews-build/templates/build.jade:
+
2019-05-21 Alex Christensen
Fix branch build.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245814] trunk/Tools
Title: [245814] trunk/Tools
Revision 245814
Author aakash_j...@apple.com
Date 2019-05-28 10:09:01 -0700 (Tue, 28 May 2019)
Log Message
[ews-build] Remove unused buildbot tabs
https://bugs.webkit.org/show_bug.cgi?id=198108
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/templates/build.jade: Removed unused 'Changes' and 'Responsible Users' tabs.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade (245813 => 245814)
--- trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade 2019-05-28 16:03:02 UTC (rev 245813)
+++ trunk/Tools/BuildSlaveSupport/ews-build/templates/build.jade 2019-05-28 17:09:01 UTC (rev 245814)
@@ -32,15 +32,6 @@
tr(ng-repeat="(name, value) in worker.workerinfo")
td.text-left {{ name }}
td.text-right {{ value }}
- uib-tab(heading="Responsible Users")
-ul.list-group
-li.list-group-item(ng-repeat="(author, email) in responsibles")
-.change-avatar
-img(ng-src=""
-a(ng-href=""
-| {{ author }}
- uib-tab(heading="Changes")
- changelist(changes="changes")
uib-tab(heading="Debug")
h4
a(ui-sref="buildrequest({buildrequest:buildrequest.buildrequestid})")
Modified: trunk/Tools/ChangeLog (245813 => 245814)
--- trunk/Tools/ChangeLog 2019-05-28 16:03:02 UTC (rev 245813)
+++ trunk/Tools/ChangeLog 2019-05-28 17:09:01 UTC (rev 245814)
@@ -1,3 +1,12 @@
+2019-05-28 Aakash Jain
+
+[ews-build] Remove unused buildbot tabs
+https://bugs.webkit.org/show_bug.cgi?id=198108
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/templates/build.jade: Removed unused 'Changes' and 'Responsible Users' tabs.
+
2019-05-27 Carlos Garcia Campos
[GTK] Use WPEBackend-fdo for accelerating compositing in Wayland instead of the nested compositor
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245851] trunk/Tools
Title: [245851] trunk/Tools
Revision 245851
Author aakash_j...@apple.com
Date 2019-05-29 09:58:56 -0700 (Wed, 29 May 2019)
Log Message
Disable Flaky API Test TestWebKitAPI._WKDownload.DownloadMonitorCancel
https://bugs.webkit.org/show_bug.cgi?id=198328
Reviewed by Alexey Proskuryakov.
* TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm
Diff
Modified: trunk/Tools/ChangeLog (245850 => 245851)
--- trunk/Tools/ChangeLog 2019-05-29 16:07:19 UTC (rev 245850)
+++ trunk/Tools/ChangeLog 2019-05-29 16:58:56 UTC (rev 245851)
@@ -1,3 +1,12 @@
+2019-05-29 Aakash Jain
+
+Disable Flaky API Test TestWebKitAPI._WKDownload.DownloadMonitorCancel
+https://bugs.webkit.org/show_bug.cgi?id=198328
+
+Reviewed by Alexey Proskuryakov.
+
+* TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
+
2019-05-28 Justin Michaud
Attempt to fix JSC test timeouts after adding collectContinuously to WASM tests.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm (245850 => 245851)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm 2019-05-29 16:07:19 UTC (rev 245850)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm 2019-05-29 16:58:56 UTC (rev 245851)
@@ -879,7 +879,7 @@
[[NSFileManager defaultManager] removeItemAtURL:[NSURL fileURLWithPath:destination.get() isDirectory:NO] error:nil];
}
-TEST(_WKDownload, DownloadMonitorCancel)
+TEST(_WKDownload, DISABLED_DownloadMonitorCancel)
{
downloadAtRate(0.5, 120); // Should cancel in ~0.5 seconds
downloadAtRate(1.5, 120); // Should cancel in ~2.5 seconds
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [245886] trunk/Tools
Title: [245886] trunk/Tools
Revision 245886
Author aakash_j...@apple.com
Date 2019-05-30 09:17:05 -0700 (Thu, 30 May 2019)
Log Message
[ews-build] Update configuration to share bots across queues
https://bugs.webkit.org/show_bug.cgi?id=198370
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/config.json: Share bots across builder and API tester queues.
Also use ews119 instead of ews120 for mac API tests, as ews120 seems to have some issues as
noted in https://bugs.webkit.org/show_bug.cgi?id=197571#c1
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/config.json
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (245885 => 245886)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-05-30 16:05:21 UTC (rev 245885)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-05-30 16:17:05 UTC (rev 245886)
@@ -302,7 +302,7 @@
"configuration": "release",
"architectures": ["x86_64"],
"triggers": ["api-tests-ios-sim-ews"],
- "workernames": ["ews152", "ews154"]
+ "workernames": ["ews152", "ews154", "ews156", "ews157"]
},
{
"name": "iOS-12-Simulator-WK2-Tests-EWS",
@@ -321,7 +321,7 @@
"configuration": "release",
"architectures": ["x86_64"],
"triggers": ["api-tests-mac-ews"],
- "workernames": ["ews118", "ews119", "ews120"]
+ "workernames": ["ews118", "ews119", "ews120", "ews150"]
},
{
"name": "macOS-High-Sierra-Release-WK1-Tests-EWS",
@@ -426,7 +426,7 @@
"shortname": "api-mac",
"factory": "APITestsFactory",
"platform": "*",
- "workernames": ["ews120", "ews150", "ews153", "ews155"]
+ "workernames": ["ews119", "ews150", "ews153", "ews155"]
}
],
"schedulers": [
Modified: trunk/Tools/ChangeLog (245885 => 245886)
--- trunk/Tools/ChangeLog 2019-05-30 16:05:21 UTC (rev 245885)
+++ trunk/Tools/ChangeLog 2019-05-30 16:17:05 UTC (rev 245886)
@@ -1,3 +1,14 @@
+2019-05-30 Aakash Jain
+
+[ews-build] Update configuration to share bots across queues
+https://bugs.webkit.org/show_bug.cgi?id=198370
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/config.json: Share bots across builder and API tester queues.
+Also use ews119 instead of ews120 for mac API tests, as ews120 seems to have some issues as
+noted in https://bugs.webkit.org/show_bug.cgi?id=197571#c1
+
2019-05-30 Jonathan Bedard
webkitpy: Switch run-webkit-tests to tailspin (Follow-up fix)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [246080] trunk/Tools
Title: [246080] trunk/Tools
Revision 246080
Author aakash_j...@apple.com
Date 2019-06-04 14:27:07 -0700 (Tue, 04 Jun 2019)
Log Message
[ews-build] Do not display unnecessary steps in the Buildbot build page UI
https://bugs.webkit.org/show_bug.cgi?id=198218
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (246079 => 246080)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-06-04 20:54:31 UTC (rev 246079)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-06-04 21:27:07 UTC (rev 246080)
@@ -139,6 +139,9 @@
d = self.downloadFileContentToWorker('.buildbot-diff', patch)
d.addCallback(lambda res: shell.ShellCommand.start(self))
+def hideStepIf(self, results, step):
+return results == SUCCESS and self.getProperty('validated', '') == False
+
def getResultSummary(self):
if self.results != SUCCESS:
return {u'step': u'Patch does not apply'}
@@ -368,6 +371,7 @@
if obsolete == -1 or review_denied == -1 or bug_closed == -1:
self.finished(WARNINGS)
+self.setProperty('validated', False)
return None
self._addToLog('stdio', 'Bug is open.\nPatch is not obsolete.\nPatch is not marked r-.\n')
@@ -809,6 +813,9 @@
return super(TransferToS3, self).finished(results)
+def hideStepIf(self, results, step):
+return results == SUCCESS and self.getProperty('validated', '') == False
+
def getResultSummary(self):
if self.results != SUCCESS:
return {u'step': u'Failed to transfer archive to S3'}
Modified: trunk/Tools/ChangeLog (246079 => 246080)
--- trunk/Tools/ChangeLog 2019-06-04 20:54:31 UTC (rev 246079)
+++ trunk/Tools/ChangeLog 2019-06-04 21:27:07 UTC (rev 246080)
@@ -1,3 +1,13 @@
+2019-06-04 Aakash Jain
+
+[ews-build] Do not display unnecessary steps in the Buildbot build page UI
+https://bugs.webkit.org/show_bug.cgi?id=198218
+
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+
2019-06-04 Sihui Liu
WKWebsiteDataStore API fails to fetch web storage data for non-persistent data store
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [246082] trunk/Tools
Title: [246082] trunk/Tools
Revision 246082
Author aakash_j...@apple.com
Date 2019-06-04 14:40:00 -0700 (Tue, 04 Jun 2019)
Log Message
[ews-app] Add authentication while fetching bugs
https://bugs.webkit.org/show_bug.cgi?id=198415
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-app/ews/common/bugzilla.py:
(Bugzilla._fetch_attachment_json): Use api_key if configured in environment variable.
(BugzillaBeautifulSoup.authenticate): Method to authenticate, logic copied from webkitpy/common/net/bugzilla/bugzilla.py
(BugzillaBeautifulSoup._load_query):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py (246081 => 246082)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py 2019-06-04 21:27:33 UTC (rev 246081)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py 2019-06-04 21:40:00 UTC (rev 246082)
@@ -25,6 +25,7 @@
import os
import re
import socket
+import time
from datetime import datetime, timedelta
@@ -61,6 +62,9 @@
return None
attachment_url = '{}rest/bug/attachment/{}'.format(config.BUG_SERVER_URL, attachment_id)
+api_key = os.getenv('BUGZILLA_API_KEY', None)
+if api_key:
+attachment_url += '?api_key={}'.format(api_key)
attachment = util.fetch_data_from_url(attachment_url)
if not attachment:
return None
@@ -101,6 +105,38 @@
browser = property(_get_browser, _set_browser)
+def authenticate(self):
+username = os.getenv('BUGZILLA_USERNAME', None)
+password = os.getenv('BUGZILLA_PASSWORD', None)
+if not username or not password:
+_log.warn('Bugzilla username/password not configured in environment variables. Skipping authentication.')
+return
+
+authenticated = False
+attempts = 0
+while not authenticated:
+attempts += 1
+_log.info('Logging in as {}...'.format(username))
+self.browser.open(config.BUG_SERVER_URL + 'index.cgi?GoAheadAndLogIn=1')
+self.browser.select_form(name="login")
+self.browser['Bugzilla_login'] = username
+self.browser['Bugzilla_password'] = password
+self.browser.find_control("Bugzilla_restrictlogin").items[0].selected = False
+response = self.browser.submit()
+
+match = re.search("(.+?)", response.read())
+# If the resulting page has a title, and it contains the word
+# "invalid" assume it's the login failure page.
+if match and re.search("Invalid", match.group(1), re.IGNORECASE):
+errorMessage = 'Bugzilla login failed: {}'.format(match.group(1))
+if attempts >= 5:
+# raise an exception only if this was the last attempt
+raise Exception(errorMessage)
+_log.error(errorMessage)
+time.sleep(5)
+else:
+authenticated = True
+
def fetch_attachment_ids_from_review_queue(self, since=None, _only_security_bugs_=False):
review_queue_url = 'request.cgi?action=""
if only_security_bugs:
@@ -108,7 +144,7 @@
return self._parse_attachment_ids_request_query(self._load_query(review_queue_url), since)
def _load_query(self, query):
-# TODO: check if we need to authenticate.
+self.authenticate()
full_url = '{}{}'.format(config.BUG_SERVER_URL, query)
_log.info('Getting list of patches needing review, URL: {}'.format(full_url))
return self.browser.open(full_url)
Modified: trunk/Tools/ChangeLog (246081 => 246082)
--- trunk/Tools/ChangeLog 2019-06-04 21:27:33 UTC (rev 246081)
+++ trunk/Tools/ChangeLog 2019-06-04 21:40:00 UTC (rev 246082)
@@ -1,5 +1,18 @@
2019-06-04 Aakash Jain
+[ews-app] Add authentication while fetching bugs
+https://bugs.webkit.org/show_bug.cgi?id=198415
+
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-app/ews/common/bugzilla.py:
+(Bugzilla._fetch_attachment_json): Use api_key if configured in environment variable.
+(BugzillaBeautifulSoup.authenticate): Method to authenticate, logic copied from webkitpy/common/net/bugzilla/bugzilla.py
+(BugzillaBeautifulSoup._load_query):
+
+2019-06-04 Aakash Jain
+
[ews-build] Do not display unnecessary steps in the Buildbot build page UI
https://bugs.webkit.org/show_bug.cgi?id=198218
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [247710] trunk/Tools
Title: [247710] trunk/Tools
Revision 247710
Author aakash_j...@apple.com
Date 2019-07-22 17:16:18 -0700 (Mon, 22 Jul 2019)
Log Message
[ews-build] EWS fails to parse multi-line full_results.json
https://bugs.webkit.org/show_bug.cgi?id=12
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/ews-build/layout_test_failures.py:
(LayoutTestFailures.results_from_string): Concatenate content into single line.
* BuildSlaveSupport/ews-build/steps_unittest.py:
(test_parse_results_json_with_newlines): Unit-test to cover this scenario.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/layout_test_failures.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/layout_test_failures.py (247709 => 247710)
--- trunk/Tools/BuildSlaveSupport/ews-build/layout_test_failures.py 2019-07-23 00:09:36 UTC (rev 247709)
+++ trunk/Tools/BuildSlaveSupport/ews-build/layout_test_failures.py 2019-07-23 00:16:18 UTC (rev 247710)
@@ -51,6 +51,8 @@
return None
content_string = cls.strip_json_wrapper(string)
+# Workaround for https://github.com/buildbot/buildbot/issues/4906
+content_string = ''.join(content_string.splitlines())
json_dict = json.loads(content_string)
failing_tests = []
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (247709 => 247710)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-07-23 00:09:36 UTC (rev 247709)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-07-23 00:16:18 UTC (rev 247710)
@@ -1037,6 +1037,12 @@
'''
self.results_json_mix_flakes_and_regression = '''ADD_RESULTS({"tests":{"http":{"tests":{"IndexedDB":{"collect-IDB-objects.https.html":{"report":"FLAKY","expected":"PASS","actual":"TEXT PASS"}},"xmlhttprequest":{"on-network-timeout-error-during-preflight.html":{"report":"FLAKY","expected":"PASS","actual":"TIMEOUT PASS","transitions":{"lengthsize-transition-to-from-auto.html":{"report":"FLAKY","expected":"PASS","actual":"TIMEOUT PASS"}},"imported":{"blink":{"storage":{"indexeddb":{"blob-valid-before-commit.html":{"report":"FLAKY","expected":"PASS","actual":"TIMEOUT PASS","
;has_stderr":true},"fast":{"text":{"font-weight-fallback.html":{"report":"FLAKY","expected":"PASS","actual":"TIMEOUT PASS","has_stderr":true,"reftest_type":["=="]}},"scrolling":{"ios":{"reconcile-layer-position-recursive.html":{"report":"REGRESSION","expected":"PASS","actual":"TEXT"},"skipped":13174,"num_regressions":1,"other_crashes":{},"interrupted":false,"num_missing":0,"layout_tests_dir":"/Volumes/Data/worker/iOS-12-Simulator-WK2-Tests-EWS/build/LayoutTests","version":4,"num_passes":42158,"pixel_tests_enabled":false,"date":"11:28AM on July 16, 2019","has_pretty_patch":true,"fixable":55329,"num_flaky":5,"uses
_expectations_file":true});
'''
+
+self.results_json_with_newlines = '''ADD_RESULTS({"tests":{"http":{"tests":{"IndexedDB":{"collect-IDB-objects.https.html":{"report":"FLAKY","expected":"PASS","actual":"TEXT PASS"}},"xmlhttprequest":{"on-network-timeout-error-during-preflight.html":{"report":"FLAKY","expected":"PASS","actual":"TIMEOUT PASS","transitions":{"lengthsize-trans
+ition-to-from-auto.html":{"report":"FLAKY","expected":"PASS","actual":"TIMEOUT PASS"}},"imported":{"blink":{"storage":{"indexeddb":{"blob-valid-before-commit.html":{"report":"FLAKY","expected":"PASS","actual":"TIMEOUT PASS","has_stderr":true},"fast":{"text":{"font-weight-fallback.html":{"report":"FLAKY","expected":"PASS","actual":"TIMEOUT PASS","has_stderr":true,"reftest_type":["=="]}},"scrolling":{"ios":{"reconcile-layer-position-recursive.html":{"report":"REGRESSION","expected":"PASS","actual":"TEXT"},"skipped":13174,"num_regressions":1,"other_crashes":{},
"interrupted":false,"num_missing":0,"layout_tests_dir":"/Volumes/Data/worker/iOS-12-Simulator-WK2-Tests-EWS/build/LayoutTes
+ts","version":4,"num_passes":42158,"pixel_tests_enabled":false,"date":"11:28AM on July 16, 2019","has_pretty_patch":true,"fixable":55329,"num_flaky":5,"uses_expectations_file":true});
+'''
+
return self.setUpBuildStep()
def tearDown(self):
@@ -1142,6 +1148,24 @@
self.assertEqual(self.getProperty(self.property_failures), ['fast/scrolling/ios/reconcile-layer-position-recursive.html'])
return rc
+def test_parse_results_json_with_newlines(self):
+self.configureStep()
+self.setProperty('fullPlatform', 'ios-simulator')
+self.setProperty('configuration', 'release')
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+logfiles={'json': self.jsonFileName},
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-t
[webkit-changes] [247871] trunk/Tools
Title: [247871] trunk/Tools Revision 247871 Author aakash_j...@apple.com Date 2019-07-26 12:22:02 -0700 (Fri, 26 Jul 2019) Log Message [ews-build] Use update-webkit script in Style EWS https://bugs.webkit.org/show_bug.cgi?id=193196 Reviewed by Jonathan Bedard. * BuildSlaveSupport/ews-build/factories.py: (StyleFactory): Updated to use CheckOutSource step as well. * BuildSlaveSupport/ews-build/steps.py: Added build-step to UpdateWorkingDirectory. * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests. Modified Paths trunk/Tools/BuildSlaveSupport/ews-build/factories.py trunk/Tools/BuildSlaveSupport/ews-build/steps.py trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (247870 => 247871) --- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-07-26 19:19:36 UTC (rev 247870) +++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-07-26 19:22:02 UTC (rev 247871) @@ -29,7 +29,7 @@ DownloadBuiltProduct, ExtractBuiltProduct, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses, PrintConfiguration, ReRunJavaScriptCoreTests, RunAPITests, RunBindingsTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunJavaScriptCoreTests, RunJavaScriptCoreTestsToT, RunWebKit1Tests, RunWebKitPerlTests, - RunWebKitPyTests, RunWebKitTests, UnApplyPatchIfRequired, ValidatePatch) + RunWebKitPyTests, RunWebKitTests, UnApplyPatchIfRequired, UpdateWorkingDirectory, ValidatePatch) class Factory(factory.BuildFactory): @@ -48,9 +48,15 @@ self.addStep(ApplyPatch()) -class StyleFactory(Factory): -def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs): -Factory.__init__(self, platform, configuration, architectures, False, additionalArguments) +class StyleFactory(factory.BuildFactory): +def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs): +factory.BuildFactory.__init__(self) +self.addStep(ConfigureBuild(platform, configuration, architectures, False, triggers, additionalArguments)) +self.addStep(ValidatePatch()) +self.addStep(PrintConfiguration()) +self.addStep(CheckOutSource()) +self.addStep(UpdateWorkingDirectory()) +self.addStep(ApplyPatch()) self.addStep(CheckStyle()) Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (247870 => 247871) --- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-07-26 19:19:36 UTC (rev 247870) +++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-07-26 19:22:02 UTC (rev 247871) @@ -159,6 +159,18 @@ super(CleanWorkingDirectory, self).__init__(logEnviron=False, **kwargs) +class UpdateWorkingDirectory(shell.ShellCommand): +name = 'update-working-directory' +description = ['update-workring-directory running'] +descriptionDone = ['Updated working directory'] +flunkOnFailure = True +haltOnFailure = True +command = ['perl', 'Tools/Scripts/update-webkit'] + +def __init__(self, **kwargs): +super(UpdateWorkingDirectory, self).__init__(logEnviron=False, **kwargs) + + class ApplyPatch(shell.ShellCommand, CompositeStepMixin): name = 'apply-patch' description = ['applying-patch'] @@ -505,6 +517,9 @@ failedTestsFormatString = '%d style error%s' command = ['python', 'Tools/Scripts/check-webkit-style'] +def __init__(self, **kwargs): +super(CheckStyle, self).__init__(logEnviron=False, **kwargs) + def countFailures(self, cmd): log_text = self.log_observer.getStdout() + self.log_observer.getStderr() Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (247870 => 247871) --- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-07-26 19:19:36 UTC (rev 247870) +++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-07-26 19:22:02 UTC (rev 247871) @@ -41,7 +41,7 @@ PrintConfiguration, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch, RunBindingsTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunJavaScriptCoreTests, RunJavaScriptCoreTestsToT, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyTests, RunWebKitTests, TestWithFailureCount, Trigger, TransferToS3, UnApplyPatchIfRequired, - UploadBuiltProduct, UploadTestResults, ValidatePatch) + UpdateWorkingDirectory, UploadBuiltProduct, UploadTestResults, ValidatePatch) # Workaround for https://github.com/buildbot/buildbot/issues/4669 from buildbot.test.fake.fakebuild import FakeBuild @@ -214,6 +214,7 @@ self.expectRemoteCommands( ExpectShell(workdir='wkdir', +logEnviron=False,
[webkit-changes] [247929] trunk/Tools
Title: [247929] trunk/Tools
Revision 247929
Author aakash_j...@apple.com
Date 2019-07-29 16:23:29 -0700 (Mon, 29 Jul 2019)
Log Message
Disable Flaky API Test TestWebKitAPI.WKWebView.LocalStorageProcessSuspends
https://bugs.webkit.org/show_bug.cgi?id=200254
Unreviewed infrastructure fix.
* TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm: Disabled the test.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm
Diff
Modified: trunk/Tools/ChangeLog (247928 => 247929)
--- trunk/Tools/ChangeLog 2019-07-29 23:06:25 UTC (rev 247928)
+++ trunk/Tools/ChangeLog 2019-07-29 23:23:29 UTC (rev 247929)
@@ -1,3 +1,12 @@
+2019-07-29 Aakash Jain
+
+Disable Flaky API Test TestWebKitAPI.WKWebView.LocalStorageProcessSuspends
+https://bugs.webkit.org/show_bug.cgi?id=200254
+
+Unreviewed infrastructure fix.
+
+* TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm: Disabled the test.
+
2019-07-29 Zhifei Fang
[Canvas Timeline] Compact canvas timeline
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm (247928 => 247929)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm 2019-07-29 23:06:25 UTC (rev 247928)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm 2019-07-29 23:23:29 UTC (rev 247929)
@@ -112,7 +112,7 @@
TestWebKitAPI::Util::run(&readyToContinue);
}
-TEST(WKWebView, LocalStorageProcessSuspends)
+TEST(WKWebView, DISABLED_LocalStorageProcessSuspends)
{
readyToContinue = false;
[[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [248088] trunk/Tools
Title: [248088] trunk/Tools
Revision 248088
Author aakash_j...@apple.com
Date 2019-07-31 18:17:09 -0700 (Wed, 31 Jul 2019)
Log Message
[ews-build] Enable all macOS queues on new EWS
https://bugs.webkit.org/show_bug.cgi?id=199944
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/config.json: Enabled the triggers for macOS queues.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble): Enabled status-bubbles for mac queues, separated builders and testers bubbles in separate lines. Also
removed mac-32bit and mac-32bit-wk2 bubbles, these queues were removed from Buildbot configuration previously.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js: Removed mac queues from bot-watcher's dashboard.
* QueueStatusServer/config/queues.py: Removed mac queues from old EWS.
Modified Paths
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
trunk/Tools/BuildSlaveSupport/ews-build/config.json
trunk/Tools/ChangeLog
trunk/Tools/QueueStatusServer/config/queues.py
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js (248087 => 248088)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js 2019-08-01 01:01:53 UTC (rev 248087)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js 2019-08-01 01:17:09 UTC (rev 248088)
@@ -31,9 +31,6 @@
"jsc-armv7-ews": {platform: Dashboard.Platform.LinuxJSCOnly, shortName: "jsc-armv7", title: "ARMv7\xa0Release\xa0Build\xa0EWS"},
"jsc-ews": {platform: Dashboard.Platform.macOSMojave, shortName: "jsc", title: "Release\xa0JSC\xa0Tests\xa0EWS"},
"jsc-mips-ews": {platform: Dashboard.Platform.LinuxJSCOnly, shortName: "jsc-mips-ews", title: "MIPS\xa0Release\xa0Build\xa0EWS"},
-"mac-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "mac", title: "WebKit1\xa0Release\xa0Tests\xa0EWS"},
-"mac-wk2-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "mac-wk2", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
-"mac-debug-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "mac-debug", title: "WebKit1\xa0Debug\xa0Tests\xa0EWS"},
"win-ews": {platform: Dashboard.Platform.Windows10, shortName: "win", title: "WebKit1\xa0Release\xa0Build\xa0EWS"},
};
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (248087 => 248088)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-08-01 01:01:53 UTC (rev 248087)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-08-01 01:17:09 UTC (rev 248088)
@@ -39,9 +39,10 @@
class StatusBubble(View):
# These queue names are from shortname in https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/ews-build/config.json
# FIXME: Auto-generate this list https://bugs.webkit.org/show_bug.cgi?id=195640
-ALL_QUEUES = ['ios', 'ios-sim', 'gtk', 'wpe', 'wincairo', 'ios-wk2', 'api-ios', 'api-mac', 'bindings', 'jsc', 'mac', 'mac-32bit', 'mac-32bit-wk2',
-'mac-debug', 'mac-debug-wk1', 'mac-wk1', 'mac-wk2', 'style', 'webkitperl', 'webkitpy', 'win', 'services']
-ENABLED_QUEUES = ['ios', 'ios-sim', 'gtk', 'wpe', 'wincairo', 'ios-wk2', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy', 'services']
+ALL_QUEUES = ['ios', 'ios-sim', 'mac', 'mac-debug', 'gtk', 'wpe', 'wincairo',
+ 'ios-wk2', 'mac-wk1', 'mac-wk2', 'mac-debug-wk1', 'api-ios', 'api-mac', 'bindings', 'jsc', 'style', 'webkitperl', 'webkitpy', 'win', 'services']
+ENABLED_QUEUES = ['ios', 'ios-sim', 'mac', 'mac-debug', 'gtk', 'wpe', 'wincairo',
+ 'ios-wk2', 'mac-wk1', 'mac-wk2', 'mac-debug-wk1', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy', 'services']
# FIXME: Auto-generate the queue's trigger relationship
QUEUE_TRIGGERS = {
'api-ios': 'ios-sim',
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (248087 => 248088)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-08-01 01:01:53 UTC (rev 248087)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-08-01 01:17:09 UTC (rev 248088)
@@ -330,7 +330,7 @@
"platform": "mac-highsierra",
"configuration": "release",
"architectures": ["x86_64"],
- "triggers": ["api-tests-mac-ews"],
+ "triggers": ["api-tests-mac-ews", "macos-high-sierra-release-wk1-tests-ews", "macos-high-sierra-release-wk2-tests-ews"],
"workernames": ["ews118", "ews119", "ews120", "ews150"]
},
{
@@ -454,14 +454,14 @@
"name": "try",
"port": ,
"builderNames": ["Bindings-Tests-EWS", "GTK-Webkit2-EWS", "iOS-12-Build-EWS", "iOS-12-Simulator-Build-EWS",
-
[webkit-changes] [248103] trunk/Tools
Title: [248103] trunk/Tools
Revision 248103
Author aakash_j...@apple.com
Date 2019-08-01 08:14:16 -0700 (Thu, 01 Aug 2019)
Log Message
New EWS: Cannot see build status page when patch is waiting for tester
https://bugs.webkit.org/show_bug.cgi?id=200333
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble): While patch hasn't started processing on tester queue, display build information from builder queue.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (248102 => 248103)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-08-01 14:21:26 UTC (rev 248102)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-08-01 15:14:16 UTC (rev 248103)
@@ -46,7 +46,11 @@
# FIXME: Auto-generate the queue's trigger relationship
QUEUE_TRIGGERS = {
'api-ios': 'ios-sim',
+'ios-wk2': 'ios-sim',
'api-mac': 'mac',
+'mac-wk1': 'mac',
+'mac-wk2': 'mac',
+'mac-debug-wk1': 'mac-debug',
}
STEPS_TO_HIDE = ['Killed old processes', 'Configured build', '^OS:.*Xcode:', '(skipped)']
Modified: trunk/Tools/ChangeLog (248102 => 248103)
--- trunk/Tools/ChangeLog 2019-08-01 14:21:26 UTC (rev 248102)
+++ trunk/Tools/ChangeLog 2019-08-01 15:14:16 UTC (rev 248103)
@@ -1,3 +1,13 @@
+2019-08-01 Aakash Jain
+
+New EWS: Cannot see build status page when patch is waiting for tester
+https://bugs.webkit.org/show_bug.cgi?id=200333
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+(StatusBubble): While patch hasn't started processing on tester queue, display build information from builder queue.
+
2019-08-01 Carlos Garcia Campos
[SOUP] Switch to use libsoup WebSockets API
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [248272] trunk/Tools
Title: [248272] trunk/Tools
Revision 248272
Author aakash_j...@apple.com
Date 2019-08-05 14:24:52 -0700 (Mon, 05 Aug 2019)
Log Message
New EWS:mac-wk2 status-bubble shows waiting to run tests for all recent bugs
https://bugs.webkit.org/show_bug.cgi?id=200400
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble._build_bubble):
(StatusBubble._queue_position):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (248271 => 248272)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-08-05 20:02:51 UTC (rev 248271)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-08-05 21:24:52 UTC (rev 248272)
@@ -54,6 +54,7 @@
}
STEPS_TO_HIDE = ['Killed old processes', 'Configured build', '^OS:.*Xcode:', '(skipped)']
+DAYS_TO_CHECK = 3
def _build_bubble(self, patch, queue):
bubble = {
@@ -83,6 +84,11 @@
bubble['details_message'] = 'Build is in-progress. Recent messages:\n\n' + self._steps_messages(build)
elif build.result == Buildbot.SUCCESS:
if is_parent_build:
+if patch.modified < (timezone.now() - datetime.timedelta(days=StatusBubble.DAYS_TO_CHECK)):
+# Do not display bubble for old patch for which no build has been reported on given queue.
+# Most likely the patch would never be processed on this queue, since either the queue was
+# added after the patch was submitted, or build request for that patch was cancelled.
+return None
bubble['state'] = 'started'
bubble['details_message'] = 'Build is in-progress. Recent messages:\n\n' + self._steps_messages(build) + '\n\nWaiting to run tests.'
else:
@@ -194,8 +200,7 @@
def _queue_position(self, patch, queue, parent_queue=None):
# FIXME: Handle retried builds and cancelled build-requests as well.
-DAYS_TO_CHECK = 3
-from_timestamp = timezone.now() - datetime.timedelta(days=DAYS_TO_CHECK)
+from_timestamp = timezone.now() - datetime.timedelta(days=StatusBubble.DAYS_TO_CHECK)
if patch.modified < from_timestamp:
# Do not display bubble for old patch for which no build has been reported on given queue.
Modified: trunk/Tools/ChangeLog (248271 => 248272)
--- trunk/Tools/ChangeLog 2019-08-05 20:02:51 UTC (rev 248271)
+++ trunk/Tools/ChangeLog 2019-08-05 21:24:52 UTC (rev 248272)
@@ -1,3 +1,14 @@
+2019-08-05 Aakash Jain
+
+New EWS:mac-wk2 status-bubble shows waiting to run tests for all recent bugs
+https://bugs.webkit.org/show_bug.cgi?id=200400
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+(StatusBubble._build_bubble):
+(StatusBubble._queue_position):
+
2019-08-05 Jonathan Bedard
run-webkit-tests asserts when the iPhone XR simulator is running
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [248470] trunk/Tools
Title: [248470] trunk/Tools
Revision 248470
Author aakash_j...@apple.com
Date 2019-08-09 12:51:39 -0700 (Fri, 09 Aug 2019)
Log Message
[ews] Add buildbot.tac to repository
https://bugs.webkit.org/show_bug.cgi?id=200580
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/buildbot.tac: Added.
Modified Paths
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/BuildSlaveSupport/ews-build/buildbot.tac
Diff
Added: trunk/Tools/BuildSlaveSupport/ews-build/buildbot.tac (0 => 248470)
--- trunk/Tools/BuildSlaveSupport/ews-build/buildbot.tac (rev 0)
+++ trunk/Tools/BuildSlaveSupport/ews-build/buildbot.tac 2019-08-09 19:51:39 UTC (rev 248470)
@@ -0,0 +1,31 @@
+import os
+
+from twisted.application import service
+from buildbot.master import BuildMaster
+
+basedir = '.'
+
+rotateLength = 5000
+maxRotatedFiles = 15
+configfile = 'master.cfg'
+
+# Default umask for server
+umask = 022
+
+# if this is a relocatable tac file, get the directory containing the TAC
+if basedir == '.':
+basedir = os.path.abspath(os.path.dirname(__file__))
+
+# note: this line is matched against to check that this is a buildmaster
+# directory; do not edit it.
+application = service.Application('buildmaster')
+from twisted.python.logfile import LogFile
+from twisted.python.log import ILogObserver, FileLogObserver
+logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"), rotateLength=rotateLength,
+maxRotatedFiles=maxRotatedFiles)
+application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
+
+m = BuildMaster(basedir, configfile, umask)
+m.setServiceParent(application)
+m.log_rotation.rotateLength = rotateLength
+m.log_rotation.maxRotatedFiles = maxRotatedFiles
Modified: trunk/Tools/ChangeLog (248469 => 248470)
--- trunk/Tools/ChangeLog 2019-08-09 19:50:44 UTC (rev 248469)
+++ trunk/Tools/ChangeLog 2019-08-09 19:51:39 UTC (rev 248470)
@@ -1,3 +1,12 @@
+2019-08-09 Aakash Jain
+
+[ews] Add buildbot.tac to repository
+https://bugs.webkit.org/show_bug.cgi?id=200580
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/buildbot.tac: Added.
+
2019-08-09 Claudio Saavedra
[GTK] Add missing spellchecking packages to dependencies script
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [248474] trunk/Tools/ChangeLog
Title: [248474] trunk/Tools/ChangeLog Revision 248474 Author aakash_j...@apple.com Date 2019-08-09 14:15:15 -0700 (Fri, 09 Aug 2019) Log Message [ews-build] Set svn:ignore to various EWS Buildbot files https://bugs.webkit.org/show_bug.cgi?id=200581 Reviewed by Jonathan Bedard. * BuildSlaveSupport/ews-build: Added property svn:ignore. Modified Paths trunk/Tools/ChangeLog Diff Modified: trunk/Tools/ChangeLog (248473 => 248474) --- trunk/Tools/ChangeLog 2019-08-09 20:55:06 UTC (rev 248473) +++ trunk/Tools/ChangeLog 2019-08-09 21:15:15 UTC (rev 248474) @@ -1,5 +1,14 @@ 2019-08-09 Aakash Jain +[ews-build] Set svn:ignore to various EWS Buildbot files +https://bugs.webkit.org/show_bug.cgi?id=200581 + +Reviewed by Jonathan Bedard. + +* BuildSlaveSupport/ews-build: Added property svn:ignore. + +2019-08-09 Aakash Jain + [ews] Add buildbot.tac to repository https://bugs.webkit.org/show_bug.cgi?id=200580 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [248475] trunk/Tools
Title: [248475] trunk/Tools Revision 248475 Author aakash_j...@apple.com Date 2019-08-09 14:18:59 -0700 (Fri, 09 Aug 2019) Log Message Follow-up commit to r248474 as webkit-patch did not commit the svn property changes. [ews-build] Set svn:ignore to various EWS Buildbot files https://bugs.webkit.org/show_bug.cgi?id=200581 Reviewed by Jonathan Bedard. * BuildSlaveSupport/ews-build: Added property svn:ignore. Modified Paths trunk/Tools/ChangeLog Property Changed trunk/Tools/BuildSlaveSupport/ews-build/ Diff Index: trunk/Tools/BuildSlaveSupport/ews-build === --- trunk/Tools/BuildSlaveSupport/ews-build 2019-08-09 21:15:15 UTC (rev 248474) +++ trunk/Tools/BuildSlaveSupport/ews-build 2019-08-09 21:18:59 UTC (rev 248475) Property changes: trunk/Tools/BuildSlaveSupport/ews-build Added: svn:ignore +twistd.log* +http.log* +passwords.json +twistd.pid +master.cfg.sample +public_html Modified: trunk/Tools/ChangeLog (248474 => 248475) --- trunk/Tools/ChangeLog 2019-08-09 21:15:15 UTC (rev 248474) +++ trunk/Tools/ChangeLog 2019-08-09 21:18:59 UTC (rev 248475) @@ -1,5 +1,6 @@ 2019-08-09 Aakash Jain +Follow-up commit to r248474 as webkit-patch did not commit the svn property changes. [ews-build] Set svn:ignore to various EWS Buildbot files https://bugs.webkit.org/show_bug.cgi?id=200581 @@ -9,6 +10,15 @@ 2019-08-09 Aakash Jain +[ews-build] Set svn:ignore to various EWS Buildbot files +https://bugs.webkit.org/show_bug.cgi?id=200581 + +Reviewed by Jonathan Bedard. + +* BuildSlaveSupport/ews-build: Added property svn:ignore. + +2019-08-09 Aakash Jain + [ews] Add buildbot.tac to repository https://bugs.webkit.org/show_bug.cgi?id=200580 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [248768] trunk/Tools
Title: [248768] trunk/Tools
Revision 248768
Author aakash_j...@apple.com
Date 2019-08-16 07:33:41 -0700 (Fri, 16 Aug 2019)
Log Message
[ews] Report machine uptime in PrintConfiguration
https://bugs.webkit.org/show_bug.cgi?id=200812
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(PrintConfiguration): Added uptime command.
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (248767 => 248768)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-08-16 09:22:18 UTC (rev 248767)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-08-16 14:33:41 UTC (rev 248768)
@@ -1506,8 +1506,8 @@
warnOnFailure = False
logEnviron = False
command_list_generic = [['hostname']]
-command_list_apple = [['df', '-hl'], ['date'], ['sw_vers'], ['xcodebuild', '-sdk', '-version']]
-command_list_linux = [['df', '-hl'], ['date'], ['uname', '-a']]
+command_list_apple = [['df', '-hl'], ['date'], ['sw_vers'], ['xcodebuild', '-sdk', '-version'], ['uptime']]
+command_list_linux = [['df', '-hl'], ['date'], ['uname', '-a'], ['uptime']]
command_list_win = [[]] # TODO: add windows specific commands here
def __init__(self, **kwargs):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (248767 => 248768)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-08-16 09:22:18 UTC (rev 248767)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-08-16 14:33:41 UTC (rev 248768)
@@ -2134,6 +2134,8 @@
Xcode 9.4.1
Build version 9F2000''')
+ 0,
+ExpectShell(command=['uptime'], workdir='wkdir', timeout=60, logEnviron=False) + 0
++ ExpectShell.log('stdio', stdout=' 6:31 up 1 day, 19:05, 24 users, load averages: 4.17 7.23 5.45'),
)
self.expectOutcome(result=SUCCESS, state_string='OS: High Sierra (10.13.4), Xcode: 9.4.1')
return self.runStep()
@@ -2172,6 +2174,8 @@
Xcode 10.2
Build version 10E125''')
+ 0,
+ExpectShell(command=['uptime'], workdir='wkdir', timeout=60, logEnviron=False) + 0
++ ExpectShell.log('stdio', stdout=' 6:31 up 1 day, 19:05, 24 users, load averages: 4.17 7.23 5.45'),
)
self.expectOutcome(result=SUCCESS, state_string='OS: Mojave (10.14.5), Xcode: 10.2')
return self.runStep()
@@ -2190,6 +2194,8 @@
BuildVersion: 17G7024'''),
ExpectShell(command=['xcodebuild', '-sdk', '-version'], workdir='wkdir', timeout=60, logEnviron=False) + 0
+ ExpectShell.log('stdio', stdout='''Xcode 10.2\nBuild version 10E125'''),
+ExpectShell(command=['uptime'], workdir='wkdir', timeout=60, logEnviron=False) + 0
++ ExpectShell.log('stdio', stdout=' 6:31 up 22 seconds, 12:05, 2 users, load averages: 3.17 7.23 5.45'),
)
self.expectOutcome(result=SUCCESS, state_string='OS: High Sierra (10.13.6), Xcode: 10.2')
return self.runStep()
@@ -2208,6 +2214,8 @@
+ ExpectShell.log('stdio', stdout='Tue Apr 9 15:30:52 PDT 2019'),
ExpectShell(command=['uname', '-a'], workdir='wkdir', timeout=60, logEnviron=False) + 0
+ ExpectShell.log('stdio', stdout='''Linux kodama-ews 5.0.4-arch1-1-ARCH #1 SMP PREEMPT Sat Mar 23 21:00:33 UTC 2019 x86_64 GNU/Linux'''),
+ExpectShell(command=['uptime'], workdir='wkdir', timeout=60, logEnviron=False) + 0
++ ExpectShell.log('stdio', stdout=' 6:31 up 22 seconds, 12:05, 2 users, load averages: 3.17 7.23 5.45'),
)
self.expectOutcome(result=SUCCESS, state_string='Printed configuration')
return self.runStep()
@@ -2221,6 +2229,7 @@
ExpectShell(command=['df', '-hl'], workdir='wkdir', timeout=60, logEnviron=False) + 0,
ExpectShell(command=['date'], workdir='wkdir', timeout=60, logEnviron=False) + 0,
ExpectShell(command=['uname', '-a'], workdir='wkdir', timeout=60, logEnviron=False) + 0,
+ExpectShell(command=['uptime'], workdir='wkdir', timeout=60, logEnviron=False) + 0,
)
self.expectOutcome(result=SUCCESS, state_string='Printed configuration')
return self.runStep()
@@ -2267,6 +2276,7 @@
func(fullname, *argrest)
OSError: [Errno 2] No such file or directory''')
+ 1,
+ExpectShell(command=['uptime'], workdir='wkdir', timeout=60, logEnviron=False) + 0,
)
self.expectOutcome(result=FAILURE, state_string='Failed to print configuration')
return self.runStep()
Modified: trunk/Tools/ChangeLog (248767 => 248768)
--- trunk/Tools/ChangeLog 2019-08-16 09:22:18 UTC (rev 248767)
+++ trunk/Tools/ChangeLog 2019-08-16 14:33:41 UTC (rev 248768)
@@ -1,3 +1,14 @@
+2019-08-16 Aakash Jain
+
[webkit-changes] [248770] trunk/Tools
Title: [248770] trunk/Tools Revision 248770 Author aakash_j...@apple.com Date 2019-08-16 07:39:18 -0700 (Fri, 16 Aug 2019) Log Message [ews] Add build steps for Windows Factory https://bugs.webkit.org/show_bug.cgi?id=200813 Reviewed by Jonathan Bedard. * BuildSlaveSupport/ews-build/factories.py: (WindowsFactory.__init__): Modified Paths trunk/Tools/BuildSlaveSupport/ews-build/factories.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (248769 => 248770) --- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-08-16 14:37:20 UTC (rev 248769) +++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-08-16 14:39:18 UTC (rev 248770) @@ -140,7 +140,11 @@ class WindowsFactory(Factory): -pass +def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs): +Factory.__init__(self, platform, configuration, architectures, False, triggers, additionalArguments) +self.addStep(KillOldProcesses()) +self.addStep(CompileWebKit()) +self.addStep(RunWebKit1Tests()) class WinCairoFactory(Factory): Modified: trunk/Tools/ChangeLog (248769 => 248770) --- trunk/Tools/ChangeLog 2019-08-16 14:37:20 UTC (rev 248769) +++ trunk/Tools/ChangeLog 2019-08-16 14:39:18 UTC (rev 248770) @@ -1,5 +1,15 @@ 2019-08-16 Aakash Jain +[ews] Add build steps for Windows Factory +https://bugs.webkit.org/show_bug.cgi?id=200813 + +Reviewed by Jonathan Bedard. + +* BuildSlaveSupport/ews-build/factories.py: +(WindowsFactory.__init__): + +2019-08-16 Aakash Jain + [ews] Report machine uptime in PrintConfiguration https://bugs.webkit.org/show_bug.cgi?id=200812 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [248972] trunk/Tools
Title: [248972] trunk/Tools
Revision 248972
Author aakash_j...@apple.com
Date 2019-08-21 15:48:36 -0700 (Wed, 21 Aug 2019)
Log Message
Assign ews117 to EWS High-Sierra Debug queues
https://bugs.webkit.org/show_bug.cgi?id=200993
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/config.json:
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/config.json
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (248971 => 248972)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-08-21 22:45:46 UTC (rev 248971)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-08-21 22:48:36 UTC (rev 248972)
@@ -359,7 +359,7 @@
"configuration": "debug",
"architectures": ["x86_64"],
"triggers": ["macos-high-sierra-debug-wk1-tests-ews"],
- "workernames": ["ews112", "ews113", "ews114", "ews115", "ews116"]
+ "workernames": ["ews112", "ews113", "ews114", "ews115", "ews116", "ews117"]
},
{
"name": "macOS-High-Sierra-Debug-WK1-Tests-EWS",
@@ -368,7 +368,7 @@
"platform": "mac-highsierra",
"configuration": "debug",
"architectures": ["x86_64"],
- "workernames": ["ews112", "ews113", "ews114", "ews115", "ews116"]
+ "workernames": ["ews112", "ews113", "ews114", "ews115", "ews116", "ews117"]
},
{
"name": "Windows-EWS",
Modified: trunk/Tools/ChangeLog (248971 => 248972)
--- trunk/Tools/ChangeLog 2019-08-21 22:45:46 UTC (rev 248971)
+++ trunk/Tools/ChangeLog 2019-08-21 22:48:36 UTC (rev 248972)
@@ -1,3 +1,12 @@
+2019-08-21 Aakash Jain
+
+Assign ews117 to EWS High-Sierra Debug queues
+https://bugs.webkit.org/show_bug.cgi?id=200993
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/config.json:
+
2019-08-21 Daniel Bates
[lldb-webkit] OptionSet summary shows size 0 sometimes for non-empty set
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [248975] trunk/Tools
Title: [248975] trunk/Tools
Revision 248975
Author aakash_j...@apple.com
Date 2019-08-21 16:51:34 -0700 (Wed, 21 Aug 2019)
Log Message
[ews] Fix capitalization in Found x new Test failure message
https://bugs.webkit.org/show_bug.cgi?id=201004
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/ews-build/steps.py:
(AnalyzeLayoutTestsResults.report_failure):
(AnalyzeAPITestsResults.analyzeResults):
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests accordingly.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (248974 => 248975)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-08-21 23:05:26 UTC (rev 248974)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-08-21 23:51:34 UTC (rev 248975)
@@ -1065,7 +1065,7 @@
self.build.results = FAILURE
pluralSuffix = 's' if len(new_failures) > 1 else ''
new_failures_string = ', '.join([failure_name for failure_name in new_failures])
-message = 'Found {} new Test failure{}: {}'.format(len(new_failures), pluralSuffix, new_failures_string)
+message = 'Found {} new test failure{}: {}'.format(len(new_failures), pluralSuffix, new_failures_string)
self.descriptionDone = message
self.build.buildFinished([message], FAILURE)
return defer.succeed(None)
@@ -1386,7 +1386,7 @@
self.finished(FAILURE)
self.build.results = FAILURE
pluralSuffix = 's' if len(new_failures) > 1 else ''
-message = 'Found {} new API Test failure{}: {}'.format(len(new_failures), pluralSuffix, new_failures_string)
+message = 'Found {} new API test failure{}: {}'.format(len(new_failures), pluralSuffix, new_failures_string)
self.descriptionDone = message
self.build.buildFinished([message], FAILURE)
else:
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (248974 => 248975)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-08-21 23:05:26 UTC (rev 248974)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-08-21 23:51:34 UTC (rev 248975)
@@ -1267,7 +1267,7 @@
self.configureStep()
self.setProperty('first_run_failures', ["jquery/offset.html"])
self.setProperty('second_run_failures', ["jquery/offset.html"])
-self.expectOutcome(result=FAILURE, state_string='Found 1 new Test failure: jquery/offset.html (failure)')
+self.expectOutcome(result=FAILURE, state_string='Found 1 new test failure: jquery/offset.html (failure)')
return self.runStep()
def test_failure_on_clean_tree(self):
@@ -1282,7 +1282,7 @@
self.configureStep()
self.setProperty('first_run_failures', ['test1', 'test2'])
self.setProperty('second_run_failures', ['test1'])
-self.expectOutcome(result=FAILURE, state_string='Found 1 new Test failure: test1 (failure)')
+self.expectOutcome(result=FAILURE, state_string='Found 1 new test failure: test1 (failure)')
return self.runStep()
def test_flaky_and_inconsistent_failures_without_clean_tree_failures(self):
@@ -1350,7 +1350,7 @@
self.setProperty('second_results_exceed_failure_limit', True)
self.setProperty('second_run_failures', ['test{}'.format(i) for i in range(0, 30)])
self.setProperty('clean_tree_run_failures', ['test{}'.format(i) for i in range(0, 10)])
-self.expectOutcome(result=FAILURE, state_string='Found 30 new Test failures: test1, test0, test3, test2, test5, test4, test7, test6, test9, test8, test24, test25, test26, test27, test20, test21, test22, test23, test28, test29, test19, test18, test11, test10, test13, test12, test15, test14, test17, test16 (failure)')
+self.expectOutcome(result=FAILURE, state_string='Found 30 new test failures: test1, test0, test3, test2, test5, test4, test7, test6, test9, test8, test24, test25, test26, test27, test20, test21, test22, test23, test28, test29, test19, test18, test11, test10, test13, test12, test15, test14, test17, test16 (failure)')
return self.runStep()
class TestCheckOutSpecificRevision(BuildStepMixinAdditions, unittest.TestCase):
Modified: trunk/Tools/ChangeLog (248974 => 248975)
--- trunk/Tools/ChangeLog 2019-08-21 23:05:26 UTC (rev 248974)
+++ trunk/Tools/ChangeLog 2019-08-21 23:51:34 UTC (rev 248975)
@@ -1,5 +1,17 @@
2019-08-21 Aakash Jain
+[ews] Fix capitalization in Found x new Test failure message
+https://bugs.webkit.org/show_bug.cgi?id=201004
+
+Reviewed by Alexey Proskuryakov.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(AnalyzeLayoutTestsResults.report_failure):
+(AnalyzeAPITestsResults.analyzeResults):
+* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests accordingly.
+
+2019-08-21
[webkit-changes] [248976] trunk/Tools
Title: [248976] trunk/Tools
Revision 248976
Author aakash_j...@apple.com
Date 2019-08-21 16:56:24 -0700 (Wed, 21 Aug 2019)
Log Message
[ews-build] view layout test results option should be displayed next to layout-test build step
https://bugs.webkit.org/show_bug.cgi?id=200048
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(ExtractTestResults.getLastBuildStepByName): Method to return the last build-step matching the step name.
(ExtractTestResults.addCustomURLs): Add urls to corresponding layout-test step.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (248975 => 248976)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-08-21 23:51:34 UTC (rev 248975)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-08-21 23:56:24 UTC (rev 248976)
@@ -1489,9 +1489,18 @@
def resultsDownloadURL(self):
return self.zipFile.replace('public_html/', '/')
+def getLastBuildStepByName(self, name):
+for step in reversed(self.build.executedSteps):
+if name in step.name:
+return step
+return None
+
def addCustomURLs(self):
-self.addURL('view layout test results', self.resultDirectoryURL() + 'results.html')
-self.addURL('download layout test results', self.resultsDownloadURL())
+step = self.getLastBuildStepByName(RunWebKitTests.name)
+if not step:
+step = self
+step.addURL('view layout test results', self.resultDirectoryURL() + 'results.html')
+step.addURL('download layout test results', self.resultsDownloadURL())
def finished(self, result):
self.addCustomURLs()
Modified: trunk/Tools/ChangeLog (248975 => 248976)
--- trunk/Tools/ChangeLog 2019-08-21 23:51:34 UTC (rev 248975)
+++ trunk/Tools/ChangeLog 2019-08-21 23:56:24 UTC (rev 248976)
@@ -1,5 +1,16 @@
2019-08-21 Aakash Jain
+[ews-build] view layout test results option should be displayed next to layout-test build step
+https://bugs.webkit.org/show_bug.cgi?id=200048
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(ExtractTestResults.getLastBuildStepByName): Method to return the last build-step matching the step name.
+(ExtractTestResults.addCustomURLs): Add urls to corresponding layout-test step.
+
+2019-08-21 Aakash Jain
+
[ews] Fix capitalization in Found x new Test failure message
https://bugs.webkit.org/show_bug.cgi?id=201004
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [251604] trunk/Tools
Title: [251604] trunk/Tools
Revision 251604
Author aakash_j...@apple.com
Date 2019-10-25 15:07:13 -0700 (Fri, 25 Oct 2019)
Log Message
[EWS] Status page should show compiler ERRORS
https://bugs.webkit.org/show_bug.cgi?id=203418
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(BuildLogLineObserver): Class for Analyzing build logs and extracting error logs.
(CompileWebKit.start): Initialize the log observer.
(CompileWebKit):
(CompileWebKit.errorReceived): Add the error to the errors log.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (251603 => 251604)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-10-25 21:44:14 UTC (rev 251603)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-10-25 22:07:13 UTC (rev 251604)
@@ -736,6 +736,25 @@
step.setCommand(step.command + ['--' + platform])
+class BuildLogLineObserver(logobserver.LogLineObserver, object):
+def __init__(self, errorReceived=None):
+self.errorReceived = errorReceived
+self.error_context_buffer = []
+self.whitespace_re = re.compile('^[\s]*$')
+super(BuildLogLineObserver, self).__init__()
+
+def outLineReceived(self, line):
+is_whitespace = self.whitespace_re.search(line) is not None
+if is_whitespace:
+self.error_context_buffer = []
+else:
+self.error_context_buffer.append(line)
+
+if "rror:" in line and self.errorReceived:
+map(self.errorReceived, self.error_context_buffer)
+self.error_context_buffer = []
+
+
class CompileWebKit(shell.Compile):
name = 'compile-webkit'
description = ['compiling']
@@ -755,6 +774,9 @@
architecture = self.getProperty('architecture')
additionalArguments = self.getProperty('additionalArguments')
+if platform != 'windows':
+self.addLogObserver('stdio', BuildLogLineObserver(self.errorReceived))
+
if additionalArguments:
self.setCommand(self.command + additionalArguments)
if platform in ('mac', 'ios') and architecture:
@@ -772,6 +794,17 @@
return shell.Compile.start(self)
+@defer.inlineCallbacks
+def _addToLog(self, logName, message):
+try:
+log = self.getLog(logName)
+except KeyError:
+log = yield self.addLog(logName)
+log.addStdout(message)
+
+def errorReceived(self, error):
+self._addToLog('errors', error + '\n')
+
def evaluateCommand(self, cmd):
if cmd.didFail():
self.setProperty('patchFailedToBuild', True)
Modified: trunk/Tools/ChangeLog (251603 => 251604)
--- trunk/Tools/ChangeLog 2019-10-25 21:44:14 UTC (rev 251603)
+++ trunk/Tools/ChangeLog 2019-10-25 22:07:13 UTC (rev 251604)
@@ -1,3 +1,16 @@
+2019-10-25 Aakash Jain
+
+[EWS] Status page should show compiler ERRORS
+https://bugs.webkit.org/show_bug.cgi?id=203418
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(BuildLogLineObserver): Class for Analyzing build logs and extracting error logs.
+(CompileWebKit.start): Initialize the log observer.
+(CompileWebKit):
+(CompileWebKit.errorReceived): Add the error to the errors log.
+
2019-10-25 Matt Lewis
Rolling out r251579,r251162,r251512,r251500, and r251498 for build failures
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [251653] trunk/Tools
Title: [251653] trunk/Tools
Revision 251653
Author aakash_j...@apple.com
Date 2019-10-28 07:57:57 -0700 (Mon, 28 Oct 2019)
Log Message
[ews] Improve summary for CompileWebKit and CompileJSC build step
https://bugs.webkit.org/show_bug.cgi?id=203487
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(CompileWebKit.getResultSummary): Method to generate custom status message.
(CompileJSC.getResultSummary): Ditto.
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (251652 => 251653)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-10-28 10:31:19 UTC (rev 251652)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-10-28 14:57:57 UTC (rev 251653)
@@ -828,7 +828,12 @@
return super(CompileWebKit, self).evaluateCommand(cmd)
+def getResultSummary(self):
+if self.results == FAILURE:
+return {u'step': u'Failed to compile WebKit'}
+return shell.Compile.getResultSummary(self)
+
class CompileWebKitToT(CompileWebKit):
name = 'compile-webkit-tot'
haltOnFailure = False
@@ -884,7 +889,12 @@
self.setProperty('group', 'jsc')
return CompileWebKit.start(self)
+def getResultSummary(self):
+if self.results == FAILURE:
+return {u'step': u'Failed to compile JSC'}
+return shell.Compile.getResultSummary(self)
+
class CompileJSCToT(CompileJSC):
name = 'compile-jsc-tot'
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (251652 => 251653)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-10-28 10:31:19 UTC (rev 251652)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-10-28 14:57:57 UTC (rev 251653)
@@ -831,7 +831,7 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
-self.expectOutcome(result=FAILURE, state_string='Compiled WebKit (failure)')
+self.expectOutcome(result=FAILURE, state_string='Failed to compile WebKit')
return self.runStep()
@@ -871,7 +871,7 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
-self.expectOutcome(result=FAILURE, state_string='Compiled WebKit (failure)')
+self.expectOutcome(result=FAILURE, state_string='Failed to compile WebKit')
return self.runStep()
def test_skip(self):
@@ -944,7 +944,7 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
-self.expectOutcome(result=FAILURE, state_string='Compiled JSC (failure)')
+self.expectOutcome(result=FAILURE, state_string='Failed to compile JSC')
return self.runStep()
@@ -983,7 +983,7 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
-self.expectOutcome(result=FAILURE, state_string='Compiled JSC (failure)')
+self.expectOutcome(result=FAILURE, state_string='Failed to compile JSC')
return self.runStep()
Modified: trunk/Tools/ChangeLog (251652 => 251653)
--- trunk/Tools/ChangeLog 2019-10-28 10:31:19 UTC (rev 251652)
+++ trunk/Tools/ChangeLog 2019-10-28 14:57:57 UTC (rev 251653)
@@ -1,3 +1,15 @@
+2019-10-28 Aakash Jain
+
+[ews] Improve summary for CompileWebKit and CompileJSC build step
+https://bugs.webkit.org/show_bug.cgi?id=203487
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(CompileWebKit.getResultSummary): Method to generate custom status message.
+(CompileJSC.getResultSummary): Ditto.
+* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+
2019-10-21 Jiewen Tan
[WebAuthn] Warn users when multiple NFC tags present
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [251849] trunk/Tools
Title: [251849] trunk/Tools
Revision 251849
Author aakash_j...@apple.com
Date 2019-10-31 08:42:49 -0700 (Thu, 31 Oct 2019)
Log Message
[EWS] Limit API tests failures to display in the status-bubble tooltip and buildbot summary
https://bugs.webkit.org/show_bug.cgi?id=203678
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(AnalyzeAPITestsResults): Define NUM_API_FAILURES_TO_DISPLAY as 10.
(AnalyzeAPITestsResults.analyzeResults): Truncate the failure string to contain 10 test failures.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (251848 => 251849)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-10-31 15:40:10 UTC (rev 251848)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-10-31 15:42:49 UTC (rev 251849)
@@ -1451,6 +1451,7 @@
name = 'analyze-api-tests-results'
description = ['analyze-api-test-results']
descriptionDone = ['analyze-api-tests-results']
+NUM_API_FAILURES_TO_DISPLAY = 10
def start(self):
self.results = {}
@@ -1492,7 +1493,8 @@
flaky_failures = first_run_failures.union(second_run_failures) - first_run_failures.intersection(second_run_failures)
flaky_failures_string = ', '.join([failure_name.replace('TestWebKitAPI.', '') for failure_name in flaky_failures])
new_failures = failures_with_patch - clean_tree_failures
-new_failures_string = ', '.join([failure_name.replace('TestWebKitAPI.', '') for failure_name in new_failures])
+new_failures_to_display = list(new_failures)[:self.NUM_API_FAILURES_TO_DISPLAY]
+new_failures_string = ', '.join([failure_name.replace('TestWebKitAPI.', '') for failure_name in new_failures_to_display])
self._addToLog('stderr', '\nFailures in API Test first run: {}'.format(first_run_failures))
self._addToLog('stderr', '\nFailures in API Test second run: {}'.format(second_run_failures))
@@ -1505,6 +1507,8 @@
self.build.results = FAILURE
pluralSuffix = 's' if len(new_failures) > 1 else ''
message = 'Found {} new API test failure{}: {}'.format(len(new_failures), pluralSuffix, new_failures_string)
+if len(new_failures) > self.NUM_API_FAILURES_TO_DISPLAY:
+message += ' ...'
self.descriptionDone = message
self.build.buildFinished([message], FAILURE)
else:
Modified: trunk/Tools/ChangeLog (251848 => 251849)
--- trunk/Tools/ChangeLog 2019-10-31 15:40:10 UTC (rev 251848)
+++ trunk/Tools/ChangeLog 2019-10-31 15:42:49 UTC (rev 251849)
@@ -1,3 +1,14 @@
+2019-10-31 Aakash Jain
+
+[EWS] Limit API tests failures to display in the status-bubble tooltip and buildbot summary
+https://bugs.webkit.org/show_bug.cgi?id=203678
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(AnalyzeAPITestsResults): Define NUM_API_FAILURES_TO_DISPLAY as 10.
+(AnalyzeAPITestsResults.analyzeResults): Truncate the failure string to contain 10 test failures.
+
2019-10-30 Peng Liu
[Picture-in-Picture Web API] Enable the support for iOS
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [251869] trunk/Tools
Title: [251869] trunk/Tools
Revision 251869
Author aakash_j...@apple.com
Date 2019-10-31 12:56:34 -0700 (Thu, 31 Oct 2019)
Log Message
[ews-build] Display pre-existing API test names in the build summary
https://bugs.webkit.org/show_bug.cgi?id=199525
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(AnalyzeAPITestsResults.analyzeResults): Include the names of pre-existing test failures in summary string and
limit the number of failures to display to NUM_API_FAILURES_TO_DISPLAY.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (251868 => 251869)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-10-31 19:29:51 UTC (rev 251868)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-10-31 19:56:34 UTC (rev 251869)
@@ -1488,6 +1488,8 @@
first_run_failures = getAPITestFailures(first_run_results)
second_run_failures = getAPITestFailures(second_run_results)
clean_tree_failures = getAPITestFailures(clean_tree_results)
+clean_tree_failures_to_display = list(clean_tree_failures)[:self.NUM_API_FAILURES_TO_DISPLAY]
+clean_tree_failures_string = ', '.join(clean_tree_failures_to_display)
failures_with_patch = first_run_failures.intersection(second_run_failures)
flaky_failures = first_run_failures.union(second_run_failures) - first_run_failures.intersection(second_run_failures)
@@ -1517,7 +1519,9 @@
self.build.results = SUCCESS
self.descriptionDone = 'Passed API tests'
pluralSuffix = 's' if len(clean_tree_failures) > 1 else ''
-message = 'Found {} pre-existing API test failure{}'.format(len(clean_tree_failures), pluralSuffix)
+message = 'Found {} pre-existing API test failure{}: {}'.format(len(clean_tree_failures), pluralSuffix, clean_tree_failures_string)
+if len(clean_tree_failures) > self.NUM_API_FAILURES_TO_DISPLAY:
+message += ' ...'
if flaky_failures:
message += '. Flaky tests: {}'.format(flaky_failures_string)
self.build.buildFinished([message], SUCCESS)
Modified: trunk/Tools/ChangeLog (251868 => 251869)
--- trunk/Tools/ChangeLog 2019-10-31 19:29:51 UTC (rev 251868)
+++ trunk/Tools/ChangeLog 2019-10-31 19:56:34 UTC (rev 251869)
@@ -1,3 +1,14 @@
+2019-10-31 Aakash Jain
+
+[ews-build] Display pre-existing API test names in the build summary
+https://bugs.webkit.org/show_bug.cgi?id=199525
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(AnalyzeAPITestsResults.analyzeResults): Include the names of pre-existing test failures in summary string and
+limit the number of failures to display to NUM_API_FAILURES_TO_DISPLAY.
+
2019-10-31 Alex Christensen
Expose more WKPreferences SPI
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [251927] trunk/Tools
Title: [251927] trunk/Tools
Revision 251927
Author aakash_j...@apple.com
Date 2019-11-01 10:27:35 -0700 (Fri, 01 Nov 2019)
Log Message
[ews] Pass clobber-old-results parameter to run-webkit-tests
https://bugs.webkit.org/show_bug.cgi?id=203736
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(RunWebKitTests): Added --clobber-old-results paramter to run-webkit-tests. Also re-ordered
--no-new-test-results and --no-show-results to match with build.webkit.org configuration.
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (251926 => 251927)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-01 17:18:08 UTC (rev 251926)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-01 17:27:35 UTC (rev 251927)
@@ -980,8 +980,9 @@
logfiles = {'json': jsonFileName}
command = ['python', 'Tools/Scripts/run-webkit-tests',
'--no-build',
+ '--no-show-results',
'--no-new-test-results',
- '--no-show-results',
+ '--clobber-old-results',
'--exit-after-n-failures', '30',
'--skip-failing-tests',
WithProperties('--%(configuration)s')]
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (251926 => 251927)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-11-01 17:18:08 UTC (rev 251926)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-11-01 17:27:35 UTC (rev 251927)
@@ -1143,7 +1143,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
-command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
)
+ 0,
)
@@ -1157,7 +1157,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
-command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
)
+ 0
+ ExpectShell.log('stdio', stdout='''Unexpected flakiness: timeouts (2)
@@ -1174,7 +1174,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
-command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
)
+ 2
+ ExpectShell.log('json', stdout=self.results_json_regressions),
@@ -1202,7 +1202,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
-command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-
[webkit-changes] [251938] trunk/Tools
Title: [251938] trunk/Tools
Revision 251938
Author aakash_j...@apple.com
Date 2019-11-01 13:55:24 -0700 (Fri, 01 Nov 2019)
Log Message
[ews] Improve summary string when there are flaky failures in API tests
https://bugs.webkit.org/show_bug.cgi?id=203747
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(AnalyzeAPITestsResults.analyzeResults): Display pre-existing failure string string only
if there are pre-existing API test failures.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (251937 => 251938)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-01 20:36:34 UTC (rev 251937)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-01 20:55:24 UTC (rev 251938)
@@ -1520,11 +1520,13 @@
self.build.results = SUCCESS
self.descriptionDone = 'Passed API tests'
pluralSuffix = 's' if len(clean_tree_failures) > 1 else ''
-message = 'Found {} pre-existing API test failure{}: {}'.format(len(clean_tree_failures), pluralSuffix, clean_tree_failures_string)
+message = ''
+if clean_tree_failures:
+message = 'Found {} pre-existing API test failure{}: {}'.format(len(clean_tree_failures), pluralSuffix, clean_tree_failures_string)
if len(clean_tree_failures) > self.NUM_API_FAILURES_TO_DISPLAY:
message += ' ...'
if flaky_failures:
-message += '. Flaky tests: {}'.format(flaky_failures_string)
+message += ' Found flaky tests: {}'.format(flaky_failures_string)
self.build.buildFinished([message], SUCCESS)
@defer.inlineCallbacks
Modified: trunk/Tools/ChangeLog (251937 => 251938)
--- trunk/Tools/ChangeLog 2019-11-01 20:36:34 UTC (rev 251937)
+++ trunk/Tools/ChangeLog 2019-11-01 20:55:24 UTC (rev 251938)
@@ -1,3 +1,14 @@
+2019-11-01 Aakash Jain
+
+[ews] Improve summary string when there are flaky failures in API tests
+https://bugs.webkit.org/show_bug.cgi?id=203747
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(AnalyzeAPITestsResults.analyzeResults): Display pre-existing failure string string only
+if there are pre-existing API test failures.
+
2019-11-01 Wenson Hsieh
TestWebKitAPI.EditorStateTests.TypingAttributesTextAlignmentStartEnd is flaky in iOS simulator
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [252017] trunk/Tools
Title: [252017] trunk/Tools Revision 252017 Author aakash_j...@apple.com Date 2019-11-04 15:06:02 -0800 (Mon, 04 Nov 2019) Log Message [ews] Status bubble should be white for CANCELLED builds https://bugs.webkit.org/show_bug.cgi?id=201204 Reviewed by Jonathan Bedard. * BuildSlaveSupport/ews-app/ews/views/statusbubble.py: Modified Paths trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (252016 => 252017) --- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-11-04 22:57:51 UTC (rev 252016) +++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-11-04 23:06:02 UTC (rev 252017) @@ -140,7 +140,7 @@ bubble['state'] = 'provisional-fail' bubble['details_message'] = 'Build is being retried. Recent messages:' + self._steps_messages_from_multiple_builds(builds) elif build.result == Buildbot.CANCELLED: -bubble['state'] = 'fail' +bubble['state'] = 'none' bubble['details_message'] = 'Build was cancelled. Recent messages:' + self._steps_messages_from_multiple_builds(builds) else: bubble['state'] = 'error' Modified: trunk/Tools/ChangeLog (252016 => 252017) --- trunk/Tools/ChangeLog 2019-11-04 22:57:51 UTC (rev 252016) +++ trunk/Tools/ChangeLog 2019-11-04 23:06:02 UTC (rev 252017) @@ -1,3 +1,12 @@ +2019-11-04 Aakash Jain + +[ews] Status bubble should be white for CANCELLED builds +https://bugs.webkit.org/show_bug.cgi?id=201204 + +Reviewed by Jonathan Bedard. + +* BuildSlaveSupport/ews-app/ews/views/statusbubble.py: + 2019-11-04 John Wilander Resource Load Statistics: Flush the shared ResourceLoadObserver when the webpage is closed by _javascript_ ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [252037] trunk/Tools
Title: [252037] trunk/Tools
Revision 252037
Author aakash_j...@apple.com
Date 2019-11-04 20:24:41 -0800 (Mon, 04 Nov 2019)
Log Message
[ews] Perform validation of patch before retrying API and layout tests
https://bugs.webkit.org/show_bug.cgi?id=203756
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
(ValidatePatch.__init__): Added parameters to optionally skip certain validations.
(ValidatePatch.start): Skip certain validations based on the parameters.
(RunWebKitTests.evaluateCommand): Add a ValidatePatch step before retrying.
(ReRunWebKitTests.evaluateCommand): Ditto.
(RunAPITests.evaluateCommand): Ditto.
(ReRunAPITests.evaluateCommand): Ditto.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (252036 => 252037)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-05 04:23:57 UTC (rev 252036)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-05 04:24:41 UTC (rev 252037)
@@ -320,6 +320,13 @@
bug_open_statuses = ['UNCONFIRMED', 'NEW', 'ASSIGNED', 'REOPENED']
bug_closed_statuses = ['RESOLVED', 'VERIFIED', 'CLOSED']
+def __init__(self, verifyObsolete=True, verifyBugClosed=True, verifyReviewDenied=True, addURLs=True, **kwargs):
+self.verifyObsolete = verifyObsolete
+self.verifyBugClosed = verifyBugClosed
+self.verifyReviewDenied = verifyReviewDenied
+self.addURLs = addURLs
+buildstep.BuildStep.__init__(self)
+
@defer.inlineCallbacks
def _addToLog(self, logName, message):
try:
@@ -381,7 +388,8 @@
return -1
patch_author = patch_json.get('creator')
-self.addURL('Patch by: {}'.format(patch_author), 'mailto:{}'.format(patch_author))
+if self.addURLs:
+self.addURL('Patch by: {}'.format(patch_author), 'mailto:{}'.format(patch_author))
return patch_json.get('is_obsolete')
def _is_patch_review_denied(self, patch_id):
@@ -406,7 +414,8 @@
return -1
bug_title = bug_json.get('summary')
-self.addURL(u'Bug {} {}'.format(bug_id, bug_title), '{}show_bug.cgi?id={}'.format(BUG_SERVER_URL, bug_id))
+if self.addURLs:
+self.addURL(u'Bug {} {}'.format(bug_id, bug_title), '{}show_bug.cgi?id={}'.format(BUG_SERVER_URL, bug_id))
if bug_json.get('status') in self.bug_closed_statuses:
return 1
return 0
@@ -433,17 +442,17 @@
bug_id = self.getProperty('bug_id', '') or self.get_bug_id_from_patch(patch_id)
-bug_closed = self._is_bug_closed(bug_id)
+bug_closed = self._is_bug_closed(bug_id) if self.verifyBugClosed else 0
if bug_closed == 1:
self.skip_build('Bug {} is already closed'.format(bug_id))
return None
-obsolete = self._is_patch_obsolete(patch_id)
+obsolete = self._is_patch_obsolete(patch_id) if self.verifyObsolete else 0
if obsolete == 1:
self.skip_build('Patch {} is obsolete'.format(patch_id))
return None
-review_denied = self._is_patch_review_denied(patch_id)
+review_denied = self._is_patch_review_denied(patch_id) if self.verifyReviewDenied else 0
if review_denied == 1:
self.skip_build('Patch {} is marked r-'.format(patch_id))
return None
@@ -453,7 +462,12 @@
self.setProperty('validated', False)
return None
-self._addToLog('stdio', 'Bug is open.\nPatch is not obsolete.\nPatch is not marked r-.\n')
+if self.verifyBugClosed:
+self._addToLog('stdio', 'Bug is open.\n')
+if self.verifyObsolete:
+self._addToLog('stdio', 'Patch is not obsolete.\n')
+if self.verifyReviewDenied:
+self._addToLog('stdio', 'Patch is not marked r-.\n')
self.finished(SUCCESS)
return None
@@ -1090,7 +1104,7 @@
self.build.results = SUCCESS
self.build.buildFinished([message], SUCCESS)
else:
-self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(), ExtractTestResults(), ReRunWebKitTests()])
+self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(), ExtractTestResults(), ValidatePatch(verifyBugClosed=False, addURLs=False), ReRunWebKitTests()])
return rc
def getResultSummary(self):
@@ -1115,7 +1129,14 @@
self.build.buildFinished([message], SUCCESS)
else:
self.setProperty('patchFailedTests', True)
-self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(identifier='rerun'), ExtractTestResults(identifier='rerun'), UnApplyPatchIfRequired(), CompileWebKitToT(), RunWebKitTestsWithoutPatch()])
+self.build.addStepsAfterCurrentStep([ArchiveTestResults(),
+UploadTestResults(id
[webkit-changes] [252075] trunk/Tools
Title: [252075] trunk/Tools
Revision 252075
Author aakash_j...@apple.com
Date 2019-11-05 13:36:43 -0800 (Tue, 05 Nov 2019)
Log Message
EWS should report test failures from clean-tree to results.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=203829
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/loadConfig.py:
(loadBuilderConfig):
* BuildSlaveSupport/ews-build/steps.py:
(RunWebKitTests.__init__):
(RunWebKitTestsWithoutPatch.start):
(RunAPITestsWithoutPatch.start):
* BuildSlaveSupport/ews-build/steps_unittest.py: Added and updated unit-tests.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py (252074 => 252075)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2019-11-05 21:24:53 UTC (rev 252074)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2019-11-05 21:36:43 UTC (rev 252075)
@@ -46,6 +46,9 @@
passwords = {}
else:
passwords = json.load(open(os.path.join(master_prefix_path, 'passwords.json')))
+results_server_api_key = passwords.get('results-server-api-key')
+if results_server_api_key:
+os.environ['RESULTS_SERVER_API_KEY'] = results_server_api_key
checkWorkersAndBuildersForConsistency(config, config['workers'], config['builders'])
checkValidSchedulers(config, config['schedulers'])
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (252074 => 252075)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-05 21:24:53 UTC (rev 252074)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-05 21:36:43 UTC (rev 252075)
@@ -31,6 +31,7 @@
from layout_test_failures import LayoutTestFailures
import json
+import os
import re
import requests
@@ -39,6 +40,8 @@
EWS_URL = 'https://ews-build.webkit.org/'
WithProperties = properties.WithProperties
Interpolate = properties.Interpolate
+RESULTS_WEBKIT_URL = 'https://results.webkit.org'
+RESULTS_SERVER_API_KEY = 'RESULTS_SERVER_API_KEY'
class ConfigureBuild(buildstep.BuildStep):
@@ -1001,6 +1004,9 @@
'--skip-failing-tests',
WithProperties('--%(configuration)s')]
+def __init__(self, **kwargs):
+shell.Test.__init__(self, logEnviron=False, **kwargs)
+
def start(self):
self.log_observer = logobserver.BufferLogObserver(wantStderr=True)
self.addLogObserver('stdio', self.log_observer)
@@ -1155,6 +1161,16 @@
class RunWebKitTestsWithoutPatch(RunWebKitTests):
name = 'run-layout-tests-without-patch'
+def start(self):
+self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
+self.setCommand(self.command +
+['--buildbot-master', EWS_URL.replace('https://', '').strip('/'),
+'--builder-name', self.getProperty('buildername'),
+'--build-number', self.getProperty('buildnumber'),
+'--buildbot-worker', self.getProperty('workername'),
+'--report', RESULTS_WEBKIT_URL])
+return super(RunWebKitTestsWithoutPatch, self).start()
+
def evaluateCommand(self, cmd):
rc = shell.Test.evaluateCommand(self, cmd)
self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(identifier='clean-tree'), ExtractTestResults(identifier='clean-tree'), AnalyzeLayoutTestsResults()])
@@ -1473,7 +1489,17 @@
def evaluateCommand(self, cmd):
return TestWithFailureCount.evaluateCommand(self, cmd)
+def start(self):
+self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
+self.setCommand(self.command +
+['--buildbot-master', EWS_URL.replace('https://', '').strip('/'),
+'--builder-name', self.getProperty('buildername'),
+'--build-number', self.getProperty('buildnumber'),
+'--buildbot-worker', self.getProperty('workername'),
+'--report', RESULTS_WEBKIT_URL])
+return super(RunAPITestsWithoutPatch, self).start()
+
class AnalyzeAPITestsResults(buildstep.BuildStep):
name = 'analyze-api-tests-results'
description = ['analyze-api-test-results']
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (252074 => 252075)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-11-05 21:24:53 UTC (rev 252074)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-11-05 21:36:43 UTC (rev 252075)
@@ -40,7 +40,7 @@
DownloadBuiltProduct, DownloadBuiltProductFromMaster, ExtractBuiltProduct, ExtractTestResults, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
PrintConfiguration, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch,
RunBindingsTests, RunBuildWebKitOrgUnit
[webkit-changes] [252137] trunk/Tools
Title: [252137] trunk/Tools
Revision 252137
Author aakash_j...@apple.com
Date 2019-11-06 09:05:45 -0800 (Wed, 06 Nov 2019)
Log Message
Add watchlist category for BuildSlaveSupport
https://bugs.webkit.org/show_bug.cgi?id=203900
Reviewed by Jonathan Bedard.
* Scripts/webkitpy/common/config/watchlist:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist
Diff
Modified: trunk/Tools/ChangeLog (252136 => 252137)
--- trunk/Tools/ChangeLog 2019-11-06 13:13:10 UTC (rev 252136)
+++ trunk/Tools/ChangeLog 2019-11-06 17:05:45 UTC (rev 252137)
@@ -1,3 +1,12 @@
+2019-11-06 Aakash Jain
+
+Add watchlist category for BuildSlaveSupport
+https://bugs.webkit.org/show_bug.cgi?id=203900
+
+Reviewed by Jonathan Bedard.
+
+* Scripts/webkitpy/common/config/watchlist:
+
2019-11-06 Philippe Normand
[GTK][WPE] Add libfdk-aac-dev to the install-dependencies script
Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (252136 => 252137)
--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2019-11-06 13:13:10 UTC (rev 252136)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2019-11-06 17:05:45 UTC (rev 252137)
@@ -33,6 +33,9 @@
"WebIDL": {
"filename": r"Source/WebCore/(?!inspector)(?!testing).*\.idl"
},
+"BuildSlaveSupport": {
+"filename": r"Tools/BuildSlaveSupport/",
+},
"webkitpy": {
"filename": r"Tools/Scripts/webkitpy/",
},
@@ -398,6 +401,7 @@
"Animation" : [ "simon.fra...@apple.com", "d...@apple.com", "dstockw...@chromium.org" ],
"MotionMark" : [ "sabouhall...@apple.com" ],
"BindingsScripts": [ "cdu...@apple.com" ],
+"BuildSlaveSupport": [ "aakash_j...@apple.com" ],
"CMake": [ "gyuyoung@webkit.org", "ryuan.c...@navercorp.com", "ser...@correia.cc", "annu...@yandex.ru" ],
"CoordinatedGraphics" : [ "n...@webkit.org", "z...@webkit.org", "cmarc...@webkit.org", "l...@webkit.org", "ryuan.c...@navercorp.com", "ser...@correia.cc", "gyuyoung@webkit.org" ],
"ConsoleUsage" : [ "mk...@chromium.org" ],
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [252148] trunk/Tools
Title: [252148] trunk/Tools
Revision 252148
Author aakash_j...@apple.com
Date 2019-11-06 14:17:41 -0800 (Wed, 06 Nov 2019)
Log Message
[ews] Increase timeout for svn-apply
https://bugs.webkit.org/show_bug.cgi?id=203909
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-build/steps.py:
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (252147 => 252148)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-06 21:49:36 UTC (rev 252147)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-06 22:17:41 UTC (rev 252148)
@@ -190,7 +190,7 @@
command = ['perl', 'Tools/Scripts/svn-apply', '--force', '.buildbot-diff']
def __init__(self, **kwargs):
-super(ApplyPatch, self).__init__(timeout=5 * 60, logEnviron=False, **kwargs)
+super(ApplyPatch, self).__init__(timeout=10 * 60, logEnviron=False, **kwargs)
def _get_patch(self):
sourcestamp = self.build.getSourceStamp(self.getProperty('codebase', ''))
Modified: trunk/Tools/ChangeLog (252147 => 252148)
--- trunk/Tools/ChangeLog 2019-11-06 21:49:36 UTC (rev 252147)
+++ trunk/Tools/ChangeLog 2019-11-06 22:17:41 UTC (rev 252148)
@@ -1,5 +1,14 @@
2019-11-06 Aakash Jain
+[ews] Increase timeout for svn-apply
+https://bugs.webkit.org/show_bug.cgi?id=203909
+
+Reviewed by Jonathan Bedard.
+
+* BuildSlaveSupport/ews-build/steps.py:
+
+2019-11-06 Aakash Jain
+
Add watchlist category for BuildSlaveSupport
https://bugs.webkit.org/show_bug.cgi?id=203900
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [252150] trunk/Tools
Title: [252150] trunk/Tools
Revision 252150
Author aakash_j...@apple.com
Date 2019-11-06 14:21:33 -0800 (Wed, 06 Nov 2019)
Log Message
All EWS status-bubbles shows #1 on security patches when patch is uploaded with webkit-patch --no-review
https://bugs.webkit.org/show_bug.cgi?id=203903
Reviewed by David Kilzer.
* BuildSlaveSupport/ews-app/ews/fetcher.py:
(BugzillaPatchFetcher.fetch):
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-app/ews/fetcher.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/fetcher.py (252149 => 252150)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/fetcher.py 2019-11-06 22:21:20 UTC (rev 252149)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/fetcher.py 2019-11-06 22:21:33 UTC (rev 252150)
@@ -63,10 +63,6 @@
_log.info('{} r? patches, {} patches need to be sent to Buildbot: {}'.format(len(patch_ids), len(patches_to_send), patches_to_send))
for patch_id in patches_to_send:
-if Patch.is_patch_sent_to_buildbot(patch_id):
-_log.error('Patch {} is already sent to buildbot.'.format(patch_id))
-continue
-Patch.set_sent_to_buildbot(patch_id, True)
bz_patch = Bugzilla.retrieve_attachment(patch_id)
if not bz_patch or bz_patch['id'] != patch_id:
_log.error('Unable to retrive patch "{}"'.format(patch_id))
@@ -75,6 +71,10 @@
_log.warn('Patch is obsolete, skipping')
Patch.set_obsolete(patch_id)
continue
+if Patch.is_patch_sent_to_buildbot(patch_id):
+_log.error('Patch {} is already sent to buildbot.'.format(patch_id))
+continue
+Patch.set_sent_to_buildbot(patch_id, True)
rc = Buildbot.send_patch_to_buildbot(bz_patch['path'],
properties=['patch_id={}'.format(patch_id), 'bug_id={}'.format(bz_patch['bug_id']), 'owner={}'.format(bz_patch.get('creator', ''))])
if rc == 0:
Modified: trunk/Tools/ChangeLog (252149 => 252150)
--- trunk/Tools/ChangeLog 2019-11-06 22:21:20 UTC (rev 252149)
+++ trunk/Tools/ChangeLog 2019-11-06 22:21:33 UTC (rev 252150)
@@ -1,5 +1,15 @@
2019-11-06 Aakash Jain
+All EWS status-bubbles shows #1 on security patches when patch is uploaded with webkit-patch --no-review
+https://bugs.webkit.org/show_bug.cgi?id=203903
+
+Reviewed by David Kilzer.
+
+* BuildSlaveSupport/ews-app/ews/fetcher.py:
+(BugzillaPatchFetcher.fetch):
+
+2019-11-06 Aakash Jain
+
[ews] Increase timeout for svn-apply
https://bugs.webkit.org/show_bug.cgi?id=203909
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [252164] trunk/LayoutTests
Title: [252164] trunk/LayoutTests Revision 252164 Author aakash_j...@apple.com Date 2019-11-06 17:55:07 -0800 (Wed, 06 Nov 2019) Log Message REGRESSION: r252121 introduced new webgl/ failures https://bugs.webkit.org/show_bug.cgi?id=203908 Unreviewed test gardening to quell the bots. Patch by Justin Fan on 2019-11-06 * TestExpectations: * platform/ios/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations trunk/LayoutTests/platform/ios/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (252163 => 252164) --- trunk/LayoutTests/ChangeLog 2019-11-07 01:48:40 UTC (rev 252163) +++ trunk/LayoutTests/ChangeLog 2019-11-07 01:55:07 UTC (rev 252164) @@ -1,3 +1,13 @@ +2019-11-06 Justin Fan + +REGRESSION: r252121 introduced new webgl/ failures +https://bugs.webkit.org/show_bug.cgi?id=203908 + +Unreviewed test gardening to quell the bots. + +* TestExpectations: +* platform/ios/TestExpectations: + 2019-11-06 Jer Noble Screen locks while watching previously-muted-then-unmuted video Modified: trunk/LayoutTests/TestExpectations (252163 => 252164) --- trunk/LayoutTests/TestExpectations 2019-11-07 01:48:40 UTC (rev 252163) +++ trunk/LayoutTests/TestExpectations 2019-11-07 01:55:07 UTC (rev 252164) @@ -3916,8 +3916,16 @@ webgl/1.0.3/conformance/glsl/constructors/glsl-construct-vec3.html [ Skip ] webgl/1.0.3/conformance/glsl/constructors/glsl-construct-vec4.html [ Skip ] webgl/1.0.3/conformance/glsl/misc/shader-uniform-packing-restrictions.html [ Skip ] +webgl/1.0.3/conformance/glsl/misc/shader-with-reserved-words.html [ Skip ] webgl/1.0.3/conformance/glsl/misc/shader-with-non-reserved-words.html [ Skip ] webgl/1.0.3/conformance/glsl/misc/shaders-with-mis-matching-uniforms.html [ Skip ] webgl/1.0.3/conformance/glsl/misc/struct-nesting-of-variable-names.html [ Skip ] webgl/1.0.3/conformance/glsl/misc/struct-unary-operators.html [ Skip ] -webgl/1.0.3/conformance/uniforms/gl-uniform-arrays.html [ Skip ] \ No newline at end of file +webgl/1.0.3/conformance/uniforms/gl-uniform-arrays.html [ Skip ] + +# webkit.org/b/203908 Tests generate inconsistent results or time out +webgl/1.0.3/conformance/textures/texture-npot-video.html [ Skip ] +webgl/1.0.3/conformance/renderbuffers/feedback-loop.html [ Skip ] +webgl/1.0.3/conformance/textures/copy-tex-image-2d-formats.html [ Skip ] +webgl/1.0.3/conformance/canvas/rapid-resizing.html [ Skip ] +webgl/1.0.3/conformance/extensions/webgl-draw-buffers.html [ Skip ] \ No newline at end of file Modified: trunk/LayoutTests/platform/ios/TestExpectations (252163 => 252164) --- trunk/LayoutTests/platform/ios/TestExpectations 2019-11-07 01:48:40 UTC (rev 252163) +++ trunk/LayoutTests/platform/ios/TestExpectations 2019-11-07 01:55:07 UTC (rev 252164) @@ -3471,3 +3471,14 @@ # This test fails in iOS due to subpixel differences for the marker position imported/w3c/web-platform-tests/css/css-lists/list-style-type-string-002.html [ ImageOnlyFailure ] + +# webkit.org/b/203908 Mark these tests as flaky while Justin Fan fixes them +webgl/1.0.3/conformance/extensions/get-extension.html [ Failure Pass ] +webgl/1.0.3/conformance/extensions/oes-texture-float.html [ Failure Pass ] +webgl/1.0.3/conformance/extensions/webgl-compressed-texture-size-limit.html [ Failure Pass ] +webgl/1.0.3/conformance/extensions/webgl-draw-buffers.html [ Failure Pass ] +webgl/1.0.3/conformance/more/functions/readPixelsBadArgs.html [ Failure Pass ] +webgl/1.0.3/conformance/more/functions/texImage2DHTML.html [ Failure Pass ] +webgl/1.0.3/conformance/more/functions/texSubImage2DHTML.html [ Failure Pass ] +webgl/1.0.3/conformance/renderbuffers/framebuffer-object-attachment.html [ Failure Pass ] +webgl/1.0.3/conformance/textures/copy-tex-image-2d-formats.html [ Failure Pass ] \ No newline at end of file ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [252190] trunk/Tools
Title: [252190] trunk/Tools
Revision 252190
Author aakash_j...@apple.com
Date 2019-11-07 10:30:55 -0800 (Thu, 07 Nov 2019)
Log Message
[ews] rename RunJavaScriptCoreTestsToT to RunJSCTestsWithoutPatch
https://bugs.webkit.org/show_bug.cgi?id=203959
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/ews-build/steps.py:
(RunJSCTestsWithoutPatch): Renamed.
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (252189 => 252190)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-07 18:03:15 UTC (rev 252189)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-07 18:30:55 UTC (rev 252190)
@@ -967,12 +967,12 @@
self.build.buildFinished([message], SUCCESS)
else:
self.setProperty('patchFailedTests', True)
-self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(), CompileJSCToT(), RunJavaScriptCoreTestsToT()])
+self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(), CompileJSCToT(), RunJSCTestsWithoutPatch()])
return rc
-class RunJavaScriptCoreTestsToT(RunJavaScriptCoreTests):
-name = 'jscore-test-tot'
+class RunJSCTestsWithoutPatch(RunJavaScriptCoreTests):
+name = 'jscore-test-without-patch'
jsonFileName = 'jsc_results.json'
def evaluateCommand(self, cmd):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (252189 => 252190)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-11-07 18:03:15 UTC (rev 252189)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-11-07 18:30:55 UTC (rev 252190)
@@ -39,7 +39,7 @@
CompileJSC, CompileJSCToT, CompileWebKit, CompileWebKitToT, ConfigureBuild,
DownloadBuiltProduct, DownloadBuiltProductFromMaster, ExtractBuiltProduct, ExtractTestResults, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
PrintConfiguration, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch,
- RunBindingsTests, RunBuildWebKitOrgUnitTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunJavaScriptCoreTests, RunJavaScriptCoreTestsToT, RunWebKit1Tests,
+ RunBindingsTests, RunBuildWebKitOrgUnitTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunJavaScriptCoreTests, RunJSCTestsWithoutPatch, RunWebKit1Tests,
RunWebKitPerlTests, RunWebKitPyTests, RunWebKitTests, RunWebKitTestsWithoutPatch, TestWithFailureCount, Trigger, TransferToS3, UnApplyPatchIfRequired,
UpdateWorkingDirectory, UploadBuiltProduct, UploadTestResults, ValidatePatch)
@@ -1085,7 +1085,7 @@
return self.runStep()
-class TestRunJavaScriptCoreTestsToT(BuildStepMixinAdditions, unittest.TestCase):
+class TestRunJSCTestsWithoutPatch(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
self.jsonFileName = 'jsc_results.json'
@@ -1095,7 +1095,7 @@
return self.tearDownBuildStep()
def test_success(self):
-self.setupStep(RunJavaScriptCoreTestsToT())
+self.setupStep(RunJSCTestsWithoutPatch())
self.setProperty('fullPlatform', 'jsc-only')
self.setProperty('configuration', 'release')
self.expectRemoteCommands(
@@ -1110,7 +1110,7 @@
return self.runStep()
def test_failure(self):
-self.setupStep(RunJavaScriptCoreTestsToT())
+self.setupStep(RunJSCTestsWithoutPatch())
self.setProperty('fullPlatform', 'jsc-only')
self.setProperty('configuration', 'debug')
self.expectRemoteCommands(
Modified: trunk/Tools/ChangeLog (252189 => 252190)
--- trunk/Tools/ChangeLog 2019-11-07 18:03:15 UTC (rev 252189)
+++ trunk/Tools/ChangeLog 2019-11-07 18:30:55 UTC (rev 252190)
@@ -1,3 +1,14 @@
+2019-11-07 Aakash Jain
+
+[ews] rename RunJavaScriptCoreTestsToT to RunJSCTestsWithoutPatch
+https://bugs.webkit.org/show_bug.cgi?id=203959
+
+Reviewed by Alexey Proskuryakov.
+
+* BuildSlaveSupport/ews-build/steps.py:
+(RunJSCTestsWithoutPatch): Renamed.
+* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+
2019-11-07 Alex Christensen
Re-enable NSURLSession isolation after r252116
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
