[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] [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] [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] [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] [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] [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',
[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] [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",
[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] [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
[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)
---
[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] [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] [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] [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',
[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={}={}'.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,
[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] [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] [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] [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] [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] [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] [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] [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] [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] [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] [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] [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] [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] [286910] trunk
Title: [286910] trunk Revision 286910 Author aakash_j...@apple.com Date 2021-12-11 06:37:43 -0800 (Sat, 11 Dec 2021) Log Message Update my github username. Unreviewed. * metadata/contributors.json: Modified Paths trunk/ChangeLog trunk/metadata/contributors.json Diff Modified: trunk/ChangeLog (286909 => 286910) --- trunk/ChangeLog 2021-12-11 13:36:37 UTC (rev 286909) +++ trunk/ChangeLog 2021-12-11 14:37:43 UTC (rev 286910) @@ -1,3 +1,11 @@ +2021-12-11 Aakash Jain + +Update my github username. + +Unreviewed. + +* metadata/contributors.json: + 2021-12-10 Mikhail R. Gadelha Mark myself (Mikhail R. Gadelha) as committer Modified: trunk/metadata/contributors.json (286909 => 286910) --- trunk/metadata/contributors.json 2021-12-11 13:36:37 UTC (rev 286909) +++ trunk/metadata/contributors.json 2021-12-11 14:37:43 UTC (rev 286910) @@ -4,7 +4,7 @@ "aakash_j...@apple.com", "aj...@cornell.edu" ], - "github" : "aakashja", + "github" : "jain-aakash", "name" : "Aakash Jain", "nicks" : [ "aakash_jain" @@ -7073,4 +7073,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] [285103] trunk/Tools
Title: [285103] trunk/Tools
Revision 285103
Author aakash_j...@apple.com
Date 2021-11-01 07:11:59 -0700 (Mon, 01 Nov 2021)
Log Message
Fix a typo in EWS emails
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (285102 => 285103)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-11-01 13:17:55 UTC (rev 285102)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-11-01 14:11:59 UTC (rev 285103)
@@ -1775,7 +1775,7 @@
if logs:
logs = logs.replace('&', '').replace('<', '').replace('>', '')
email_text += '\n\nError lines:\n\n{}'.format(logs)
-email_text += '\n\nTo unsubscrible from these notifications or to provide any feedback please email aakash_j...@apple.com'
+email_text += '\n\nTo unsubscribe from these notifications or to provide any feedback please email aakash_j...@apple.com'
self._addToLog('stdio', 'Sending email notification to {}'.format(patch_author))
send_email_to_patch_author(patch_author, email_subject, email_text, patch_id)
except Exception as e:
@@ -2622,7 +2622,7 @@
email_text += ' for .'.format(Bugzilla.bug_url(bug_id), bug_id)
email_text += '\n\nFull details are available at: {}\n\nPatch author: {}'.format(build_url, patch_author)
email_text += '\n\nLayout test failure{}:\n{}'.format(pluralSuffix, test_names_string)
-email_text += '\n\nTo unsubscrible from these notifications or to provide any feedback please email aakash_j...@apple.com'
+email_text += '\n\nTo unsubscribe from these notifications or to provide any feedback please email aakash_j...@apple.com'
self._addToLog('stdio', 'Sending email notification to {}'.format(patch_author))
send_email_to_patch_author(patch_author, email_subject, email_text, patch_id)
except Exception as e:
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (285102 => 285103)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-11-01 13:17:55 UTC (rev 285102)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-11-01 14:11:59 UTC (rev 285103)
@@ -4266,7 +4266,7 @@
def test_load_contributors_from_disk(self):
ValidateCommiterAndReviewer._addToLog = lambda cls, logtype, log: sys.stdout.write(log)
contributors = filter(lambda element: element.get('name') == 'Aakash Jain', ValidateCommiterAndReviewer().load_contributors_from_disk())
-self.assertEqual(list(contributors)[0]['emails'], ['aakash_j...@apple.com'])
+self.assertEqual(list(contributors)[0]['emails'][0], 'aakash_j...@apple.com')
class TestCheckPatchStatusOnEWSQueues(BuildStepMixinAdditions, unittest.TestCase):
Modified: trunk/Tools/ChangeLog (285102 => 285103)
--- trunk/Tools/ChangeLog 2021-11-01 13:17:55 UTC (rev 285102)
+++ trunk/Tools/ChangeLog 2021-11-01 14:11:59 UTC (rev 285103)
@@ -1,3 +1,14 @@
+2021-11-01 Aakash Jain
+
+Fix a typo in EWS emails
+
+Unreviewed minor fix.
+
+* CISupport/ews-build/steps.py:
+(AnalyzeCompileWebKitResults.send_email_for_new_build_failure):
+(AnalyzeLayoutTestsResults.send_email_for_new_test_failures):
+* CISupport/ews-build/steps_unittest.py: Unit-test fix after 243670@main.
+
2021-10-30 Wenson Hsieh
Layer tree should not be stuck in frozen state after explicitly stopping a page load
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [285026] trunk
Title: [285026] trunk
Revision 285026
Author aakash_j...@apple.com
Date 2021-10-29 06:04:17 -0700 (Fri, 29 Oct 2021)
Log Message
Add Aakash's GitHub username to contributors.json
Modified Paths
trunk/ChangeLog
trunk/metadata/contributors.json
Diff
Modified: trunk/ChangeLog (285025 => 285026)
--- trunk/ChangeLog 2021-10-29 12:05:24 UTC (rev 285025)
+++ trunk/ChangeLog 2021-10-29 13:04:17 UTC (rev 285026)
@@ -1,5 +1,13 @@
2021-10-29 Oriol Brufau
+Add Aakash's GitHub username to contributors.json
+
+Unreviewed.
+
+* metadata/contributors.json:
+
+2021-10-29 Oriol Brufau
+
Add obrufau's GitHub username to contributors.json
Unreviewed.
Modified: trunk/metadata/contributors.json (285025 => 285026)
--- trunk/metadata/contributors.json 2021-10-29 12:05:24 UTC (rev 285025)
+++ trunk/metadata/contributors.json 2021-10-29 13:04:17 UTC (rev 285026)
@@ -1,8 +1,10 @@
[
{
"emails" : [
- "aakash_j...@apple.com"
+ "aakash_j...@apple.com",
+ "aj...@cornell.edu"
],
+ "github" : "aakashja",
"name" : "Aakash Jain",
"nicks" : [
"aakash_jain"
@@ -7019,4 +7021,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] [284783] trunk/Tools
Title: [284783] trunk/Tools
Revision 284783
Author aakash_j...@apple.com
Date 2021-10-25 07:36:41 -0700 (Mon, 25 Oct 2021)
Log Message
Add support for fast-cq mode to webkit-patch land-safely command
https://bugs.webkit.org/show_bug.cgi?id=232196
Reviewed by Jonathan Bedard.
* Scripts/webkitpy/tool/steps/postdiffforcommit.py:
(PostDiffForCommit):
(PostDiffForCommit.run):
* Scripts/webkitpy/tool/commands/upload_unittest.py: Added unit-test.
(test_land_safely_with_fast_cq):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py
trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforcommit.py
Diff
Modified: trunk/Tools/ChangeLog (284782 => 284783)
--- trunk/Tools/ChangeLog 2021-10-25 14:35:58 UTC (rev 284782)
+++ trunk/Tools/ChangeLog 2021-10-25 14:36:41 UTC (rev 284783)
@@ -1,3 +1,16 @@
+2021-10-25 Aakash Jain
+
+Add support for fast-cq mode to webkit-patch land-safely command
+https://bugs.webkit.org/show_bug.cgi?id=232196
+
+Reviewed by Jonathan Bedard.
+
+* Scripts/webkitpy/tool/steps/postdiffforcommit.py:
+(PostDiffForCommit):
+(PostDiffForCommit.run):
+* Scripts/webkitpy/tool/commands/upload_unittest.py: Added unit-test.
+(test_land_safely_with_fast_cq):
+
2021-10-25 Sam Sneddon
[Python] rename assertEquals/assertNotEquals
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py (284782 => 284783)
--- trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py 2021-10-25 14:35:58 UTC (rev 284782)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py 2021-10-25 14:36:41 UTC (rev 284783)
@@ -58,12 +58,23 @@
self.assert_execute_outputs(Post(), [5], options=options, expected_logs=expected_logs)
def test_land_safely(self):
+options = MockOptions()
+options.fast_cq = False
expected_logs = """Obsoleting 2 old patches on bug 5
MOCK reassign_bug: bug_id=5, assignee=None
MOCK add_patch_to_bug: bug_id=5, description=Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True
"""
-self.assert_execute_outputs(LandSafely(), [5], expected_logs=expected_logs)
+self.assert_execute_outputs(LandSafely(), [5], options=options, expected_logs=expected_logs)
+def test_land_safely_with_fast_cq(self):
+options = MockOptions()
+options.fast_cq = True
+expected_logs = """Obsoleting 2 old patches on bug 5
+MOCK reassign_bug: bug_id=5, assignee=None
+MOCK add_patch_to_bug: bug_id=5, description=[fast-cq] Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True
+"""
+self.assert_execute_outputs(LandSafely(), [5], options=options, expected_logs=expected_logs)
+
def test_prepare_diff_with_arg(self):
options = MockOptions()
options.sort_xcode_project = False
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforcommit.py (284782 => 284783)
--- trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforcommit.py 2021-10-25 14:35:58 UTC (rev 284782)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforcommit.py 2021-10-25 14:36:41 UTC (rev 284783)
@@ -1,4 +1,5 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
+# Copyright (C) 2021 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
@@ -26,14 +27,26 @@
# (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 webkitpy.common.net.bugzilla import Attachment
from webkitpy.tool.steps.abstractstep import AbstractStep
+from webkitpy.tool.steps.options import Options
class PostDiffForCommit(AbstractStep):
+@classmethod
+def options(cls):
+return AbstractStep.options() + [
+Options.fast_cq,
+]
+
def run(self, state):
+description = 'Patch for landing'
+if self._options.fast_cq:
+description = '{}{}'.format(Attachment.fast_cq_preamble, description)
+
self._tool.bugs.add_patch_to_bug(
-state["bug_id"],
-self.cached_lookup(state, "diff"),
-"Patch for landing",
+state['bug_id'],
+self.cached_lookup(state, 'diff'),
+description,
mark_for_review=False,
mark_for_landing=True)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [284262] trunk/Tools
Title: [284262] trunk/Tools
Revision 284262
Author aakash_j...@apple.com
Date 2021-10-15 12:13:29 -0700 (Fri, 15 Oct 2021)
Log Message
Make submit to ews error messages readable
https://bugs.webkit.org/show_bug.cgi?id=231824
Reviewed by Ryan Haddad.
* 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 (284261 => 284262)
--- trunk/Tools/CISupport/ews-app/ews/views/submittoews.py 2021-10-15 19:12:06 UTC (rev 284261)
+++ trunk/Tools/CISupport/ews-app/ews/views/submittoews.py 2021-10-15 19:13:29 UTC (rev 284262)
@@ -58,11 +58,11 @@
rc = BugzillaPatchFetcher().fetch([patch_id])
if rc == ERR_UNABLE_TO_FETCH_PATCH:
-return HttpResponse('EWS is unable to access patch {}. Please ensure that this patch is publicly accessible or has r? set.'.format(patch_id))
+return HttpResponse('Set r? on patch, EWS is currently unable to access patch {}.'.format(patch_id))
if rc == ERR_OBSOLETE_PATCH:
-return HttpResponse('Patch {} is obsolete, not submitting to EWS.'.format(patch_id))
+return HttpResponse('Obsolete Patch: {}, not submitting to EWS.'.format(patch_id))
if rc == ERR_BUG_CLOSED:
-return HttpResponse('Bug for patch {} is closed, not submitting to EWS.'.format(patch_id))
+return HttpResponse('Closed Bug for patch: {}, not submitting to EWS.'.format(patch_id))
if request.POST.get('next_action') == 'return_to_bubbles':
return redirect('/status-bubble/{}'.format(patch_id))
Modified: trunk/Tools/ChangeLog (284261 => 284262)
--- trunk/Tools/ChangeLog 2021-10-15 19:12:06 UTC (rev 284261)
+++ trunk/Tools/ChangeLog 2021-10-15 19:13:29 UTC (rev 284262)
@@ -1,3 +1,13 @@
+2021-10-15 Aakash Jain
+
+Make submit to ews error messages readable
+https://bugs.webkit.org/show_bug.cgi?id=231824
+
+Reviewed by Ryan Haddad.
+
+* CISupport/ews-app/ews/views/submittoews.py:
+(SubmitToEWS.post):
+
2021-10-15 Wenson Hsieh
REGRESSION (r284079): [Debug] IPCTestingAPI.CanReceiveSharedMemory is timing out
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [284164] trunk/Tools
Title: [284164] trunk/Tools
Revision 284164
Author aakash_j...@apple.com
Date 2021-10-14 09:03:39 -0700 (Thu, 14 Oct 2021)
Log Message
Disable django admin url on ews.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=231739
Reviewed by Jonathan Bedard.
* CISupport/ews-app/ews-app/urls.py:
Modified Paths
trunk/Tools/CISupport/ews-app/ews-app/urls.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-app/ews-app/urls.py (284163 => 284164)
--- trunk/Tools/CISupport/ews-app/ews-app/urls.py 2021-10-14 15:10:18 UTC (rev 284163)
+++ trunk/Tools/CISupport/ews-app/ews-app/urls.py 2021-10-14 16:03:39 UTC (rev 284164)
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Apple Inc. All rights reserved.
+# Copyright (C) 2018-2021 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -36,9 +36,7 @@
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
from django.conf.urls import include, url
-from django.contrib import admin
urlpatterns = [
-url(r'^admin/', admin.site.urls),
url(r'^', include('ews.urls')),
]
Modified: trunk/Tools/ChangeLog (284163 => 284164)
--- trunk/Tools/ChangeLog 2021-10-14 15:10:18 UTC (rev 284163)
+++ trunk/Tools/ChangeLog 2021-10-14 16:03:39 UTC (rev 284164)
@@ -1,3 +1,12 @@
+2021-10-14 Aakash Jain
+
+Disable django admin url on ews.webkit.org
+https://bugs.webkit.org/show_bug.cgi?id=231739
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-app/ews-app/urls.py:
+
2021-10-14 Carlos Garcia Campos
[GTK][WPE] Move getCurrentExecutablePath() and getCurrentExecutableName() to FileSystem
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [283495] trunk/Tools
Title: [283495] trunk/Tools
Revision 283495
Author aakash_j...@apple.com
Date 2021-10-04 07:26:18 -0700 (Mon, 04 Oct 2021)
Log Message
Send EWS exception emails to bot watchers instead of Aakash
Unreviewed.
* CISupport/ews-build/master.cfg:
Modified Paths
trunk/Tools/CISupport/ews-build/master.cfg
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/master.cfg (283494 => 283495)
--- trunk/Tools/CISupport/ews-build/master.cfg 2021-10-04 13:57:48 UTC (rev 283494)
+++ trunk/Tools/CISupport/ews-build/master.cfg 2021-10-04 14:26:18 UTC (rev 283495)
@@ -74,7 +74,7 @@
mail_notifier = reporters.MailNotifier(
fromaddr='ews-bu...@webkit.org',
sendToInterestedUsers=False,
-extraRecipients=['aakash_j...@webkit.org'],
+extraRecipients=['webkit-ews-bot-watch...@group.apple.com'],
mode=('exception'),
addPatch=False)
Modified: trunk/Tools/ChangeLog (283494 => 283495)
--- trunk/Tools/ChangeLog 2021-10-04 13:57:48 UTC (rev 283494)
+++ trunk/Tools/ChangeLog 2021-10-04 14:26:18 UTC (rev 283495)
@@ -1,3 +1,11 @@
+2021-10-04 Aakash Jain
+
+Send EWS exception emails to bot watchers instead of Aakash
+
+Unreviewed.
+
+* CISupport/ews-build/master.cfg:
+
2021-10-03 David Kilzer
WTF::RetainPtr<> allows assignment of two pointer types that are not assignable
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [283061] trunk/Tools
Title: [283061] trunk/Tools
Revision 283061
Author aakash_j...@apple.com
Date 2021-09-24 15:11:41 -0700 (Fri, 24 Sep 2021)
Log Message
Gracefully handle security bugs in apply-watchlist
https://bugs.webkit.org/show_bug.cgi?id=229961
Reviewed by Jonathan Bedard.
* Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
(Bugzilla._parse_bug_dictionary_from_xml):
(Bugzilla.fetch_bug):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
Diff
Modified: trunk/Tools/ChangeLog (283060 => 283061)
--- trunk/Tools/ChangeLog 2021-09-24 21:57:27 UTC (rev 283060)
+++ trunk/Tools/ChangeLog 2021-09-24 22:11:41 UTC (rev 283061)
@@ -1,3 +1,14 @@
+2021-09-24 Aakash Jain
+
+Gracefully handle security bugs in apply-watchlist
+https://bugs.webkit.org/show_bug.cgi?id=229961
+
+Reviewed by Jonathan Bedard.
+
+* Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
+(Bugzilla._parse_bug_dictionary_from_xml):
+(Bugzilla.fetch_bug):
+
2021-09-24 Sam Sneddon
LayoutTestFinder should return tests in order
Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py (283060 => 283061)
--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2021-09-24 21:57:27 UTC (rev 283060)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2021-09-24 22:11:41 UTC (rev 283061)
@@ -457,6 +457,10 @@
def _parse_bug_dictionary_from_xml(self, page):
soup = BeautifulStoneSoup(page, convertEntities=BeautifulStoneSoup.XML_ENTITIES)
+bug_element = soup.find('bug')
+if bug_element and bug_element.get('error', '') == 'NotPermitted':
+_log.warning("You don't have permission to view this bug.")
+return {}
bug = {}
bug["id"] = int(soup.find("bug_id").string)
bug["title"] = self._string_contents(soup.find("short_desc"))
@@ -490,7 +494,10 @@
# FIXME: A BugzillaCache object should provide all these fetch_ methods.
def fetch_bug(self, bug_id):
-return Bug(self.fetch_bug_dictionary(bug_id), self)
+bug_dictionary = self.fetch_bug_dictionary(bug_id)
+if bug_dictionary:
+return Bug(bug_dictionary, self)
+return None
def fetch_attachment_contents(self, attachment_id):
attachment_url = self.attachment_url_for_id(attachment_id)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [282325] trunk/Tools
Title: [282325] trunk/Tools
Revision 282325
Author aakash_j...@apple.com
Date 2021-09-13 07:40:01 -0700 (Mon, 13 Sep 2021)
Log Message
Reduce EWS email notifications to Aakash
Unreviewed. Do not email to Aakash anymore for every build/test failure. It was added initially so that I
can debug any issue in these email notifications. But these have been stable and I don't need a copy of every
EWS email.
* CISupport/ews-build/send_email.py:
(send_email_to_patch_author):
Modified Paths
trunk/Tools/CISupport/ews-build/send_email.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/send_email.py (282324 => 282325)
--- trunk/Tools/CISupport/ews-build/send_email.py 2021-09-13 09:56:57 UTC (rev 282324)
+++ trunk/Tools/CISupport/ews-build/send_email.py 2021-09-13 14:40:01 UTC (rev 282325)
@@ -78,7 +78,6 @@
def send_email_to_patch_author(author_email, subject, text, reference=''):
if not author_email:
return
-send_email(['aakash_j...@apple.com'], subject, text, reference)
if author_email in get_email_ids('EMAIL_IDS_TO_UNSUBSCRIBE'):
print('email {} is in unsubscribe list, skipping email'.format(author_email))
return
Modified: trunk/Tools/ChangeLog (282324 => 282325)
--- trunk/Tools/ChangeLog 2021-09-13 09:56:57 UTC (rev 282324)
+++ trunk/Tools/ChangeLog 2021-09-13 14:40:01 UTC (rev 282325)
@@ -1,3 +1,14 @@
+2021-09-13 Aakash Jain
+
+Reduce EWS email notifications to Aakash
+
+Unreviewed. Do not email to Aakash anymore for every build/test failure. It was added initially so that I
+can debug any issue in these email notifications. But these have been stable and I don't need a copy of every
+EWS email.
+
+* CISupport/ews-build/send_email.py:
+(send_email_to_patch_author):
+
2021-09-13 Philippe Normand
Unreviewed, AutoInstall hotfix for Linux platforms
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [282288] trunk/Tools
Title: [282288] trunk/Tools
Revision 282288
Author aakash_j...@apple.com
Date 2021-09-10 12:48:31 -0700 (Fri, 10 Sep 2021)
Log Message
[build.webkit.org] Remove ./ from command invocations
https://bugs.webkit.org/show_bug.cgi?id=230165
Reviewed by Ryan Haddad.
* CISupport/build-webkit-org/steps.py: Removed ./ from command invocations to be consistent with EWS configuration.
* CISupport/build-webkit-org/steps_unittest.py: Updatd unit-tests.
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (282287 => 282288)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-09-10 19:23:36 UTC (rev 282287)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-09-10 19:48:31 UTC (rev 282288)
@@ -164,7 +164,7 @@
class InstallWin32Dependencies(shell.Compile):
description = ["installing dependencies"]
descriptionDone = ["installed dependencies"]
-command = ["perl", "./Tools/Scripts/update-webkit-auxiliary-libs"]
+command = ["perl", "Tools/Scripts/update-webkit-auxiliary-libs"]
class KillOldProcesses(shell.Compile):
@@ -171,7 +171,7 @@
name = "kill-old-processes"
description = ["killing old processes"]
descriptionDone = ["killed old processes"]
-command = ["python3", "./Tools/CISupport/kill-old-processes", "buildbot"]
+command = ["python3", "Tools/CISupport/kill-old-processes", "buildbot"]
class TriggerCrashLogSubmission(shell.Compile):
@@ -226,7 +226,7 @@
name = "jhbuild"
description = ["updating gtk dependencies"]
descriptionDone = ["updated gtk dependencies"]
-command = ["perl", "./Tools/Scripts/update-webkitgtk-libs", WithProperties("--%(configuration)s")]
+command = ["perl", "Tools/Scripts/update-webkitgtk-libs", WithProperties("--%(configuration)s")]
haltOnFailure = True
@@ -234,7 +234,7 @@
name = "jhbuild"
description = ["updating wpe dependencies"]
descriptionDone = ["updated wpe dependencies"]
-command = ["perl", "./Tools/Scripts/update-webkitwpe-libs", WithProperties("--%(configuration)s")]
+command = ["perl", "Tools/Scripts/update-webkitwpe-libs", WithProperties("--%(configuration)s")]
haltOnFailure = True
@@ -261,7 +261,7 @@
class CompileWebKit(shell.Compile):
-command = ["perl", "./Tools/Scripts/build-webkit", WithProperties("--%(configuration)s")]
+command = ["perl", "Tools/Scripts/build-webkit", WithProperties("--%(configuration)s")]
env = {'MFLAGS': ''}
name = "compile-webkit"
description = ["compiling"]
@@ -312,15 +312,15 @@
class CompileLLINTCLoop(CompileWebKit):
-command = ["perl", "./Tools/Scripts/build-jsc", "--cloop", WithProperties("--%(configuration)s")]
+command = ["perl", "Tools/Scripts/build-jsc", "--cloop", WithProperties("--%(configuration)s")]
class Compile32bitJSC(CompileWebKit):
-command = ["perl", "./Tools/Scripts/build-jsc", "--32-bit", WithProperties("--%(configuration)s")]
+command = ["perl", "Tools/Scripts/build-jsc", "--32-bit", WithProperties("--%(configuration)s")]
class CompileJSCOnly(CompileWebKit):
-command = ["perl", "./Tools/Scripts/build-jsc", WithProperties("--%(configuration)s")]
+command = ["perl", "Tools/Scripts/build-jsc", WithProperties("--%(configuration)s")]
class InstallBuiltProduct(shell.ShellCommand):
@@ -346,7 +346,7 @@
class GenerateJSCBundle(shell.ShellCommand):
-command = ["./Tools/Scripts/generate-bundle", "--builder-name", WithProperties("%(buildername)s"),
+command = ["Tools/Scripts/generate-bundle", "--builder-name", WithProperties("%(buildername)s"),
"--bundle=jsc", "--syslibs=bundle-all", WithProperties("--platform=%(fullPlatform)s"),
WithProperties("--%(configuration)s"), WithProperties("--revision=%(got_revision)s"),
"--remote-config-file", "../../remote-jsc-bundle-upload-config.json"]
@@ -357,7 +357,7 @@
class GenerateMiniBrowserBundle(shell.ShellCommand):
-command = ["./Tools/Scripts/generate-bundle", "--builder-name", WithProperties("%(buildername)s"),
+command = ["Tools/Scripts/generate-bundle", "--builder-name", WithProperties("%(buildername)s"),
"--bundle=MiniBrowser", WithProperties("--platform=%(fullPlatform)s"),
WithProperties("--%(configuration)s"), WithProperties("--revision=%(got_revision)s"),
"--remote-config-file", "../../remote-minibrowser-bundle-upload-config.json"]
@@ -395,7 +395,7 @@
class DownloadBuiltProduct(shell.ShellCommand):
-command = ["python3", "./Tools/CISupport/download-built-product",
+command = ["python3", "Tools/CISupport/download-built-product",
WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"),
WithProperties(S3URL +
[webkit-changes] [282216] trunk/Tools
Title: [282216] trunk/Tools Revision 282216 Author aakash_j...@apple.com Date 2021-09-09 08:57:27 -0700 (Thu, 09 Sep 2021) Log Message Run check-github-mirror-integrity more frequently https://bugs.webkit.org/show_bug.cgi?id=230095 Reviewed by Jonathan Bedard. * CISupport/ews-build/factories.py: (WatchListFactory.__init__): Run check-github-mirror-integrity on watchlist ews. * CISupport/ews-build/factories_unittest.py: (TestExpectedBuildSteps): Updated unit-test. Modified Paths trunk/Tools/CISupport/ews-build/factories.py trunk/Tools/CISupport/ews-build/factories_unittest.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/CISupport/ews-build/factories.py (282215 => 282216) --- trunk/Tools/CISupport/ews-build/factories.py 2021-09-09 15:53:49 UTC (rev 282215) +++ trunk/Tools/CISupport/ews-build/factories.py 2021-09-09 15:57:27 UTC (rev 282216) @@ -84,6 +84,7 @@ self.addStep(UpdateWorkingDirectory()) self.addStep(ApplyPatch()) self.addStep(ApplyWatchList()) +self.addStep(VerifyGitHubIntegrity()) class BindingsFactory(Factory): Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (282215 => 282216) --- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-09-09 15:53:49 UTC (rev 282215) +++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-09-09 15:57:27 UTC (rev 282216) @@ -49,7 +49,8 @@ 'show-identifier', 'update-working-directory', 'apply-patch', -'apply-watch-list' +'apply-watch-list', +'verify-github-integrity' ], 'GTK-Build-EWS': [ 'configure-build', Modified: trunk/Tools/ChangeLog (282215 => 282216) --- trunk/Tools/ChangeLog 2021-09-09 15:53:49 UTC (rev 282215) +++ trunk/Tools/ChangeLog 2021-09-09 15:57:27 UTC (rev 282216) @@ -1,5 +1,17 @@ 2021-09-09 Aakash Jain +Run check-github-mirror-integrity more frequently +https://bugs.webkit.org/show_bug.cgi?id=230095 + +Reviewed by Jonathan Bedard. + +* CISupport/ews-build/factories.py: +(WatchListFactory.__init__): Run check-github-mirror-integrity on watchlist ews. +* CISupport/ews-build/factories_unittest.py: +(TestExpectedBuildSteps): Updated unit-test. + +2021-09-09 Aakash Jain + [ews] Share more bots between EWS queues https://bugs.webkit.org/show_bug.cgi?id=230094 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [282213] trunk/Tools
Title: [282213] trunk/Tools
Revision 282213
Author aakash_j...@apple.com
Date 2021-09-09 08:32:16 -0700 (Thu, 09 Sep 2021)
Log Message
[ews] Share more bots between EWS queues
https://bugs.webkit.org/show_bug.cgi?id=230094
Reviewed by Jonathan Bedard.
* CISupport/ews-build/config.json:
Modified Paths
trunk/Tools/CISupport/ews-build/config.json
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/config.json (282212 => 282213)
--- trunk/Tools/CISupport/ews-build/config.json 2021-09-09 15:30:01 UTC (rev 282212)
+++ trunk/Tools/CISupport/ews-build/config.json 2021-09-09 15:32:16 UTC (rev 282213)
@@ -31,7 +31,7 @@
{ "name": "ews105", "platform": "mac-catalina" },
{ "name": "ews106", "platform": "mac-catalina" },
{ "name": "ews107", "platform": "mac-catalina" },
-{ "name": "ews108", "platform": "ios-14" },
+{ "name": "ews108", "platform": "*" },
{ "name": "ews109", "platform": "*" },
{ "name": "ews112", "platform": "mac-catalina" },
{ "name": "ews113", "platform": "mac-catalina" },
@@ -128,7 +128,7 @@
"factory": "iOSBuildFactory", "platform": "ios-simulator-14",
"configuration": "release", "architectures": ["x86_64"],
"triggers": ["api-tests-ios-sim-ews", "ios-14-sim-wk2-tests-ews"],
- "workernames": ["ews152", "ews154", "ews156", "ews157", "ews109"]
+ "workernames": ["ews152", "ews154", "ews156", "ews157", "ews108", "ews109"]
},
{
"name": "iOS-14-Simulator-WK2-Tests-EWS", "shortname": "ios-wk2", "icon": "testOnly",
@@ -149,7 +149,7 @@
"factory": "macOSWK2Factory", "platform": "mac-bigsur",
"configuration": "debug", "architectures": ["arm64"],
"triggered_by": ["macos-applesilicon-big-sur-debug-build-ews"],
- "workernames": ["ews173", "ews174", "ews175", "ews176", "ews177", "ews178", "ews179", "ews180"]
+ "workernames": ["ews172", "ews173", "ews174", "ews175", "ews176", "ews177", "ews178", "ews179", "ews180"]
},
{
"name": "macOS-Catalina-Release-Build-EWS", "shortname": "mac", "icon": "buildOnly",
Modified: trunk/Tools/ChangeLog (282212 => 282213)
--- trunk/Tools/ChangeLog 2021-09-09 15:30:01 UTC (rev 282212)
+++ trunk/Tools/ChangeLog 2021-09-09 15:32:16 UTC (rev 282213)
@@ -1,3 +1,12 @@
+2021-09-09 Aakash Jain
+
+[ews] Share more bots between EWS queues
+https://bugs.webkit.org/show_bug.cgi?id=230094
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/config.json:
+
2021-09-08 Jonathan Bedard
Exception in run-webkit-tests: Bad file descriptor (Part 2)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [282079] trunk/Tools
Title: [282079] trunk/Tools
Revision 282079
Author aakash_j...@apple.com
Date 2021-09-07 04:40:56 -0700 (Tue, 07 Sep 2021)
Log Message
TestWebKitAPI.EventAttribution.Basic is extremely flaky on api-ios
https://bugs.webkit.org/show_bug.cgi?id=229995
Disabling the test for now.
Unreviewed test gardening.
* TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
(TestWebKitAPI::TEST):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm
Diff
Modified: trunk/Tools/ChangeLog (282078 => 282079)
--- trunk/Tools/ChangeLog 2021-09-07 11:11:18 UTC (rev 282078)
+++ trunk/Tools/ChangeLog 2021-09-07 11:40:56 UTC (rev 282079)
@@ -1,3 +1,15 @@
+2021-09-07 Aakash Jain
+
+TestWebKitAPI.EventAttribution.Basic is extremely flaky on api-ios
+https://bugs.webkit.org/show_bug.cgi?id=229995
+
+Disabling the test for now.
+
+Unreviewed test gardening.
+
+* TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
+(TestWebKitAPI::TEST):
+
2021-09-07 Commit Queue
Unreviewed, reverting r282064.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm (282078 => 282079)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-09-07 11:11:18 UTC (rev 282078)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm 2021-09-07 11:40:56 UTC (rev 282079)
@@ -282,7 +282,7 @@
}
#endif
-TEST(EventAttribution, Basic)
+TEST(EventAttribution, DISABLED_Basic)
{
runBasicEventAttributionTest(nil, [](WKWebView *webView, const HTTPServer& server) {
[webView _addEventAttributionWithSourceID:42 destinationURL:exampleURL() sourceDescription:@"test source description" purchaser:@"test purchaser" reportEndpoint:server.request().URL optionalNonce:nil];
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [282068] trunk/Tools
Title: [282068] trunk/Tools
Revision 282068
Author aakash_j...@apple.com
Date 2021-09-06 17:41:11 -0700 (Mon, 06 Sep 2021)
Log Message
[ews] Invoke transfer-archive-to-s3 with Python 3
https://bugs.webkit.org/show_bug.cgi?id=229972
Reviewed by Alexey Proskuryakov.
* CISupport/ews-build/steps.py:
(TransferToS3): Invoke with python 3.
* CISupport/ews-build/steps_unittest.py: Updated unit-tests.
* CISupport/Shared/transfer-archive-to-s3: Changed shebang to python 3.
Modified Paths
trunk/Tools/CISupport/Shared/transfer-archive-to-s3
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/Shared/transfer-archive-to-s3 (282067 => 282068)
--- trunk/Tools/CISupport/Shared/transfer-archive-to-s3 2021-09-07 00:16:52 UTC (rev 282067)
+++ trunk/Tools/CISupport/Shared/transfer-archive-to-s3 2021-09-07 00:41:11 UTC (rev 282068)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import argparse
import boto3
import os
Modified: trunk/Tools/CISupport/ews-build/steps.py (282067 => 282068)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-09-07 00:16:52 UTC (rev 282067)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-09-07 00:41:11 UTC (rev 282068)
@@ -2748,7 +2748,7 @@
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]
+command = ['python3', '../Shared/transfer-archive-to-s3', '--patch_id', patch_id, '--identifier', identifier, '--archive', archive]
haltOnFailure = False
flunkOnFailure = False
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (282067 => 282068)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-07 00:16:52 UTC (rev 282067)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-07 00:41:11 UTC (rev 282068)
@@ -3196,7 +3196,7 @@
self.setProperty('architecture', 'x86_64')
self.setProperty('patch_id', '1234')
self.expectLocalCommands(
-ExpectMasterShellCommand(command=['python',
+ExpectMasterShellCommand(command=['python3',
'../Shared/transfer-archive-to-s3',
'--patch_id', '1234',
'--identifier', 'mac-highsierra-x86_64-release',
@@ -3215,7 +3215,7 @@
self.setProperty('architecture', 'x86_64')
self.setProperty('patch_id', '1234')
self.expectLocalCommands(
-ExpectMasterShellCommand(command=['python',
+ExpectMasterShellCommand(command=['python3',
'../Shared/transfer-archive-to-s3',
'--patch_id', '1234',
'--identifier', 'ios-simulator-12-x86_64-debug',
Modified: trunk/Tools/ChangeLog (282067 => 282068)
--- trunk/Tools/ChangeLog 2021-09-07 00:16:52 UTC (rev 282067)
+++ trunk/Tools/ChangeLog 2021-09-07 00:41:11 UTC (rev 282068)
@@ -1,3 +1,15 @@
+2021-09-06 Aakash Jain
+
+[ews] Invoke transfer-archive-to-s3 with Python 3
+https://bugs.webkit.org/show_bug.cgi?id=229972
+
+Reviewed by Alexey Proskuryakov.
+
+* CISupport/ews-build/steps.py:
+(TransferToS3): Invoke with python 3.
+* CISupport/ews-build/steps_unittest.py: Updated unit-tests.
+* CISupport/Shared/transfer-archive-to-s3: Changed shebang to python 3.
+
2021-09-06 Commit Queue
Unreviewed, reverting r282025.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [282040] trunk/Tools
Title: [282040] trunk/Tools
Revision 282040
Author aakash_j...@apple.com
Date 2021-09-03 17:32:37 -0700 (Fri, 03 Sep 2021)
Log Message
[ews] Invoke validate-changelog with python 3
https://bugs.webkit.org/show_bug.cgi?id=229872
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(ValidateChangeLogAndReviewer):
* CISupport/ews-build/steps_unittest.py: Added unit-tests.
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (282039 => 282040)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-09-04 00:29:35 UTC (rev 282039)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-09-04 00:32:37 UTC (rev 282040)
@@ -1009,7 +1009,7 @@
class ValidateChangeLogAndReviewer(shell.ShellCommand):
name = 'validate-changelog-and-reviewer'
descriptionDone = ['Validated ChangeLog and Reviewer']
-command = ['python', 'Tools/Scripts/webkit-patch', 'validate-changelog', '--check-oops', '--non-interactive']
+command = ['python3', 'Tools/Scripts/webkit-patch', 'validate-changelog', '--check-oops', '--non-interactive']
haltOnFailure = False
flunkOnFailure = True
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (282039 => 282040)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-04 00:29:35 UTC (rev 282039)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-04 00:32:37 UTC (rev 282040)
@@ -55,7 +55,7 @@
RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsInStressMode, RunWebKitTestsInStressGuardmallocMode,
RunWebKitTestsWithoutPatch, TestWithFailureCount, ShowIdentifier,
Trigger, TransferToS3, UnApplyPatchIfRequired, UpdateWorkingDirectory, UploadBuiltProduct,
- UploadTestResults, ValidateCommiterAndReviewer, ValidatePatch, VerifyGitHubIntegrity)
+ UploadTestResults, ValidateChangeLogAndReviewer, ValidateCommiterAndReviewer, ValidatePatch, VerifyGitHubIntegrity)
# Workaround for https://github.com/buildbot/buildbot/issues/4669
from buildbot.test.fake.fakebuild import FakeBuild
@@ -359,6 +359,43 @@
return self.runStep()
+class TestValidateChangeLogAndReviewer(BuildStepMixinAdditions, unittest.TestCase):
+def setUp(self):
+self.longMessage = True
+return self.setUpBuildStep()
+
+def tearDown(self):
+return self.tearDownBuildStep()
+
+def test_success(self):
+self.setupStep(ValidateChangeLogAndReviewer())
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+timeout=180,
+logEnviron=False,
+command=['python3', 'Tools/Scripts/webkit-patch', 'validate-changelog', '--check-oops', '--non-interactive'])
++ 0,
+)
+self.expectOutcome(result=SUCCESS, state_string='Validated ChangeLog and Reviewer')
+return self.runStep()
+
+def test_failure(self):
+self.setupStep(ValidateChangeLogAndReviewer())
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+timeout=180,
+logEnviron=False,
+command=['python3', 'Tools/Scripts/webkit-patch', 'validate-changelog', '--check-oops', '--non-interactive'])
++ ExpectShell.log('stdio', stdout='ChangeLog entry in LayoutTests/ChangeLog contains OOPS!.')
++ 2,
+)
+self.expectOutcome(result=FAILURE, state_string='ChangeLog validation failed')
+rc = self.runStep()
+self.assertEqual(self.getProperty('bugzilla_comment_text'), 'ChangeLog entry in LayoutTests/ChangeLog contains OOPS!.\n')
+self.assertEqual(self.getProperty('build_finish_summary'), 'ChangeLog validation failed')
+return rc
+
+
class TestRunBindingsTests(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
Modified: trunk/Tools/ChangeLog (282039 => 282040)
--- trunk/Tools/ChangeLog 2021-09-04 00:29:35 UTC (rev 282039)
+++ trunk/Tools/ChangeLog 2021-09-04 00:32:37 UTC (rev 282040)
@@ -1,3 +1,14 @@
+2021-09-03 Aakash Jain
+
+[ews] Invoke validate-changelog with python 3
+https://bugs.webkit.org/show_bug.cgi?id=229872
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(ValidateChangeLogAndReviewer):
+* CISupport/ews-build/steps_unittest.py: Added unit-tests.
+
2021-09-03 Kate Cheney
Safari’s Privacy Report window is completely blank
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [281992] trunk/Tools
Title: [281992] trunk/Tools
Revision 281992
Author aakash_j...@apple.com
Date 2021-09-03 08:02:22 -0700 (Fri, 03 Sep 2021)
Log Message
[ews] Invoke apply-watchlist with Python 3
https://bugs.webkit.org/show_bug.cgi?id=229864
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(ApplyWatchList):
* CISupport/ews-build/steps_unittest.py:
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (281991 => 281992)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-09-03 14:57:41 UTC (rev 281991)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-09-03 15:02:22 UTC (rev 281992)
@@ -3250,7 +3250,7 @@
description = ['applying watchilist']
descriptionDone = ['Applied WatchList']
bug_id = WithProperties('%(bug_id)s')
-command = ['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', bug_id]
+command = ['python3', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', bug_id]
haltOnFailure = True
flunkOnFailure = True
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281991 => 281992)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-03 14:57:41 UTC (rev 281991)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-03 15:02:22 UTC (rev 281992)
@@ -337,7 +337,7 @@
ExpectShell(workdir='wkdir',
timeout=120,
logEnviron=False,
-command=['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+command=['python3', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+ ExpectShell.log('stdio', stdout='Result of watchlist: cc "" messages ""')
+ 0,
)
@@ -351,7 +351,7 @@
ExpectShell(workdir='wkdir',
timeout=120,
logEnviron=False,
-command=['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+command=['python3', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+ ExpectShell.log('stdio', stdout='Unexpected failure')
+ 2,
)
Modified: trunk/Tools/ChangeLog (281991 => 281992)
--- trunk/Tools/ChangeLog 2021-09-03 14:57:41 UTC (rev 281991)
+++ trunk/Tools/ChangeLog 2021-09-03 15:02:22 UTC (rev 281992)
@@ -1,3 +1,14 @@
+2021-09-03 Aakash Jain
+
+[ews] Invoke apply-watchlist with Python 3
+https://bugs.webkit.org/show_bug.cgi?id=229864
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(ApplyWatchList):
+* CISupport/ews-build/steps_unittest.py:
+
2021-09-03 Chris Dumez
WebKitTestRunner does not correctly close all auxiliary WebViews between tests
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [281940] trunk/Tools
Title: [281940] trunk/Tools
Revision 281940
Author aakash_j...@apple.com
Date 2021-09-02 11:35:22 -0700 (Thu, 02 Sep 2021)
Log Message
Move few scripts from python 2 to python3
https://bugs.webkit.org/show_bug.cgi?id=229817
Reviewed by Jonathan Bedard.
* Scripts/clean-webkit: Changed shebang to python3.
* CISupport/test-result-archive: Ditto.
* CISupport/ews-build/steps.py: Ditto.
* CISupport/build-webkit-org/steps.py:
(DownloadBuiltProduct): Use python 3 instead of python 2.
(ArchiveTestResults): Ditto.
* CISupport/download-built-product: Ditto.
(CleanWorkingDirectory):
(DownloadBuiltProduct):
(ArchiveTestResults):
* CISupport/ews-build/steps_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/download-built-product
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/CISupport/test-result-archive
trunk/Tools/ChangeLog
trunk/Tools/Scripts/clean-webkit
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (281939 => 281940)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-09-02 18:35:22 UTC (rev 281940)
@@ -395,7 +395,7 @@
class DownloadBuiltProduct(shell.ShellCommand):
-command = ["python", "./Tools/CISupport/download-built-product",
+command = ["python3", "./Tools/CISupport/download-built-product",
WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"),
WithProperties(S3URL + "archives.webkit.org/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(got_revision)s.zip")]
name = "download-built-product"
@@ -1091,7 +1091,7 @@
class ArchiveTestResults(shell.ShellCommand):
-command = ["python", "./Tools/CISupport/test-result-archive",
+command = ["python3", "./Tools/CISupport/test-result-archive",
WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"), "archive"]
name = "archive-test-results"
description = ["archiving test results"]
Modified: trunk/Tools/CISupport/download-built-product (281939 => 281940)
--- trunk/Tools/CISupport/download-built-product 2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/download-built-product 2021-09-02 18:35:22 UTC (rev 281940)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2009, 2020 Apple Inc. All rights reserved.
# Copyright (C) 2012 Google Inc. All rights reserved.
Modified: trunk/Tools/CISupport/ews-build/steps.py (281939 => 281940)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-09-02 18:35:22 UTC (rev 281940)
@@ -275,7 +275,7 @@
descriptionDone = ['Cleaned working directory']
flunkOnFailure = True
haltOnFailure = True
-command = ['python', 'Tools/Scripts/clean-webkit']
+command = ['python3', 'Tools/Scripts/clean-webkit']
def __init__(self, **kwargs):
super(CleanWorkingDirectory, self).__init__(logEnviron=False, **kwargs)
@@ -2782,7 +2782,7 @@
class DownloadBuiltProduct(shell.ShellCommand):
-command = ['python', 'Tools/CISupport/download-built-product',
+command = ['python3', 'Tools/CISupport/download-built-product',
WithProperties('--%(configuration)s'),
WithProperties(S3URL + 'ews-archives.webkit.org/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
name = 'download-built-product'
@@ -3073,7 +3073,7 @@
class ArchiveTestResults(shell.ShellCommand):
-command = ['python', 'Tools/CISupport/test-result-archive',
+command = ['python3', 'Tools/CISupport/test-result-archive',
Interpolate('--platform=%(prop:platform)s'), Interpolate('--%(prop:configuration)s'), 'archive']
name = 'archive-test-results'
description = ['archiving test results']
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281939 => 281940)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-02 18:33:59 UTC (rev 281939)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-09-02 18:35:22 UTC (rev 281940)
@@ -2565,7 +2565,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
-command=['python', 'Tools/Scripts/clean-webkit'],
+command=['python3', 'Tools/Scripts/clean-webkit'],
)
+ 0,
)
@@ -2577,7 +2577,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
-command=['python', 'Tools/Scripts/clean-webkit'],
+command=['python3', 'Tools/Scripts/clean-webkit'],
)
+ ExpectShell.log('stdio', stdout='Unexpected failure.')
[webkit-changes] [281761] trunk/Tools
Title: [281761] trunk/Tools
Revision 281761
Author aakash_j...@apple.com
Date 2021-08-30 09:02:14 -0700 (Mon, 30 Aug 2021)
Log Message
ews might mark build as successful if JSC tests fail to run
https://bugs.webkit.org/show_bug.cgi?id=229634
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(RunJSCTestsWithoutPatch.evaluateCommand):
(AnalyzeJSCTestsResults.start):
(AnalyzeJSCTestsResults.retry_build): Method to retry build.
(AnalyzeJSCTestsResults.report_failure):
* CISupport/ews-build/steps_unittest.py: Added unit-tests.
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (281760 => 281761)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-08-30 15:56:19 UTC (rev 281760)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-08-30 16:02:14 UTC (rev 281761)
@@ -1961,7 +1961,9 @@
prefix = 'jsc_clean_tree_'
def evaluateCommand(self, cmd):
-return shell.Test.evaluateCommand(self, cmd)
+rc = shell.Test.evaluateCommand(self, cmd)
+self.setProperty('clean_tree_run_status', rc)
+return rc
class AnalyzeJSCTestsResults(buildstep.BuildStep):
@@ -1990,8 +1992,8 @@
new_stress_failures = stress_failures_with_patch - clean_tree_stress_failures
new_binary_failures = binary_failures_with_patch - clean_tree_binary_failures
-new_stress_failures_to_display = ', '.join(sorted(list(new_stress_failures))[:self.NUM_FAILURES_TO_DISPLAY])
-new_binary_failures_to_display = ', '.join(sorted(list(new_binary_failures))[:self.NUM_FAILURES_TO_DISPLAY])
+self.new_stress_failures_to_display = ', '.join(sorted(list(new_stress_failures))[:self.NUM_FAILURES_TO_DISPLAY])
+self.new_binary_failures_to_display = ', '.join(sorted(list(new_binary_failures))[:self.NUM_FAILURES_TO_DISPLAY])
self._addToLog('stderr', '\nFailures in first run: {}'.format((list(first_run_binary_failures) + list(first_run_stress_failures))[:self.NUM_FAILURES_TO_DISPLAY]))
self._addToLog('stderr', '\nFailures in second run: {}'.format((list(second_run_binary_failures) + list(second_run_stress_failures))[:self.NUM_FAILURES_TO_DISPLAY]))
@@ -1998,23 +2000,18 @@
self._addToLog('stderr', '\nFlaky Tests: {}'.format(flaky_failures_string))
self._addToLog('stderr', '\nFailures on clean tree: {}'.format(clean_tree_failures_string))
+if (not first_run_stress_failures) and (not first_run_binary_failures) and (not second_run_stress_failures) and (not second_run_binary_failures):
+# If we've made it here, then jsc-tests and re-run-jsc-tests failed, which means
+# there should have been some test failures. Otherwise there is some unexpected issue.
+clean_tree_run_status = self.getProperty('clean_tree_run_status', FAILURE)
+if clean_tree_run_status == SUCCESS:
+return self.report_failure(set(), set())
+# TODO: email EWS admins
+return self.retry_build('Unexpected infrastructure issue, retrying build')
+
if new_stress_failures or new_binary_failures:
-self._addToLog('stderr', '\nNew binary failures: {}.\nNew stress test failures: {}\n'.format(new_binary_failures_to_display, new_stress_failures_to_display))
-self.finished(FAILURE)
-self.build.results = FAILURE
-message = ''
-if new_binary_failures:
-pluralSuffix = 's' if len(new_binary_failures) > 1 else ''
-message = 'Found {} new JSC binary failure{}: {}'.format(len(new_binary_failures), pluralSuffix, new_binary_failures_to_display)
-if new_stress_failures:
-if message:
-message += ', '
-pluralSuffix = 's' if len(new_stress_failures) > 1 else ''
-message += 'Found {} new JSC stress test failure{}: {}'.format(len(new_stress_failures), pluralSuffix, new_stress_failures_to_display)
-if len(new_stress_failures) > self.NUM_FAILURES_TO_DISPLAY:
-message += ' ...'
-self.descriptionDone = message
-self.build.buildFinished([message], FAILURE)
+self._addToLog('stderr', '\nNew binary failures: {}.\nNew stress test failures: {}\n'.format(self.new_binary_failures_to_display, self.new_stress_failures_to_display))
+return self.report_failure(new_binary_failures, new_stress_failures)
else:
self._addToLog('stderr', '\nNo new failures\n')
self.finished(SUCCESS)
@@ -2035,6 +2032,33 @@
self.build.buildFinished([message], SUCCESS)
return defer.succeed(None)
+def retry_build(self, message):
+self.descriptionDone = message
+self.finished(RETRY)
+self.build.buildFinished([message], RETRY)
+return defer.succeed(None)
+
[webkit-changes] [281660] trunk/Tools
Title: [281660] trunk/Tools
Revision 281660
Author aakash_j...@apple.com
Date 2021-08-26 15:07:13 -0700 (Thu, 26 Aug 2021)
Log Message
[EWS] compile-webkit-without-patch failed, but bot ran layout tests anyway and blamed the patch for a pre-existing failure
https://bugs.webkit.org/show_bug.cgi?id=229533
Reviewed by Jonathan Bedard.
When the compile-webkit-without-patch step fails, instead of running further layout-tests, retry the build and email
bot watcher's. The retried build will hopefully be picked up by other bot eventually. This is similar to what we do
in case of other infrastructure issues like kill-old-processes step failure.
* CISupport/ews-build/steps.py:
(CompileWebKitWithoutPatch.__init__): Added retry_build_on_failure parameter.
(CompileWebKitWithoutPatch.evaluateCommand): If build failed unexpectedly, retry it and email bot watchers.
(CompileWebKitWithoutPatch.send_email_for_unexpected_build_failure):
(ReRunWebKitTests.evaluateCommand):
(ReRunAPITests.evaluateCommand):
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (281659 => 281660)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-08-26 22:05:54 UTC (rev 281659)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-08-26 22:07:13 UTC (rev 281660)
@@ -1632,6 +1632,10 @@
name = 'compile-webkit-without-patch'
haltOnFailure = False
+def __init__(self, retry_build_on_failure=False, **kwargs):
+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')
@@ -1639,9 +1643,28 @@
return not self.doStepIf(step)
def evaluateCommand(self, cmd):
-return shell.Compile.evaluateCommand(self, cmd)
+rc = shell.Compile.evaluateCommand(self, cmd)
+if rc == FAILURE and self.retry_build_on_failure:
+message = 'Unable to build WebKit without patch, retrying build'
+self.descriptionDone = message
+self.send_email_for_unexpected_build_failure()
+self.build.buildFinished([message], RETRY)
+return rc
+def send_email_for_unexpected_build_failure(self):
+try:
+builder_name = self.getProperty('buildername', '')
+worker_name = self.getProperty('workername', '')
+build_url = '{}#/builders/{}/builds/{}'.format(self.master.config.buildbotURL, self.build._builderid, self.build.number)
+email_subject = '{} might be in bad state, unable to build WebKit'.format(worker_name)
+email_text = '{} might be in bad state. It is unable to build WebKit.'.format(worker_name)
+email_text += ' Same patch was built successfuly on builder queue previously.\n\nBuild: {}\n\nBuilder: {}'.format(build_url, builder_name)
+reference = 'build-failure-{}'.format(worker_name)
+send_email_to_bot_watchers(email_subject, email_text, builder_name, reference)
+except Exception as e:
+print('Error in sending email for unexpected build failure: {}'.format(e))
+
class AnalyzeCompileWebKitResults(buildstep.BuildStep, BugzillaMixin):
name = 'analyze-compile-webkit-results'
description = ['analyze-compile-webkit-results']
@@ -2388,7 +2411,7 @@
ExtractTestResults(identifier='rerun'),
UnApplyPatchIfRequired(),
ValidatePatch(verifyBugClosed=False, addURLs=False),
-CompileWebKitWithoutPatch(),
+CompileWebKitWithoutPatch(retry_build_on_failure=True),
ValidatePatch(verifyBugClosed=False, addURLs=False),
KillOldProcesses(),
RunWebKitTestsWithoutPatch()])
@@ -2856,7 +2879,7 @@
steps_to_add.append(InstallWpeDependencies())
elif platform == 'gtk':
steps_to_add.append(InstallGtkDependencies())
-steps_to_add.append(CompileWebKitWithoutPatch())
+steps_to_add.append(CompileWebKitWithoutPatch(retry_build_on_failure=True))
steps_to_add.append(ValidatePatch(verifyBugClosed=False, addURLs=False))
steps_to_add.append(KillOldProcesses())
steps_to_add.append(RunAPITestsWithoutPatch())
Modified: trunk/Tools/ChangeLog (281659 => 281660)
--- trunk/Tools/ChangeLog 2021-08-26 22:05:54 UTC (rev 281659)
+++ trunk/Tools/ChangeLog 2021-08-26 22:07:13 UTC (rev 281660)
@@ -1,3 +1,20 @@
+2021-08-26 Aakash Jain
+
+[EWS] compile-webkit-without-patch failed, but bot ran layout tests anyway and
[webkit-changes] [280763] trunk/Tools
Title: [280763] trunk/Tools Revision 280763 Author aakash_j...@apple.com Date 2021-08-07 18:20:45 -0700 (Sat, 07 Aug 2021) Log Message [ews] Limit the size of error context buffer https://bugs.webkit.org/show_bug.cgi?id=228900 Reviewed by Alexey Proskuryakov. * CISupport/ews-build/steps.py: (BuildLogLineObserver.outLineReceived): Limit the lines for additional context to 50 lines. Modified Paths trunk/Tools/CISupport/ews-build/steps.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/CISupport/ews-build/steps.py (280762 => 280763) --- trunk/Tools/CISupport/ews-build/steps.py 2021-08-07 22:47:09 UTC (rev 280762) +++ trunk/Tools/CISupport/ews-build/steps.py 2021-08-08 01:20:45 UTC (rev 280763) @@ -1529,7 +1529,7 @@ self.error_context_buffer.append(line) if self.searchString in line: -for log in self.error_context_buffer: +for log in self.error_context_buffer[-50:]: self.errorReceived(log) self.error_context_buffer = [] Modified: trunk/Tools/ChangeLog (280762 => 280763) --- trunk/Tools/ChangeLog 2021-08-07 22:47:09 UTC (rev 280762) +++ trunk/Tools/ChangeLog 2021-08-08 01:20:45 UTC (rev 280763) @@ -1,3 +1,13 @@ +2021-08-07 Aakash Jain + +[ews] Limit the size of error context buffer +https://bugs.webkit.org/show_bug.cgi?id=228900 + +Reviewed by Alexey Proskuryakov. + +* CISupport/ews-build/steps.py: +(BuildLogLineObserver.outLineReceived): Limit the lines for additional context to 50 lines. + 2021-08-07 Wenson Hsieh [macOS] Web process crashes when detaching Document with uncommitted marked text ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [280759] trunk/Tools
Title: [280759] trunk/Tools
Revision 280759
Author aakash_j...@apple.com
Date 2021-08-07 13:55:22 -0700 (Sat, 07 Aug 2021)
Log Message
[ews] Ensure file handle is not leaked in loadConfig.py
https://bugs.webkit.org/show_bug.cgi?id=228866
Reviewed by Alexey Proskuryakov.
* CISupport/build-webkit-org/loadConfig.py:
(loadBuilderConfig):
* CISupport/ews-build/loadConfig.py:
(loadBuilderConfig):
Modified Paths
trunk/Tools/CISupport/build-webkit-org/loadConfig.py
trunk/Tools/CISupport/ews-build/loadConfig.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/loadConfig.py (280758 => 280759)
--- trunk/Tools/CISupport/build-webkit-org/loadConfig.py 2021-08-07 18:50:12 UTC (rev 280758)
+++ trunk/Tools/CISupport/build-webkit-org/loadConfig.py 2021-08-07 20:55:22 UTC (rev 280759)
@@ -47,8 +47,8 @@
def loadBuilderConfig(c, is_test_mode_enabled=False, master_prefix_path='./'):
-# FIXME: These file handles are leaked.
-config = json.load(open(os.path.join(master_prefix_path, 'config.json')))
+with open(os.path.join(master_prefix_path, 'config.json')) as config_json:
+config = json.load(config_json)
if is_test_mode_enabled:
passwords = {}
else:
Modified: trunk/Tools/CISupport/ews-build/loadConfig.py (280758 => 280759)
--- trunk/Tools/CISupport/ews-build/loadConfig.py 2021-08-07 18:50:12 UTC (rev 280758)
+++ trunk/Tools/CISupport/ews-build/loadConfig.py 2021-08-07 20:55:22 UTC (rev 280759)
@@ -42,7 +42,8 @@
def loadBuilderConfig(c, is_test_mode_enabled=False, master_prefix_path='./'):
-config = json.load(open(os.path.join(master_prefix_path, 'config.json')))
+with open(os.path.join(master_prefix_path, 'config.json')) as config_json:
+config = json.load(config_json)
if is_test_mode_enabled:
passwords = {}
else:
Modified: trunk/Tools/ChangeLog (280758 => 280759)
--- trunk/Tools/ChangeLog 2021-08-07 18:50:12 UTC (rev 280758)
+++ trunk/Tools/ChangeLog 2021-08-07 20:55:22 UTC (rev 280759)
@@ -1,3 +1,15 @@
+2021-08-07 Aakash Jain
+
+[ews] Ensure file handle is not leaked in loadConfig.py
+https://bugs.webkit.org/show_bug.cgi?id=228866
+
+Reviewed by Alexey Proskuryakov.
+
+* CISupport/build-webkit-org/loadConfig.py:
+(loadBuilderConfig):
+* CISupport/ews-build/loadConfig.py:
+(loadBuilderConfig):
+
2021-08-06 Jonathan Bedard
[git-webkit] Add setup function
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [280725] trunk/Tools
Title: [280725] trunk/Tools
Revision 280725
Author aakash_j...@apple.com
Date 2021-08-06 09:25:55 -0700 (Fri, 06 Aug 2021)
Log Message
[ews] Make config.json compact
https://bugs.webkit.org/show_bug.cgi?id=228862
Reviewed by Jonathan Bedard.
* CISupport/ews-build/config.json:
Modified Paths
trunk/Tools/CISupport/ews-build/config.json
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/config.json (280724 => 280725)
--- trunk/Tools/CISupport/ews-build/config.json 2021-08-06 16:03:29 UTC (rev 280724)
+++ trunk/Tools/CISupport/ews-build/config.json 2021-08-06 16:25:55 UTC (rev 280725)
@@ -1,744 +1,329 @@
{
"workers": [
-{
- "name": "webkit-misc",
- "platform": "*",
- "max_builds": 3
-},
-{
- "name": "igalia-jsc32-armv7-ews",
- "platform": "jsc-only"
-},
-{
- "name": "igalia-jsc32-armv7-ews-02",
- "platform": "jsc-only"
-},
-{
- "name": "igalia-jsc32-mipsel-ews",
- "platform": "jsc-only"
-},
-{
- "name": "igalia-jsc32-mipsel-ews-02",
- "platform": "jsc-only"
-},
-{
- "name": "igalia-jsc32-mipsel-ews-03",
- "platform": "jsc-only"
-},
-{
- "name": "igalia-jsc32-i386-ews",
- "platform": "jsc-only"
-},
-{
- "name": "igalia1-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia2-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia3-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia4-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia5-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia6-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia7-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia8-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia9-gtk-wk2-ews",
- "platform": "gtk"
-},
-{
- "name": "aperez-gtk-ews",
- "platform": "gtk"
-},
-{
- "name": "igalia-wpe-ews",
- "platform": "wpe"
-},
-{
- "name": "aperez-wpe-ews",
- "platform": "wpe"
-},
-{
- "name": "wincairo-ews-001",
- "platform": "wincairo"
-},
-{
- "name": "wincairo-ews-002",
- "platform": "wincairo"
-},
-{
- "name": "wincairo-ews-003",
- "platform": "wincairo"
-},
-{
- "name": "wincairo-ews-004",
- "platform": "wincairo"
-},
-{
- "name": "ews100",
- "platform": "mac-catalina"
-},
-{
- "name": "ews101",
- "platform": "mac-catalina"
-},
-{
- "name": "ews102",
- "platform": "mac-catalina"
-},
-{
- "name": "ews103",
- "platform": "mac-catalina"
-},
-{
- "name": "ews104",
- "platform": "mac-catalina"
-},
-{
- "name": "ews105",
- "platform": "mac-catalina"
-},
-{
- "name": "ews106",
- "platform": "mac-catalina"
-},
-{
- "name": "ews107",
- "platform": "mac-catalina"
-},
-{
- "name": "ews108",
- "platform": "ios-14"
-},
-{
- "name": "ews109",
- "platform": "*"
-},
-{
- "name": "ews112",
- "platform": "mac-catalina"
-},
-{
- "name": "ews113",
- "platform": "mac-catalina"
-},
-{
- "name": "ews114",
- "platform": "mac-catalina"
-},
-{
- "name": "ews115",
- "platform": "mac-catalina"
-},
-{
- "name": "ews116",
- "platform": "mac-catalina"
-},
-{
- "name": "ews117",
- "platform": "mac-catalina"
-},
-{
- "name": "ews118",
- "platform": "mac-catalina"
-},
-{
- "name": "ews119",
- "platform": "mac-catalina"
-},
-{
- "name": "ews120",
- "platform": "mac-catalina"
-},
-{
- "name": "ews121",
- "platform": "ios-simulator-14"
-},
-{
- "name": "ews122",
- "platform": "ios-simulator-14"
-},
-{
- "name": "ews123",
- "platform": "ios-simulator-14"
-},
-{
- "name": "ews124",
- "platform": "ios-simulator-14"
-},
-{
- "name": "ews125",
- "platform": "ios-simulator-14"
-},
-{
- "name": "ews126",
- "platform": "ios-simulator-14"
-},
-{
- "name": "ews127",
- "platform": "mac-catalina"
-},
-{
- "name": "ews128",
- "platform": "mac-catalina"
-},
-{
- "name": "ews150",
- "platform": "*"
-},
-{
- "name": "ews151",
- "platform": "*",
- "max_builds": 3
-},
-{
- "name": "ews152",
- "platform": "*"
-},
-{
- "name": "ews153",
- "platform": "*"
-},
-{
- "name": "ews154",
- "platform": "*"
-},
-{
- "name": "ews155",
- "platform": "*"
-},
-{
- "name": "ews156",
- "platform": "*"
-},
-
[webkit-changes] [280437] trunk/Tools
Title: [280437] trunk/Tools
Revision 280437
Author aakash_j...@apple.com
Date 2021-07-29 11:44:40 -0700 (Thu, 29 Jul 2021)
Log Message
Send email notification when VerifyGitHubIntegrity step fails
https://bugs.webkit.org/show_bug.cgi?id=228592
Reviewed by Jonathan Bedard.
* CISupport/ews-build/emails.json:
* CISupport/ews-build/send_email.py:
(send_email_to_github_admin):
* CISupport/ews-build/steps.py:
(VerifyGitHubIntegrity):
(VerifyGitHubIntegrity.evaluateCommand):
(VerifyGitHubIntegrity.send_email_for_github_issue):
Modified Paths
trunk/Tools/CISupport/ews-build/emails.json
trunk/Tools/CISupport/ews-build/send_email.py
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/emails.json (280436 => 280437)
--- trunk/Tools/CISupport/ews-build/emails.json 2021-07-29 18:32:23 UTC (rev 280436)
+++ trunk/Tools/CISupport/ews-build/emails.json 2021-07-29 18:44:40 UTC (rev 280437)
@@ -3,6 +3,10 @@
"aakash_j...@apple.com",
"webkit-ews-bot-watch...@group.apple.com"
],
+ "GITHUB_ADMIN_EMAILS": [
+ "jbed...@apple.com",
+ "ad...@webkit.org"
+ ],
"APPLE_BOT_WATCHERS_EMAILS": [
"webkit-ews-bot-watch...@group.apple.com"
],
Modified: trunk/Tools/CISupport/ews-build/send_email.py (280436 => 280437)
--- trunk/Tools/CISupport/ews-build/send_email.py 2021-07-29 18:32:23 UTC (rev 280436)
+++ trunk/Tools/CISupport/ews-build/send_email.py 2021-07-29 18:44:40 UTC (rev 280437)
@@ -91,3 +91,7 @@
send_email(get_email_ids('IGALIA_JSC_TEAM_EMAILS'), subject, text, reference)
if any(pattern in builder_name.lower() for pattern in IGALIA_GTK_WPE_QUEUES_PATTERNS):
send_email(get_email_ids('IGALIA_GTK_WPE_EMAILS'), subject, text, reference)
+
+
+def send_email_to_github_admin(subject, text, reference=''):
+send_email(get_email_ids('GITHUB_ADMIN_EMAILS'), subject, text, reference)
Modified: trunk/Tools/CISupport/ews-build/steps.py (280436 => 280437)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-07-29 18:32:23 UTC (rev 280436)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-07-29 18:44:40 UTC (rev 280437)
@@ -30,7 +30,7 @@
from twisted.internet import defer
from layout_test_failures import LayoutTestFailures
-from send_email import send_email_to_patch_author, send_email_to_bot_watchers
+from send_email import send_email_to_patch_author, send_email_to_bot_watchers, send_email_to_github_admin
import json
import os
@@ -3464,3 +3464,19 @@
if self.results != SUCCESS:
return {'step': 'GitHub integrity check failed'}
return {'step': 'Verified GitHub integrity'}
+
+def evaluateCommand(self, cmd):
+rc = shell.ShellCommand.evaluateCommand(self, cmd)
+if rc != SUCCESS:
+self.send_email_for_github_issue()
+return rc
+
+def send_email_for_github_issue(self):
+try:
+builder_name = self.getProperty('buildername', '')
+build_url = '{}#/builders/{}/builds/{}'.format(self.master.config.buildbotURL, self.build._builderid, self.build.number)
+email_subject = 'URGENT: GitHub integrity check failed'
+email_text = 'URGENT issue on github repository. Integrity check failed.\n\nBuild: {}\n\nBuilder: {}'.format(build_url, builder_name)
+send_email_to_github_admin(email_subject, email_text)
+except Exception as e:
+print('Error in sending email for github issue: {}'.format(e))
Modified: trunk/Tools/ChangeLog (280436 => 280437)
--- trunk/Tools/ChangeLog 2021-07-29 18:32:23 UTC (rev 280436)
+++ trunk/Tools/ChangeLog 2021-07-29 18:44:40 UTC (rev 280437)
@@ -1,3 +1,18 @@
+2021-07-29 Aakash Jain
+
+Send email notification when VerifyGitHubIntegrity step fails
+https://bugs.webkit.org/show_bug.cgi?id=228592
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/emails.json:
+* CISupport/ews-build/send_email.py:
+(send_email_to_github_admin):
+* CISupport/ews-build/steps.py:
+(VerifyGitHubIntegrity):
+(VerifyGitHubIntegrity.evaluateCommand):
+(VerifyGitHubIntegrity.send_email_for_github_issue):
+
2021-07-29 Jonathan Bedard
[git-webkit] Add identifiers to 'log' and 'blame'
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [280431] trunk/Tools
Title: [280431] trunk/Tools
Revision 280431
Author aakash_j...@apple.com
Date 2021-07-29 10:21:02 -0700 (Thu, 29 Jul 2021)
Log Message
[ews] VerifyGitHubIntegrity step fails with an exception
https://bugs.webkit.org/show_bug.cgi?id=228587
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(VerifyGitHubIntegrity): Fixed the base class.
(VerifyGitHubIntegrity.getResultSummary): Drive-by fix to improve error message.
* CISupport/ews-build/steps_unittest.py: Added unit-tests.
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (280430 => 280431)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-07-29 17:15:58 UTC (rev 280430)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-07-29 17:21:02 UTC (rev 280431)
@@ -3452,7 +3452,7 @@
# FIXME: Only needed when GitHub is a mirror, remove once GitHub is the source of truth
-class VerifyGitHubIntegrity(steps.ShellSequence):
+class VerifyGitHubIntegrity(shell.ShellCommand):
command = ['python3', 'Tools/Scripts/check-github-mirror-integrity']
name = 'verify-github-integrity'
haltOnFailure = True
@@ -3462,5 +3462,5 @@
def getResultSummary(self):
if self.results != SUCCESS:
-return {'step': 'Encountered some issues during cleanup'}
+return {'step': 'GitHub integrity check failed'}
return {'step': 'Verified GitHub integrity'}
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (280430 => 280431)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-07-29 17:15:58 UTC (rev 280430)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-07-29 17:21:02 UTC (rev 280431)
@@ -55,7 +55,7 @@
RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsInStressMode, RunWebKitTestsInStressGuardmallocMode,
RunWebKitTestsWithoutPatch, TestWithFailureCount, ShowIdentifier,
Trigger, TransferToS3, UnApplyPatchIfRequired, UpdateWorkingDirectory, UploadBuiltProduct,
- UploadTestResults, ValidateCommiterAndReviewer, ValidatePatch)
+ UploadTestResults, ValidateCommiterAndReviewer, ValidatePatch, VerifyGitHubIntegrity)
# Workaround for https://github.com/buildbot/buildbot/issues/4669
from buildbot.test.fake.fakebuild import FakeBuild
@@ -4447,5 +4447,41 @@
return self.runStep()
+class TestVerifyGitHubIntegrity(BuildStepMixinAdditions, unittest.TestCase):
+def setUp(self):
+self.longMessage = True
+return self.setUpBuildStep()
+
+def tearDown(self):
+return self.tearDownBuildStep()
+
+def test_success(self):
+self.setupStep(VerifyGitHubIntegrity())
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+command=['python3', 'Tools/Scripts/check-github-mirror-integrity'],
+logEnviron=False,
+timeout=1200,
+)
++ 0,
+)
+self.expectOutcome(result=SUCCESS, state_string='Verified GitHub integrity')
+return self.runStep()
+
+def test_failure(self):
+self.setupStep(VerifyGitHubIntegrity())
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+command=['python3', 'Tools/Scripts/check-github-mirror-integrity'],
+logEnviron=False,
+timeout=1200,
+)
++ ExpectShell.log('stdio', stdout='Unexpected error.')
++ 2,
+)
+self.expectOutcome(result=FAILURE, state_string='GitHub integrity check failed')
+return self.runStep()
+
+
if __name__ == '__main__':
unittest.main()
Modified: trunk/Tools/ChangeLog (280430 => 280431)
--- trunk/Tools/ChangeLog 2021-07-29 17:15:58 UTC (rev 280430)
+++ trunk/Tools/ChangeLog 2021-07-29 17:21:02 UTC (rev 280431)
@@ -1,3 +1,15 @@
+2021-07-29 Aakash Jain
+
+[ews] VerifyGitHubIntegrity step fails with an exception
+https://bugs.webkit.org/show_bug.cgi?id=228587
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(VerifyGitHubIntegrity): Fixed the base class.
+(VerifyGitHubIntegrity.getResultSummary): Drive-by fix to improve error message.
+* CISupport/ews-build/steps_unittest.py: Added unit-tests.
+
2021-07-29 Michael Catanzaro
[WPE][GTK] .asc file extension is appended to filename of text/plain downloads
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [280362] trunk/Tools
Title: [280362] trunk/Tools Revision 280362 Author aakash_j...@apple.com Date 2021-07-27 16:59:01 -0700 (Tue, 27 Jul 2021) Log Message Add .gitignore file for CISupport https://bugs.webkit.org/show_bug.cgi?id=228113 Reviewed by Jonathan Bedard. * CISupport/.gitignore: Added. Modified Paths trunk/Tools/ChangeLog Added Paths trunk/Tools/CISupport/.gitignore Diff Added: trunk/Tools/CISupport/.gitignore (0 => 280362) --- trunk/Tools/CISupport/.gitignore (rev 0) +++ trunk/Tools/CISupport/.gitignore 2021-07-27 23:59:01 UTC (rev 280362) @@ -0,0 +1,9 @@ +http.log* +ews.log* +ews_console.log* +twistd.log* +twistd.pid +state.sqlite +passwords.json +public_html/ +workers/ Modified: trunk/Tools/ChangeLog (280361 => 280362) --- trunk/Tools/ChangeLog 2021-07-27 23:48:49 UTC (rev 280361) +++ trunk/Tools/ChangeLog 2021-07-27 23:59:01 UTC (rev 280362) @@ -1,3 +1,12 @@ +2021-07-27 Aakash Jain + +Add .gitignore file for CISupport +https://bugs.webkit.org/show_bug.cgi?id=228113 + +Reviewed by Jonathan Bedard. + +* CISupport/.gitignore: Added. + 2021-07-27 Diego Pino Garcia [GTK][WPE] Move WebKitGTK and WPE dependency packages to a common GLIB list ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [280079] trunk/Tools
Title: [280079] trunk/Tools
Revision 280079
Author aakash_j...@apple.com
Date 2021-07-20 05:48:15 -0700 (Tue, 20 Jul 2021)
Log Message
EWS should send email notification when a bot goes out of disk space
https://bugs.webkit.org/show_bug.cgi?id=216489
Reviewed by Ryan Haddad.
* CISupport/ews-build/steps.py:
(CleanUpGitIndexLock.start):
(CleanUpGitIndexLock.send_email_for_git_issue):
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (280078 => 280079)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-07-20 11:26:28 UTC (rev 280078)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-07-20 12:48:15 UTC (rev 280079)
@@ -141,6 +141,8 @@
platform = self.getProperty('platform', '*')
if platform == 'wincairo':
self.command = ['del', r'.git\index.lock']
+
+self.send_email_for_git_issue()
return shell.ShellCommand.start(self)
def evaluateCommand(self, cmd):
@@ -147,7 +149,19 @@
self.build.buildFinished(['Git issue, retrying build'], RETRY)
return super(CleanUpGitIndexLock, self).evaluateCommand(cmd)
+def send_email_for_git_issue(self):
+try:
+builder_name = self.getProperty('buildername', '')
+worker_name = self.getProperty('workername', '')
+build_url = '{}#/builders/{}/builds/{}'.format(self.master.config.buildbotURL, self.build._builderid, self.build.number)
+email_subject = 'Git issue on {}'.format(worker_name)
+email_text = 'Git issue on {}\n\nBuild: {}\n\nBuilder: {}'.format(worker_name, build_url, builder_name)
+send_email_to_bot_watchers(email_subject, email_text, builder_name, worker_name)
+except Exception as e:
+print('Error in sending email for git issue: {}'.format(e))
+
+
class CheckOutSpecificRevision(shell.ShellCommand):
name = 'checkout-specific-revision'
descriptionDone = ['Checked out required revision']
Modified: trunk/Tools/ChangeLog (280078 => 280079)
--- trunk/Tools/ChangeLog 2021-07-20 11:26:28 UTC (rev 280078)
+++ trunk/Tools/ChangeLog 2021-07-20 12:48:15 UTC (rev 280079)
@@ -1,3 +1,14 @@
+2021-07-20 Aakash Jain
+
+EWS should send email notification when a bot goes out of disk space
+https://bugs.webkit.org/show_bug.cgi?id=216489
+
+Reviewed by Ryan Haddad.
+
+* CISupport/ews-build/steps.py:
+(CleanUpGitIndexLock.start):
+(CleanUpGitIndexLock.send_email_for_git_issue):
+
2021-07-20 VÃctor Manuel Jáquez Leal
Update myself (vjaquez) as committer in contributors.json
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [279953] trunk/Tools
Title: [279953] trunk/Tools
Revision 279953
Author aakash_j...@apple.com
Date 2021-07-15 10:17:23 -0700 (Thu, 15 Jul 2021)
Log Message
Add unit-tests for InstallBuiltProduct step
https://bugs.webkit.org/show_bug.cgi?id=227990
Reviewed by Philippe Normand.
* CISupport/build-webkit-org/steps_unittest.py:
* CISupport/ews-build/steps_unittest.py:
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (279952 => 279953)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-07-15 16:50:41 UTC (rev 279952)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-07-15 17:17:23 UTC (rev 279953)
@@ -1283,3 +1283,43 @@
)
self.expectOutcome(result=FAILURE, state_string='Failed to print configuration')
return self.runStep()
+
+
+class TestInstallBuiltProduct(BuildStepMixinAdditions, unittest.TestCase):
+def setUp(self):
+self.longMessage = True
+return self.setUpBuildStep()
+
+def tearDown(self):
+return self.tearDownBuildStep()
+
+def test_success(self):
+self.setupStep(InstallBuiltProduct())
+self.setProperty('fullPlatform', 'ios-14')
+self.setProperty('configuration', 'release')
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+command=['python3', 'Tools/Scripts/install-built-product', '--platform=ios-14', '--release'],
+logEnviron=True,
+timeout=1200,
+)
++ 0,
+)
+self.expectOutcome(result=SUCCESS, state_string='Installed Built Product')
+return self.runStep()
+
+def test_failure(self):
+self.setupStep(InstallBuiltProduct())
+self.setProperty('fullPlatform', 'ios-14')
+self.setProperty('configuration', 'debug')
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+command=['python3', 'Tools/Scripts/install-built-product', '--platform=ios-14', '--debug'],
+logEnviron=True,
+timeout=1200,
+)
++ ExpectShell.log('stdio', stdout='Unexpected error.')
++ 2,
+)
+self.expectOutcome(result=FAILURE, state_string='Installed Built Product (failure)')
+return self.runStep()
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (279952 => 279953)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-07-15 16:50:41 UTC (rev 279952)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-07-15 17:17:23 UTC (rev 279953)
@@ -46,7 +46,8 @@
CleanBuild, CleanUpGitIndexLock, CleanGitRepo, CleanWorkingDirectory, CompileJSC, CompileJSCWithoutPatch,
CompileWebKit, CompileWebKitWithoutPatch, ConfigureBuild, CreateLocalGITCommit,
DownloadBuiltProduct, DownloadBuiltProductFromMaster, EWS_BUILD_HOSTNAME, ExtractBuiltProduct, ExtractTestResults,
- FetchBranches, FindModifiedChangeLogs, FindModifiedLayoutTests, GitResetHard, InstallGtkDependencies, InstallWpeDependencies,
+ FetchBranches, FindModifiedChangeLogs, FindModifiedLayoutTests, GitResetHard,
+ InstallBuiltProduct, InstallGtkDependencies, InstallWpeDependencies,
KillOldProcesses, PrintConfiguration, PushCommitToWebKitRepo, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitPerlTests,
ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch, RunBindingsTests, RunBuildWebKitOrgUnitTests,
RunBuildbotCheckConfigForBuildWebKit, RunBuildbotCheckConfigForEWS, RunEWSUnitTests, RunResultsdbpyTests,
@@ -4406,5 +4407,45 @@
return self.runStep()
+class TestInstallBuiltProduct(BuildStepMixinAdditions, unittest.TestCase):
+def setUp(self):
+self.longMessage = True
+return self.setUpBuildStep()
+
+def tearDown(self):
+return self.tearDownBuildStep()
+
+def test_success(self):
+self.setupStep(InstallBuiltProduct())
+self.setProperty('fullPlatform', 'ios-14')
+self.setProperty('configuration', 'release')
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+command=['python3', 'Tools/Scripts/install-built-product', '--platform=ios-14', '--release'],
+logEnviron=True,
+timeout=1200,
+)
++ 0,
+)
+self.expectOutcome(result=SUCCESS, state_string='Installed Built Product')
+return self.runStep()
+
+def test_failure(self):
+self.setupStep(InstallBuiltProduct())
+self.setProperty('fullPlatform', 'ios-14')
+
[webkit-changes] [279945] trunk/Tools
Title: [279945] trunk/Tools
Revision 279945
Author aakash_j...@apple.com
Date 2021-07-15 07:26:00 -0700 (Thu, 15 Jul 2021)
Log Message
[iOS]TestWebKitAPI.InAppBrowserPrivacy.AppBoundDomainAllowsServiceWorkers is failing
https://bugs.webkit.org/show_bug.cgi?id=227918
Unreviewed test gardening.
* TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm: Disabled the test for now to speed up EWS.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm
Diff
Modified: trunk/Tools/ChangeLog (279944 => 279945)
--- trunk/Tools/ChangeLog 2021-07-15 13:48:27 UTC (rev 279944)
+++ trunk/Tools/ChangeLog 2021-07-15 14:26:00 UTC (rev 279945)
@@ -1,3 +1,13 @@
+2021-07-15 Aakash Jain
+
+[iOS]TestWebKitAPI.InAppBrowserPrivacy.AppBoundDomainAllowsServiceWorkers is failing
+https://bugs.webkit.org/show_bug.cgi?id=227918
+
+
+Unreviewed test gardening.
+
+* TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm: Disabled the test for now to speed up EWS.
+
2021-07-14 Brent Fulgham
[iOS & Mac Big Sur Release] Two SOAuthorizationSubFrame API tests are failing
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm (279944 => 279945)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm 2021-07-15 13:48:27 UTC (rev 279944)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm 2021-07-15 14:26:00 UTC (rev 279945)
@@ -806,7 +806,7 @@
)SWRESOURCE";
-TEST(InAppBrowserPrivacy, AppBoundDomainAllowsServiceWorkers)
+TEST(InAppBrowserPrivacy, DISABLED_AppBoundDomainAllowsServiceWorkers)
{
initializeInAppBrowserPrivacyTestSettings();
isDone = false;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [279908] trunk/Tools
Title: [279908] trunk/Tools
Revision 279908
Author aakash_j...@apple.com
Date 2021-07-14 04:55:18 -0700 (Wed, 14 Jul 2021)
Log Message
Add step name and description to InstallBuiltProduct build step
https://bugs.webkit.org/show_bug.cgi?id=227935
Reviewed by Carlos Alberto Lopez Perez.
* CISupport/build-webkit-org/steps.py:
(InstallBuiltProduct):
* CISupport/ews-build/steps.py:
(InstallBuiltProduct):
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (279907 => 279908)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-07-14 10:53:59 UTC (rev 279907)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-07-14 11:55:18 UTC (rev 279908)
@@ -324,9 +324,13 @@
class InstallBuiltProduct(shell.ShellCommand):
+name = 'install-built-product'
+description = ['Installing Built Product']
+descriptionDone = ['Installed Built Product']
command = ["python3", "Tools/Scripts/install-built-product",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+
class ArchiveBuiltProduct(shell.ShellCommand):
command = ["python3", "Tools/CISupport/built-product-archive",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive"]
Modified: trunk/Tools/CISupport/ews-build/steps.py (279907 => 279908)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-07-14 10:53:59 UTC (rev 279907)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-07-14 11:55:18 UTC (rev 279908)
@@ -2034,9 +2034,13 @@
class InstallBuiltProduct(shell.ShellCommand):
+name = 'install-built-product'
+description = ['Installing Built Product']
+descriptionDone = ['Installed Built Product']
command = ["python3", "Tools/Scripts/install-built-product",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+
class CleanBuild(shell.Compile):
name = 'delete-WebKitBuild-directory'
description = ['deleting WebKitBuild directory']
Modified: trunk/Tools/ChangeLog (279907 => 279908)
--- trunk/Tools/ChangeLog 2021-07-14 10:53:59 UTC (rev 279907)
+++ trunk/Tools/ChangeLog 2021-07-14 11:55:18 UTC (rev 279908)
@@ -1,3 +1,15 @@
+2021-07-14 Aakash Jain
+
+Add step name and description to InstallBuiltProduct build step
+https://bugs.webkit.org/show_bug.cgi?id=227935
+
+Reviewed by Carlos Alberto Lopez Perez.
+
+* CISupport/build-webkit-org/steps.py:
+(InstallBuiltProduct):
+* CISupport/ews-build/steps.py:
+(InstallBuiltProduct):
+
2021-07-13 Jonathan Bedard
[webkitscmpy] Handle failed `git log` process
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [279875] trunk/Tools
Title: [279875] trunk/Tools
Revision 279875
Author aakash_j...@apple.com
Date 2021-07-13 09:46:18 -0700 (Tue, 13 Jul 2021)
Log Message
[build.webkit.org] Upload layout-tests results immediately after running layout-tests
https://bugs.webkit.org/show_bug.cgi?id=227889
Reviewed by Carlos Alberto Lopez Perez.
* CISupport/build-webkit-org/factories.py:
Modified Paths
trunk/Tools/CISupport/build-webkit-org/factories.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/factories.py (279874 => 279875)
--- trunk/Tools/CISupport/build-webkit-org/factories.py 2021-07-13 16:40:12 UTC (rev 279874)
+++ trunk/Tools/CISupport/build-webkit-org/factories.py 2021-07-13 16:46:18 UTC (rev 279875)
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2020 Apple Inc. All rights reserved.
+# Copyright (C) 2017-2021 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -97,6 +97,13 @@
self.addStep(self.JSCTestClass())
if self.LayoutTestClass:
self.addStep(self.LayoutTestClass())
+if not platform.startswith('win'):
+self.addStep(RunDashboardTests())
+if self.LayoutTestClass:
+self.addStep(ArchiveTestResults())
+self.addStep(UploadTestResults())
+self.addStep(ExtractTestResults())
+self.addStep(SetPermissions())
if platform.startswith('win') or platform.startswith('mac') or platform.startswith('ios-simulator'):
self.addStep(RunAPITests())
@@ -108,17 +115,10 @@
self.addStep(RunPerlTests())
self.addStep(RunBindingsTests())
self.addStep(RunBuiltinsTests())
-if not platform.startswith('win'):
-self.addStep(RunDashboardTests())
if platform.startswith('mac') or platform.startswith('ios-simulator'):
self.addStep(TriggerCrashLogSubmission())
-if self.LayoutTestClass:
-self.addStep(ArchiveTestResults())
-self.addStep(UploadTestResults())
-self.addStep(ExtractTestResults())
-self.addStep(SetPermissions())
if platform == "gtk":
self.addStep(RunGtkAPITests())
if additionalArguments and "--display-server=wayland" in additionalArguments:
Modified: trunk/Tools/ChangeLog (279874 => 279875)
--- trunk/Tools/ChangeLog 2021-07-13 16:40:12 UTC (rev 279874)
+++ trunk/Tools/ChangeLog 2021-07-13 16:46:18 UTC (rev 279875)
@@ -1,3 +1,12 @@
+2021-07-13 Aakash Jain
+
+[build.webkit.org] Upload layout-tests results immediately after running layout-tests
+https://bugs.webkit.org/show_bug.cgi?id=227889
+
+Reviewed by Carlos Alberto Lopez Perez.
+
+* CISupport/build-webkit-org/factories.py:
+
2021-07-13 Kate Cheney
Allow layout tests to specify app initiated loads or not
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [279665] trunk/Tools
Title: [279665] trunk/Tools
Revision 279665
Author aakash_j...@apple.com
Date 2021-07-07 13:50:19 -0700 (Wed, 07 Jul 2021)
Log Message
[build.webkit.org] Add unit-tests for RunWebKit1Tests
https://bugs.webkit.org/show_bug.cgi?id=227658
Reviewed by Alexey Proskuryakov.
* CISupport/build-webkit-org/steps_unittest.py:
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (279664 => 279665)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-07-07 20:39:26 UTC (rev 279664)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-07-07 20:50:19 UTC (rev 279665)
@@ -911,6 +911,71 @@
return self.runStep()
+class TestRunWebKit1Tests(BuildStepMixinAdditions, unittest.TestCase):
+def setUp(self):
+self.longMessage = True
+self.jsonFileName = 'layout-test-results/full_results.json'
+os.environ['RESULTS_SERVER_API_KEY'] = 'test-api-key'
+return self.setUpBuildStep()
+
+def tearDown(self):
+del os.environ['RESULTS_SERVER_API_KEY']
+return self.tearDownBuildStep()
+
+def configureStep(self):
+self.setupStep(RunWebKit1Tests())
+self.setProperty('buildername', 'Apple-iOS-14-Simulator-Debug-Build')
+self.setProperty('buildnumber', '101')
+self.setProperty('workername', 'bot100')
+
+def test_success(self):
+self.configureStep()
+self.setProperty('fullPlatform', 'ios-simulator')
+self.setProperty('configuration', 'debug')
+self.expectRemoteCommands(
+ExpectShell(
+workdir='wkdir',
+logEnviron=False,
+command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ '--no-new-test-results', '--clobber-old-results',
+ '--builder-name', 'Apple-iOS-14-Simulator-Debug-Build',
+ '--build-number', '101', '--buildbot-worker', 'bot100',
+ '--buildbot-master', CURRENT_HOSTNAME,
+ '--report', RESULTS_WEBKIT_URL,
+ '--exit-after-n-crashes-or-timeouts', '50',
+ '--exit-after-n-failures', '500',
+ '--debug', '--dump-render-tree', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
+env={'RESULTS_SERVER_API_KEY': 'test-api-key'}
+) + 0,
+)
+self.expectOutcome(result=SUCCESS, state_string='layout-tests')
+return self.runStep()
+
+def test_failure(self):
+self.configureStep()
+self.setProperty('fullPlatform', 'ios-14')
+self.setProperty('configuration', 'release')
+self.expectRemoteCommands(
+ExpectShell(
+workdir='wkdir',
+logEnviron=False,
+command=['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results',
+ '--no-new-test-results', '--clobber-old-results',
+ '--builder-name', 'Apple-iOS-14-Simulator-Debug-Build',
+ '--build-number', '101', '--buildbot-worker', 'bot100',
+ '--buildbot-master', CURRENT_HOSTNAME,
+ '--report', RESULTS_WEBKIT_URL,
+ '--exit-after-n-crashes-or-timeouts', '50',
+ '--exit-after-n-failures', '500',
+ '--release', '--dump-render-tree', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
+env={'RESULTS_SERVER_API_KEY': 'test-api-key'}
+) + ExpectShell.log('stdio', stdout='9 failures found.')
++ 2,
+)
+self.expectOutcome(result=FAILURE, state_string='layout-tests (failure)')
+return self.runStep()
+
+
class TestRunJavaScriptCoreTests(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
Modified: trunk/Tools/ChangeLog (279664 => 279665)
--- trunk/Tools/ChangeLog 2021-07-07 20:39:26 UTC (rev 279664)
+++ trunk/Tools/ChangeLog 2021-07-07 20:50:19 UTC (rev 279665)
@@ -1,3 +1,12 @@
+2021-07-07 Aakash Jain
+
+[build.webkit.org] Add unit-tests for RunWebKit1Tests
+https://bugs.webkit.org/show_bug.cgi?id=227658
+
+Reviewed by Alexey Proskuryakov.
+
+* CISupport/build-webkit-org/steps_unittest.py:
+
2021-07-06 Harshil Ratnu
Add myself (Harshil Ratnu) to contributors.json
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [279525] trunk/Tools
Title: [279525] trunk/Tools Revision 279525 Author aakash_j...@apple.com Date 2021-07-02 16:40:06 -0700 (Fri, 02 Jul 2021) Log Message Delete unused BuildSlaveSupport symlink https://bugs.webkit.org/show_bug.cgi?id=227644 Reviewed by Dewei Zhu. * BuildSlaveSupport: Symlink removed. Modified Paths trunk/Tools/ChangeLog Removed Paths trunk/Tools/BuildSlaveSupport Diff Deleted: trunk/Tools/BuildSlaveSupport (279524 => 279525) --- trunk/Tools/BuildSlaveSupport 2021-07-02 23:21:00 UTC (rev 279524) +++ trunk/Tools/BuildSlaveSupport 2021-07-02 23:40:06 UTC (rev 279525) @@ -1 +0,0 @@ -link CISupport \ No newline at end of file Modified: trunk/Tools/ChangeLog (279524 => 279525) --- trunk/Tools/ChangeLog 2021-07-02 23:21:00 UTC (rev 279524) +++ trunk/Tools/ChangeLog 2021-07-02 23:40:06 UTC (rev 279525) @@ -1,3 +1,12 @@ +2021-07-02 Aakash Jain + +Delete unused BuildSlaveSupport symlink +https://bugs.webkit.org/show_bug.cgi?id=227644 + +Reviewed by Dewei Zhu. + +* BuildSlaveSupport: Symlink removed. + 2021-07-02 Commit Queue Unreviewed, reverting r279494. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [278989] trunk/Tools
Title: [278989] trunk/Tools
Revision 278989
Author aakash_j...@apple.com
Date 2021-06-17 09:04:15 -0700 (Thu, 17 Jun 2021)
Log Message
[ews] Improve build summary about finding flaky test in ReRunWebKitTests
https://bugs.webkit.org/show_bug.cgi?id=227123
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(ReRunWebKitTests.evaluateCommand):
* CISupport/ews-build/steps_unittest.py:
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (278988 => 278989)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-06-17 15:57:59 UTC (rev 278988)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-06-17 16:04:15 UTC (rev 278989)
@@ -2350,7 +2350,7 @@
message = 'Passed layout tests'
self.descriptionDone = message
self.build.results = SUCCESS
-if not first_results_did_exceed_test_failure_limit:
+if (not first_results_did_exceed_test_failure_limit) and flaky_failures:
pluralSuffix = 's' if len(flaky_failures) > 1 else ''
message = 'Found flaky test{}: {}'.format(pluralSuffix, flaky_failures_string)
for flaky_failure in flaky_failures:
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (278988 => 278989)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-06-17 15:57:59 UTC (rev 278988)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-06-17 16:04:15 UTC (rev 278989)
@@ -1915,7 +1915,25 @@
self.assertEqual(self.getProperty('build_summary'), 'Found flaky tests: test1, test2')
return rc
+def test_first_run_failed_unexpectedly(self):
+self.configureStep()
+self.setProperty('fullPlatform', 'ios-simulator')
+self.setProperty('configuration', 'release')
+self.setProperty('first_run_failures', [])
+self.expectRemoteCommands(
+ExpectShell(workdir='wkdir',
+logfiles={'json': self.jsonFileName},
+logEnviron=False,
+command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '30', '--skip-failing-tests'],
+)
++ 0,
+)
+self.expectOutcome(result=SUCCESS, state_string='Passed layout tests')
+rc = self.runStep()
+self.assertEqual(self.getProperty('build_summary'), 'Passed layout tests')
+return rc
+
class TestRunWebKitTestsInStressMode(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
Modified: trunk/Tools/ChangeLog (278988 => 278989)
--- trunk/Tools/ChangeLog 2021-06-17 15:57:59 UTC (rev 278988)
+++ trunk/Tools/ChangeLog 2021-06-17 16:04:15 UTC (rev 278989)
@@ -1,3 +1,14 @@
+2021-06-17 Aakash Jain
+
+[ews] Improve build summary about finding flaky test in ReRunWebKitTests
+https://bugs.webkit.org/show_bug.cgi?id=227123
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(ReRunWebKitTests.evaluateCommand):
+* CISupport/ews-build/steps_unittest.py:
+
2021-06-17 David Kilzer
REGRESSION (r278536): Wrong comment character used in coverage.xcconfig
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [278455] trunk/Tools
Title: [278455] trunk/Tools
Revision 278455
Author aakash_j...@apple.com
Date 2021-06-04 07:19:18 -0700 (Fri, 04 Jun 2021)
Log Message
[ews] Speed up ews status bubble loading speed
https://bugs.webkit.org/show_bug.cgi?id=214821
Reviewed by Jonathan Bedard.
This change does a trade-off between accuracy of queue position vs status-bubble loading time.
This would reduce the calculations needed for queue position computation, but the position
might not be accurate if the queue has a backlog of more than 12 hours (which shouldn't be
the case normally). If the backlog is less than 12 hours, then the queue position will be accurate.
Also, this patch separates the logic of when to hide the status-bubble. Status-bubble will now be hidden
after 7 days of no build. However, if patch is waiting for more than 12 hours, but less than 7 days,
instead of computing the exact queue position, we do not display queue position.
* CISupport/ews-app/ews/views/statusbubble.py:
(StatusBubble):
(StatusBubble._build_bubble):
(StatusBubble._queue_position):
Modified Paths
trunk/Tools/CISupport/ews-app/ews/templates/statusbubble.html
trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-app/ews/templates/statusbubble.html (278454 => 278455)
--- trunk/Tools/CISupport/ews-app/ews/templates/statusbubble.html 2021-06-04 14:04:35 UTC (rev 278454)
+++ trunk/Tools/CISupport/ews-app/ews/templates/statusbubble.html 2021-06-04 14:19:18 UTC (rev 278455)
@@ -29,6 +29,12 @@
.status:hover {
border-color: rgba(1, 1, 1, 0.7);
}
+.cancelled {
+text-decoration: line-through
+}
+.skipped {
+text-decoration: line-through
+}
.pass {
background-color: #8FDF5F;
}
Modified: trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py (278454 => 278455)
--- trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2021-06-04 14:04:35 UTC (rev 278454)
+++ trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2021-06-04 14:19:18 UTC (rev 278455)
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 Apple Inc. All rights reserved.
+# Copyright (C) 2018-2021 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -72,10 +72,12 @@
'^Validated commiter$', '^Validated commiter and reviewer$', '^Validated ChangeLog and Reviewer$',
'^Removed flags on bugzilla patch$', '^Checked patch status on other queues$', '^Identifier:.*$',
'^Updated branch information$', '^worker .* ready$']
-DAYS_TO_CHECK = 1
+DAYS_TO_CHECK_QUEUE_POSITION = 0.5
+DAYS_TO_HIDE_BUBBLE = 7
BUILDER_ICON = u'\U0001f6e0'
TESTER_ICON = u'\U0001f9ea'
BUILD_RETRY_MSG = 'retrying build'
+UNKNOWN_QUEUE_POSITION = '?'
def _build_bubble(self, patch, queue, hide_icons=False):
bubble = {
@@ -100,9 +102,10 @@
if not build:
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
+if queue_position != StatusBubble.UNKNOWN_QUEUE_POSITION:
+bubble['queue_position'] = queue_position
if self._get_parent_queue(queue):
queue = self._get_parent_queue(queue)
queue_full_name = Buildbot.queue_name_by_shortname_mapping.get(queue)
@@ -129,7 +132,7 @@
bubble['url'] = 'https://{}/#/builders/{}'.format(config.BUILDBOT_SERVER_HOST, queue_full_name)
elif build.result == Buildbot.SUCCESS:
if is_parent_build:
-if patch.created < (timezone.now() - datetime.timedelta(days=StatusBubble.DAYS_TO_CHECK)):
+if patch.created < (timezone.now() - datetime.timedelta(days=StatusBubble.DAYS_TO_HIDE_BUBBLE)):
# 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.
@@ -162,7 +165,7 @@
if StatusBubble.BUILD_RETRY_MSG in bubble['details_message']:
bubble['state'] = 'provisional-fail'
elif build.result == Buildbot.SKIPPED:
-bubble['state'] = 'none'
+bubble['state'] = 'skipped'
bubble['details_message'] = 'The patch is no longer eligible for processing.'
if re.search(r'Bug .* is already closed', build.state_string):
bubble['details_message'] += ' Bug was already closed when EWS attempted to process it.'
@@ -182,7 +185,7 @@
bubble['state'] = 'provisional-fail'
bubble['details_message']
[webkit-changes] [278310] trunk/Tools
Title: [278310] trunk/Tools
Revision 278310
Author aakash_j...@apple.com
Date 2021-06-01 09:28:23 -0700 (Tue, 01 Jun 2021)
Log Message
Print bot configuration in build.webkit.org builds
https://bugs.webkit.org/show_bug.cgi?id=226353
Reviewed by Jonathan Bedard.
* CISupport/build-webkit-org/factories.py:
(Factory.__init__): Added PrintConfiguration step.
* CISupport/build-webkit-org/steps.py:
(PrintConfiguration): Copied from ews code, step to print configuration.
(PrintConfiguration.__init__):
(PrintConfiguration.run):
(PrintConfiguration.convert_build_to_os_name):
(PrintConfiguration.getResultSummary):
* CISupport/build-webkit-org/steps_unittest.py: Added unit-tests.
Modified Paths
trunk/Tools/CISupport/build-webkit-org/factories.py
trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/factories.py (278309 => 278310)
--- trunk/Tools/CISupport/build-webkit-org/factories.py 2021-06-01 15:34:54 UTC (rev 278309)
+++ trunk/Tools/CISupport/build-webkit-org/factories.py 2021-06-01 16:28:23 UTC (rev 278310)
@@ -30,6 +30,7 @@
def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments, device_model):
factory.BuildFactory.__init__(self)
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(ShowIdentifier())
if not (platform == "jsc-only"):
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (278309 => 278310)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-06-01 15:34:54 UTC (rev 278309)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-06-01 16:28:23 UTC (rev 278310)
@@ -20,18 +20,18 @@
# 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 buildbot.plugins import steps, util
from buildbot.process import buildstep, factory, logobserver, properties
from buildbot.process.results import Results, SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION, RETRY
from buildbot.steps import master, shell, transfer, trigger
from buildbot.steps.source.svn import SVN
-
from twisted.internet import defer
+import json
import os
import re
import socket
import sys
-import json
import urllib
if sys.version_info < (3, 5):
@@ -1155,6 +1155,84 @@
return master.MasterShellCommand.finished(self, result)
+class PrintConfiguration(steps.ShellSequence):
+name = 'configuration'
+description = ['configuration']
+haltOnFailure = False
+flunkOnFailure = False
+warnOnFailure = False
+logEnviron = False
+command_list_generic = [['hostname']]
+command_list_apple = [['df', '-hl'], ['date'], ['sw_vers'], ['xcodebuild', '-sdk', '-version'], ['uptime']]
+command_list_linux = [['df', '-hl'], ['date'], ['uname', '-a'], ['uptime']]
+command_list_win = [['df', '-hl']]
+
+def __init__(self, **kwargs):
+super(PrintConfiguration, self).__init__(timeout=60, **kwargs)
+self.commands = []
+self.log_observer = logobserver.BufferLogObserver(wantStderr=True)
+self.addLogObserver('stdio', self.log_observer)
+
+def run(self):
+command_list = list(self.command_list_generic)
+platform = self.getProperty('platform', '*')
+if platform != 'jsc-only':
+platform = platform.split('-')[0]
+if platform in ('mac', 'ios', 'tvos', 'watchos', '*'):
+command_list.extend(self.command_list_apple)
+elif platform in ('gtk', 'wpe', 'jsc-only'):
+command_list.extend(self.command_list_linux)
+elif platform in ('win'):
+command_list.extend(self.command_list_win)
+
+for command in command_list:
+self.commands.append(util.ShellArg(command=command, logname='stdio'))
+return super(PrintConfiguration, self).run()
+
+def convert_build_to_os_name(self, build):
+if not build:
+return 'Unknown'
+
+build_to_name_mapping = {
+'11': 'Big Sur',
+'10.15': 'Catalina',
+'10.14': 'Mojave',
+'10.13': 'High Sierra',
+'10.12': 'Sierra',
+'10.11': 'El Capitan',
+'10.10': 'Yosemite',
+'10.9': 'Maverick',
+'10.8': 'Mountain Lion',
+'10.7': 'Lion',
+'10.6': 'Snow Leopard',
+'10.5': 'Leopard',
+}
+
+for key, value in build_to_name_mapping.items():
+if build.startswith(key):
+return value
+return 'Unknown'
+
+def getResultSummary(self):
+if self.results != SUCCESS:
+
[webkit-changes] [278291] trunk/Source/WebCore
Title: [278291] trunk/Source/WebCore Revision 278291 Author aakash_j...@apple.com Date 2021-05-31 18:35:29 -0700 (Mon, 31 May 2021) Log Message REGRESSION(r278261): Broke windows build - follow-up fix https://bugs.webkit.org/show_bug.cgi?id=226477 Unreviewed build fix. * css/calc/CSSCalcValue.cpp: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/calc/CSSCalcValue.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (278290 => 278291) --- trunk/Source/WebCore/ChangeLog 2021-06-01 01:17:13 UTC (rev 278290) +++ trunk/Source/WebCore/ChangeLog 2021-06-01 01:35:29 UTC (rev 278291) @@ -1,3 +1,12 @@ +2021-05-31 Aakash Jain + +REGRESSION(r278261): Broke windows build - follow-up fix +https://bugs.webkit.org/show_bug.cgi?id=226477 + +Unreviewed build fix. + +* css/calc/CSSCalcValue.cpp: + 2021-05-31 Commit Queue Unreviewed, reverting r278261. Modified: trunk/Source/WebCore/css/calc/CSSCalcValue.cpp (278290 => 278291) --- trunk/Source/WebCore/css/calc/CSSCalcValue.cpp 2021-06-01 01:17:13 UTC (rev 278290) +++ trunk/Source/WebCore/css/calc/CSSCalcValue.cpp 2021-06-01 01:35:29 UTC (rev 278291) @@ -37,7 +37,6 @@ #include "CSSCalcNegateNode.h" #include "CSSCalcOperationNode.h" #include "CSSCalcPrimitiveValueNode.h" -#include "CSSCalcSymbolTable.h" #include "CSSParser.h" #include "CSSParserTokenRange.h" #include "CSSPrimitiveValueMappings.h" ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [278124] trunk/Tools
Title: [278124] trunk/Tools
Revision 278124
Author aakash_j...@apple.com
Date 2021-05-26 14:05:17 -0700 (Wed, 26 May 2021)
Log Message
Do not skip SetCommitQueueMinusFlagOnPatch step on EWS test instances
https://bugs.webkit.org/show_bug.cgi?id=226289
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(SetCommitQueueMinusFlagOnPatch.start):
(SetCommitQueueMinusFlagOnPatch.doStepIf): Deleted.
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (278123 => 278124)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-05-26 20:39:11 UTC (rev 278123)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-05-26 21:05:17 UTC (rev 278124)
@@ -1028,7 +1028,9 @@
patch_id = self.getProperty('patch_id', '')
build_finish_summary = self.getProperty('build_finish_summary', None)
-rc = self.set_cq_minus_flag_on_patch(patch_id)
+rc = SKIPPED
+if CURRENT_HOSTNAME == EWS_BUILD_HOSTNAME:
+rc = self.set_cq_minus_flag_on_patch(patch_id)
self.finished(rc)
if build_finish_summary:
self.build.buildFinished([build_finish_summary], FAILURE)
@@ -1041,10 +1043,7 @@
return buildstep.BuildStep.getResultSummary(self)
return {'step': 'Failed to set cq- flag on patch'}
-def doStepIf(self, step):
-return CURRENT_HOSTNAME == EWS_BUILD_HOSTNAME
-
class RemoveFlagsOnPatch(buildstep.BuildStep, BugzillaMixin):
name = 'remove-flags-from-patch'
flunkOnFailure = False
Modified: trunk/Tools/ChangeLog (278123 => 278124)
--- trunk/Tools/ChangeLog 2021-05-26 20:39:11 UTC (rev 278123)
+++ trunk/Tools/ChangeLog 2021-05-26 21:05:17 UTC (rev 278124)
@@ -1,3 +1,14 @@
+2021-05-26 Aakash Jain
+
+Do not skip SetCommitQueueMinusFlagOnPatch step on EWS test instances
+https://bugs.webkit.org/show_bug.cgi?id=226289
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(SetCommitQueueMinusFlagOnPatch.start):
+(SetCommitQueueMinusFlagOnPatch.doStepIf): Deleted.
+
2021-05-26 Jonathan Bedard
[run-webkit-tests] Strip php support from webserver (Apache)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [277884] trunk/Tools
Title: [277884] trunk/Tools Revision 277884 Author aakash_j...@apple.com Date 2021-05-21 13:58:01 -0700 (Fri, 21 May 2021) Log Message Run layout tests in stress mode for 10 iterations on regular EWS layout-test queues https://bugs.webkit.org/show_bug.cgi?id=226097 Reviewed by Jonathan Bedard. * CISupport/ews-build/factories.py: * CISupport/ews-build/factories_unittest.py: * CISupport/ews-build/steps.py: (AnalyzePatch.getResultSummary): (FindModifiedLayoutTests.__init__): (FindModifiedLayoutTests.start): (RunWebKitTestsInStressMode): (RunWebKitTestsInStressMode.__init__): (RunWebKitTestsInStressMode.setLayoutTestCommand): (RunWebKitTestsInStressMode.doStepIf): * CISupport/ews-build/steps_unittest.py: Modified Paths trunk/Tools/CISupport/ews-build/factories.py trunk/Tools/CISupport/ews-build/factories_unittest.py trunk/Tools/CISupport/ews-build/steps.py trunk/Tools/CISupport/ews-build/steps_unittest.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/CISupport/ews-build/factories.py (277883 => 277884) --- trunk/Tools/CISupport/ews-build/factories.py 2021-05-21 20:48:34 UTC (rev 277883) +++ trunk/Tools/CISupport/ews-build/factories.py 2021-05-21 20:58:01 UTC (rev 277884) @@ -134,6 +134,8 @@ self.addStep(WaitForCrashCollection()) self.addStep(KillOldProcesses()) if self.LayoutTestClass: +self.addStep(FindModifiedLayoutTests(skipBuildIfNoResult=False)) +self.addStep(RunWebKitTestsInStressMode(num_iterations=10)) self.addStep(self.LayoutTestClass()) if self.APITestClass: self.addStep(self.APITestClass()) Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (277883 => 277884) --- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-05-21 20:48:34 UTC (rev 277883) +++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-05-21 20:58:01 UTC (rev 277884) @@ -456,6 +456,8 @@ _BuildStepFactory(steps.ExtractBuiltProduct), _BuildStepFactory(steps.WaitForCrashCollection), _BuildStepFactory(steps.KillOldProcesses), +_BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False), +_BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10), _BuildStepFactory(steps.RunWebKit1Tests), _BuildStepFactory(steps.TriggerCrashLogSubmission), _BuildStepFactory(steps.SetBuildSummary), @@ -478,6 +480,8 @@ _BuildStepFactory(steps.ExtractBuiltProduct), _BuildStepFactory(steps.WaitForCrashCollection), _BuildStepFactory(steps.KillOldProcesses), +_BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False), +_BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10), _BuildStepFactory(steps.RunWebKit1Tests), _BuildStepFactory(steps.TriggerCrashLogSubmission), _BuildStepFactory(steps.SetBuildSummary), @@ -499,6 +503,8 @@ _BuildStepFactory(steps.ExtractBuiltProduct), _BuildStepFactory(steps.WaitForCrashCollection), _BuildStepFactory(steps.KillOldProcesses), +_BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False), +_BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10), _BuildStepFactory(steps.RunWebKitTests), _BuildStepFactory(steps.TriggerCrashLogSubmission), _BuildStepFactory(steps.SetBuildSummary), @@ -520,6 +526,8 @@ _BuildStepFactory(steps.ExtractBuiltProduct), _BuildStepFactory(steps.WaitForCrashCollection), _BuildStepFactory(steps.KillOldProcesses), +_BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False), +_BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10), _BuildStepFactory(steps.RunWebKitTests), _BuildStepFactory(steps.TriggerCrashLogSubmission), _BuildStepFactory(steps.SetBuildSummary), @@ -541,6 +549,8 @@ _BuildStepFactory(steps.DownloadBuiltProduct), _BuildStepFactory(steps.ExtractBuiltProduct), _BuildStepFactory(steps.KillOldProcesses), +_BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False), +_BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10), _BuildStepFactory(steps.RunWebKitTests), _BuildStepFactory(steps.SetBuildSummary), ]) Modified: trunk/Tools/CISupport/ews-build/steps.py (277883 => 277884) --- trunk/Tools/CISupport/ews-build/steps.py 2021-05-21 20:48:34 UTC (rev 277883) +++ trunk/Tools/CISupport/ews-build/steps.py 2021-05-21 20:58:01 UTC (rev 277884) @@ -369,7 +369,7 @@ log.addStdout(message) def getResultSummary(self): -if self.results == FAILURE: +if self.results in [FAILURE, SKIPPED]:
[webkit-changes] [277825] trunk/Tools
Title: [277825] trunk/Tools
Revision 277825
Author aakash_j...@apple.com
Date 2021-05-20 14:28:20 -0700 (Thu, 20 May 2021)
Log Message
Use Python 3 for running various scripts on EWS
https://bugs.webkit.org/show_bug.cgi?id=226041
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py: Use Python 3.
(CleanBuild):
(TriggerCrashLogSubmission):
(WaitForCrashCollection):
(ArchiveBuiltProduct):
(ExtractBuiltProduct):
* CISupport/ews-build/steps_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (277824 => 277825)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-05-20 21:26:17 UTC (rev 277824)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-05-20 21:28:20 UTC (rev 277825)
@@ -2030,7 +2030,7 @@
name = 'delete-WebKitBuild-directory'
description = ['deleting WebKitBuild directory']
descriptionDone = ['Deleted WebKitBuild directory']
-command = ['python', 'Tools/CISupport/clean-build', WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s')]
+command = ['python3', 'Tools/CISupport/clean-build', WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s')]
class KillOldProcesses(shell.Compile):
@@ -2058,7 +2058,7 @@
name = 'trigger-crash-log-submission'
description = ['triggering crash log submission']
descriptionDone = ['Triggered crash log submission']
-command = ['python', 'Tools/CISupport/trigger-crash-log-submission']
+command = ['python3', 'Tools/CISupport/trigger-crash-log-submission']
def __init__(self, **kwargs):
super(TriggerCrashLogSubmission, self).__init__(timeout=60, logEnviron=False, **kwargs)
@@ -2073,7 +2073,7 @@
name = 'wait-for-crash-collection'
description = ['waiting-for-crash-collection-to-quiesce']
descriptionDone = ['Crash collection has quiesced']
-command = ['python', 'Tools/CISupport/wait-for-crash-collection', '--timeout', str(5 * 60)]
+command = ['python3', 'Tools/CISupport/wait-for-crash-collection', '--timeout', str(5 * 60)]
def __init__(self, **kwargs):
super(WaitForCrashCollection, self).__init__(timeout=6 * 60, logEnviron=False, **kwargs)
@@ -2627,7 +2627,7 @@
class ArchiveBuiltProduct(shell.ShellCommand):
-command = ['python', 'Tools/CISupport/built-product-archive',
+command = ['python3', 'Tools/CISupport/built-product-archive',
WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'archive']
name = 'archive-built-product'
description = ['archiving built product']
@@ -2747,7 +2747,7 @@
class ExtractBuiltProduct(shell.ShellCommand):
-command = ['python', 'Tools/CISupport/built-product-archive',
+command = ['python3', 'Tools/CISupport/built-product-archive',
WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'extract']
name = 'extract-built-product'
description = ['extracting built product']
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (277824 => 277825)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-05-20 21:26:17 UTC (rev 277824)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-05-20 21:28:20 UTC (rev 277825)
@@ -887,7 +887,7 @@
self.setProperty('configuration', 'release')
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
-command=['python', 'Tools/CISupport/clean-build', '--platform=ios-11', '--release'],
+command=['python3', 'Tools/CISupport/clean-build', '--platform=ios-11', '--release'],
)
+ 0,
)
@@ -900,7 +900,7 @@
self.setProperty('configuration', 'debug')
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
-command=['python', 'Tools/CISupport/clean-build', '--platform=ios-simulator-11', '--debug'],
+command=['python3', 'Tools/CISupport/clean-build', '--platform=ios-simulator-11', '--debug'],
)
+ ExpectShell.log('stdio', stdout='Unexpected error.')
+ 2,
@@ -2869,7 +2869,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
-command=['python', 'Tools/CISupport/built-product-archive', '--platform=ios-simulator', '--release', 'archive'],
+command=['python3', 'Tools/CISupport/built-product-archive', '--platform=ios-simulator', '--release', 'archive'],
)
+ 0,
)
@@ -2883,7 +2883,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
-
[webkit-changes] [277742] trunk/Tools
Title: [277742] trunk/Tools
Revision 277742
Author aakash_j...@apple.com
Date 2021-05-19 12:15:51 -0700 (Wed, 19 May 2021)
Log Message
Use Python 3 for running various scripts on build.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=225929
Reviewed by Jonathan Bedard.
* CISupport/build-webkit-org/steps.py: Use Python 3. Also removed ./ from invocation to match with ews code.
(TriggerCrashLogSubmission):
(WaitForCrashCollection):
(CleanBuildIfScheduled):
(DeleteStaleBuildFiles):
(ArchiveBuiltProduct):
(ArchiveMinifiedBuiltProduct):
(ExtractBuiltProduct):
* CISupport/build-webkit-org/steps_unittest.py: Updated unit-tests.
(TestCleanBuildIfScheduled.test_success):
(TestCleanBuildIfScheduled.test_failure):
* CISupport/built-product-archive: Updated shebang to Python 3.
* CISupport/clean-build:
* CISupport/delete-stale-build-files:
* CISupport/trigger-crash-log-submission:
* CISupport/wait-for-crash-collection:
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/CISupport/built-product-archive
trunk/Tools/CISupport/clean-build
trunk/Tools/CISupport/delete-stale-build-files
trunk/Tools/CISupport/trigger-crash-log-submission
trunk/Tools/CISupport/wait-for-crash-collection
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (277741 => 277742)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-05-19 19:15:51 UTC (rev 277742)
@@ -179,7 +179,7 @@
name = "trigger-crash-log-submission"
description = ["triggering crash log submission"]
descriptionDone = ["triggered crash log submission"]
-command = ["python", "./Tools/CISupport/trigger-crash-log-submission"]
+command = ["python3", "Tools/CISupport/trigger-crash-log-submission"]
class WaitForCrashCollection(shell.Compile):
@@ -186,7 +186,7 @@
name = "wait-for-crash-collection"
description = ["waiting for crash collection to quiesce"]
descriptionDone = ["crash collection has quiesced"]
-command = ["python", "./Tools/CISupport/wait-for-crash-collection", "--timeout", str(5 * 60)]
+command = ["python3", "Tools/CISupport/wait-for-crash-collection", "--timeout", str(5 * 60)]
class CleanBuildIfScheduled(shell.Compile):
@@ -193,7 +193,7 @@
name = "delete-WebKitBuild-directory"
description = ["deleting WebKitBuild directory"]
descriptionDone = ["deleted WebKitBuild directory"]
-command = ["python", "./Tools/CISupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+command = ["python3", "Tools/CISupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
def start(self):
if not self.getProperty('is_clean'):
@@ -206,7 +206,7 @@
name = "delete-stale-build-files"
description = ["deleting stale build files"]
descriptionDone = ["deleted stale build files"]
-command = ["python", "./Tools/CISupport/delete-stale-build-files", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+command = ["python3", "Tools/CISupport/delete-stale-build-files", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
def start(self):
if self.getProperty('is_clean'): # Nothing to be done if WebKitBuild had been removed.
@@ -322,7 +322,7 @@
class ArchiveBuiltProduct(shell.ShellCommand):
-command = ["python", "./Tools/CISupport/built-product-archive",
+command = ["python3", "Tools/CISupport/built-product-archive",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive"]
name = "archive-built-product"
description = ["archiving built product"]
@@ -331,7 +331,7 @@
class ArchiveMinifiedBuiltProduct(ArchiveBuiltProduct):
-command = ["python", "./Tools/CISupport/built-product-archive",
+command = ["python3", "Tools/CISupport/built-product-archive",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive", "--minify"]
@@ -358,7 +358,7 @@
class ExtractBuiltProduct(shell.ShellCommand):
-command = ["python", "./Tools/CISupport/built-product-archive",
+command = ["python3", "Tools/CISupport/built-product-archive",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "extract"]
name = "extract-built-product"
description = ["extracting built product"]
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (277741 => 277742)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-05-19 19:05:31 UTC (rev 277741)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-05-19 19:15:51 UTC (rev 277742)
@@ -276,7 +276,7 @@
[webkit-changes] [277673] trunk/Tools
Title: [277673] trunk/Tools
Revision 277673
Author aakash_j...@apple.com
Date 2021-05-18 13:35:38 -0700 (Tue, 18 May 2021)
Log Message
[ews] Style fixes in steps_unittest.py
https://bugs.webkit.org/show_bug.cgi?id=225932
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps_unittest.py:
Modified Paths
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (277672 => 277673)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-05-18 20:26:15 UTC (rev 277672)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-05-18 20:35:38 UTC (rev 277673)
@@ -1751,16 +1751,16 @@
rc = self.runStep()
self.assertEqual(self.getProperty(self.property_exceed_failure_limit), True)
self.assertEqual(self.getProperty(self.property_failures),
-['imported/blink/storage/indexeddb/blob-valid-before-commit.html',
- 'imported/w3c/web-platform-tests/IndexedDB/interleaved-cursors-large.html',
- 'imported/w3c/web-platform-tests/wasm/jsapi/constructor/instantiate-bad-imports.any.html',
- 'imported/w3c/web-platform-tests/wasm/jsapi/constructor/instantiate-bad-imports.any.worker.html',
- 'imported/w3c/web-platform-tests/wasm/jsapi/global/constructor.any.html',
- 'imported/w3c/web-platform-tests/wasm/jsapi/global/constructor.any.worker.html',
- 'imported/w3c/web-platform-tests/wasm/jsapi/global/toString.any.html',
- 'imported/w3c/web-platform-tests/wasm/jsapi/instance/constructor-bad-imports.any.html',
- 'imported/w3c/web-platform-tests/wasm/jsapi/interface.any.html',
- 'imported/w3c/web-platform-tests/wasm/jsapi/interface.any.worker.html'])
+ ['imported/blink/storage/indexeddb/blob-valid-before-commit.html',
+ 'imported/w3c/web-platform-tests/IndexedDB/interleaved-cursors-large.html',
+ 'imported/w3c/web-platform-tests/wasm/jsapi/constructor/instantiate-bad-imports.any.html',
+ 'imported/w3c/web-platform-tests/wasm/jsapi/constructor/instantiate-bad-imports.any.worker.html',
+ 'imported/w3c/web-platform-tests/wasm/jsapi/global/constructor.any.html',
+ 'imported/w3c/web-platform-tests/wasm/jsapi/global/constructor.any.worker.html',
+ 'imported/w3c/web-platform-tests/wasm/jsapi/global/toString.any.html',
+ 'imported/w3c/web-platform-tests/wasm/jsapi/instance/constructor-bad-imports.any.html',
+ 'imported/w3c/web-platform-tests/wasm/jsapi/interface.any.html',
+ 'imported/w3c/web-platform-tests/wasm/jsapi/interface.any.worker.html'])
return rc
def test_parse_results_json_flakes(self):
@@ -2908,11 +2908,9 @@
self.setProperty('patch_id', '1234')
self.expectHidden(False)
self.expectRemoteCommands(
-Expect('uploadFile', dict(
-workersrc='WebKitBuild/release.zip', workdir='wkdir',
-blocksize=1024 * 256, maxsize=None, keepstamp=False,
-writer=ExpectRemoteRef(remotetransfer.FileWriter),
- ))
+Expect('uploadFile', dict(workersrc='WebKitBuild/release.zip', workdir='wkdir',
+ blocksize=1024 * 256, maxsize=None, keepstamp=False,
+ writer=ExpectRemoteRef(remotetransfer.FileWriter)))
+ Expect.behavior(uploadFileWithContentsOfString('Dummy zip file content.'))
+ 0,
)
@@ -2929,11 +2927,9 @@
self.setProperty('patch_id', '1234')
self.expectHidden(False)
self.expectRemoteCommands(
-Expect('uploadFile', dict(
-workersrc='WebKitBuild/release.zip', workdir='wkdir',
-blocksize=1024 * 256, maxsize=None, keepstamp=False,
-writer=ExpectRemoteRef(remotetransfer.FileWriter),
- ))
+Expect('uploadFile', dict(workersrc='WebKitBuild/release.zip', workdir='wkdir',
+ blocksize=1024 * 256, maxsize=None, keepstamp=False,
+ writer=ExpectRemoteRef(remotetransfer.FileWriter)))
+ Expect.behavior(uploadFileWithContentsOfString('Dummy zip file content.'))
+ 1,
)
@@ -3127,7 +3123,7 @@
'--patch_id', '1234',
[webkit-changes] [277612] trunk/Tools
Title: [277612] trunk/Tools
Revision 277612
Author aakash_j...@apple.com
Date 2021-05-17 16:12:42 -0700 (Mon, 17 May 2021)
Log Message
Style checker should check for non-inclusive terminology
https://bugs.webkit.org/show_bug.cgi?id=213088
Reviewed by Jonathan Bedard.
Style checker should check for non-inclusive terminology so that we can avoid unintentional addition
of non-inclusive terminology in our codebase.
* Scripts/webkitpy/style/checkers/inclusive_language.py: Added inclusive language checker.
(InclusiveLanguageChecker):
(InclusiveLanguageChecker.check):
* Scripts/webkitpy/style/checkers/changelog.py: Check for inclusive language.
* Scripts/webkitpy/style/checkers/cpp.py: Ditto.
* Scripts/webkitpy/style/checkers/js.py: Ditto.
* Scripts/webkitpy/style/checkers/python.py: Ditto.
* Scripts/webkitpy/style/checkers/text.py: Ditto.
* Scripts/report-non-inclusive-language: Ignore the newly added inclusive_language.py file.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/report-non-inclusive-language
trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py
trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py
trunk/Tools/Scripts/webkitpy/style/checkers/js.py
trunk/Tools/Scripts/webkitpy/style/checkers/python.py
trunk/Tools/Scripts/webkitpy/style/checkers/text.py
Added Paths
trunk/Tools/Scripts/webkitpy/style/checkers/inclusive_language.py
Diff
Modified: trunk/Tools/ChangeLog (277611 => 277612)
--- trunk/Tools/ChangeLog 2021-05-17 23:03:34 UTC (rev 277611)
+++ trunk/Tools/ChangeLog 2021-05-17 23:12:42 UTC (rev 277612)
@@ -1,3 +1,22 @@
+2021-05-17 Aakash Jain
+
+Style checker should check for non-inclusive terminology
+https://bugs.webkit.org/show_bug.cgi?id=213088
+
+Reviewed by Jonathan Bedard.
+
+Style checker should check for non-inclusive terminology so that we can avoid unintentional addition
+of non-inclusive terminology in our codebase.
+* Scripts/webkitpy/style/checkers/inclusive_language.py: Added inclusive language checker.
+(InclusiveLanguageChecker):
+(InclusiveLanguageChecker.check):
+* Scripts/webkitpy/style/checkers/changelog.py: Check for inclusive language.
+* Scripts/webkitpy/style/checkers/cpp.py: Ditto.
+* Scripts/webkitpy/style/checkers/js.py: Ditto.
+* Scripts/webkitpy/style/checkers/python.py: Ditto.
+* Scripts/webkitpy/style/checkers/text.py: Ditto.
+* Scripts/report-non-inclusive-language: Ignore the newly added inclusive_language.py file.
+
2021-05-17 Alex Christensen
Fix clean build after r277606
Modified: trunk/Tools/Scripts/report-non-inclusive-language (277611 => 277612)
--- trunk/Tools/Scripts/report-non-inclusive-language 2021-05-17 23:03:34 UTC (rev 277611)
+++ trunk/Tools/Scripts/report-non-inclusive-language 2021-05-17 23:12:42 UTC (rev 277612)
@@ -44,7 +44,7 @@
IGNORE_DIRECTORIES = ['.svn', '.git', 'autoinstalled', 'buildstream', 'node_modules']
IGNORE_FILES_STARTING_WITH = ('ChangeLog')
IGNORE_FILES_ENDING_WITH = ('.log', '.order', '.pyc', '.swp', '.xcuserstate', '.db', '.db-shm', '.db-wal')
-IGNORE_FILE_NAMES = ['report-non-inclusive-language']
+IGNORE_FILE_NAMES = ['report-non-inclusive-language', 'inclusive_language.py']
parser = argparse.ArgumentParser(description='Report counts and locations of non-inclusive terms.')
parser.add_argument('--verbose', '-v', action='');
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py (277611 => 277612)
--- trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py 2021-05-17 23:03:34 UTC (rev 277611)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py 2021-05-17 23:12:42 UTC (rev 277612)
@@ -26,6 +26,7 @@
from sys import maxsize
from webkitpy.common.checkout.changelog import parse_bug_id_from_changelog
from webkitpy.style.checkers.common import TabChecker, match, search, searchIgnorecase
+from webkitpy.style.checkers.inclusive_language import InclusiveLanguageChecker
class ChangeLogChecker(object):
@@ -38,6 +39,7 @@
self.handle_style_error = handle_style_error
self.should_line_be_checked = should_line_be_checked
self._tab_checker = TabChecker(file_path, handle_style_error)
+self._inclusive_language_checker = InclusiveLanguageChecker(handle_style_error)
def check_entry(self, first_line_checked, entry_lines):
if not entry_lines:
@@ -79,6 +81,7 @@
def check(self, lines):
self._tab_checker.check(lines)
+self._inclusive_language_checker.check(lines)
first_line_checked = 0
entry_lines = []
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (277611 => 277612)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2021-05-17 23:03:34 UTC (rev 277611)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2021-05-17 23:12:42 UTC (rev 277612)
@@ -48,6 +48,7 @@
from webkitcorepy import unicode, Version
from
[webkit-changes] [277537] trunk/Tools
Title: [277537] trunk/Tools
Revision 277537
Author aakash_j...@apple.com
Date 2021-05-15 04:00:45 -0700 (Sat, 15 May 2021)
Log Message
report-non-inclusive-language should skip node_modules directory
https://bugs.webkit.org/show_bug.cgi?id=225827
Reviewed by Darin Adler.
* Scripts/report-non-inclusive-language: Skip node_modules directory as it contains external code.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/report-non-inclusive-language
Diff
Modified: trunk/Tools/ChangeLog (277536 => 277537)
--- trunk/Tools/ChangeLog 2021-05-15 07:40:46 UTC (rev 277536)
+++ trunk/Tools/ChangeLog 2021-05-15 11:00:45 UTC (rev 277537)
@@ -1,3 +1,12 @@
+2021-05-15 Aakash Jain
+
+report-non-inclusive-language should skip node_modules directory
+https://bugs.webkit.org/show_bug.cgi?id=225827
+
+Reviewed by Darin Adler.
+
+* Scripts/report-non-inclusive-language: Skip node_modules directory as it contains external code.
+
2021-05-14 Chris Dumez
Drop FileSystem::fileMetadata() / fileMetadataFollowingSymlinks()
Modified: trunk/Tools/Scripts/report-non-inclusive-language (277536 => 277537)
--- trunk/Tools/Scripts/report-non-inclusive-language 2021-05-15 07:40:46 UTC (rev 277536)
+++ trunk/Tools/Scripts/report-non-inclusive-language 2021-05-15 11:00:45 UTC (rev 277537)
@@ -41,7 +41,7 @@
[ "slave", "slave" ]
]
-IGNORE_DIRECTORIES = ['.svn', '.git', 'autoinstalled', 'buildstream']
+IGNORE_DIRECTORIES = ['.svn', '.git', 'autoinstalled', 'buildstream', 'node_modules']
IGNORE_FILES_STARTING_WITH = ('ChangeLog')
IGNORE_FILES_ENDING_WITH = ('.log', '.order', '.pyc', '.swp', '.xcuserstate', '.db', '.db-shm', '.db-wal')
IGNORE_FILE_NAMES = ['report-non-inclusive-language']
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [277476] trunk/Tools
Title: [277476] trunk/Tools Revision 277476 Author aakash_j...@apple.com Date 2021-05-13 19:06:04 -0700 (Thu, 13 May 2021) Log Message report-non-inclusive-language should skip symlinks https://bugs.webkit.org/show_bug.cgi?id=225789 Reviewed by Darin Adler. * Scripts/report-non-inclusive-language: Skip symlinks since most likely the linked file would be checked directly by the script while iterating the directory structure and would result in it being counted twice. Also the script fails with an error if there is a symlink pointing to a non-existing file. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/report-non-inclusive-language Diff Modified: trunk/Tools/ChangeLog (277475 => 277476) --- trunk/Tools/ChangeLog 2021-05-14 02:03:43 UTC (rev 277475) +++ trunk/Tools/ChangeLog 2021-05-14 02:06:04 UTC (rev 277476) @@ -1,5 +1,16 @@ 2021-05-13 Aakash Jain +report-non-inclusive-language should skip symlinks +https://bugs.webkit.org/show_bug.cgi?id=225789 + +Reviewed by Darin Adler. + +* Scripts/report-non-inclusive-language: Skip symlinks since most likely the linked file would be checked +directly by the script while iterating the directory structure and would result in it being counted twice. +Also the script fails with an error if there is a symlink pointing to a non-existing file. + +2021-05-13 Aakash Jain + [ews] Style fixes in steps.py https://bugs.webkit.org/show_bug.cgi?id=225784 Modified: trunk/Tools/Scripts/report-non-inclusive-language (277475 => 277476) --- trunk/Tools/Scripts/report-non-inclusive-language 2021-05-14 02:03:43 UTC (rev 277475) +++ trunk/Tools/Scripts/report-non-inclusive-language 2021-05-14 02:06:04 UTC (rev 277476) @@ -67,6 +67,8 @@ continue if file in IGNORE_FILE_NAMES: continue +if os.path.islink(os.path.join(subroot, file)): +continue handle = open(os.path.join(subroot, file), "r") for line in handle.readlines(): for term in nonInclusiveTerms: ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [277465] trunk/Tools
Title: [277465] trunk/Tools
Revision 277465
Author aakash_j...@apple.com
Date 2021-05-13 16:31:11 -0700 (Thu, 13 May 2021)
Log Message
[ews] Style fixes in steps.py
https://bugs.webkit.org/show_bug.cgi?id=225784
Reviewed by Dewei Zhu.
* CISupport/ews-build/steps.py:
(CheckOutSource.__init__):
(ShowIdentifier.hideStepIf):
(BugzillaMixin.get_bugzilla_api_key):
(RunJavaScriptCoreTests.commandComplete):
(AnalyzeJSCTestsResults.send_email_for_pre_existing_failure):
(AnalyzeLayoutTestsResults._report_flaky_tests):
(DownloadBuiltProduct):
(AnalyzeAPITestsResults.analyzeResults.getAPITestFailures):
(AnalyzeAPITestsResults.send_email_for_pre_existing_failure):
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (277464 => 277465)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-05-13 23:27:20 UTC (rev 277464)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-05-13 23:31:11 UTC (rev 277465)
@@ -111,13 +111,13 @@
def __init__(self, repourl='https://github.com/WebKit/WebKit.git', **kwargs):
super(CheckOutSource, self).__init__(repourl=repourl,
-retry=self.CHECKOUT_DELAY_AND_MAX_RETRIES_PAIR,
-timeout=2 * 60 * 60,
-alwaysUseLatest=True,
-logEnviron=False,
-method='clean',
-progress=True,
-**kwargs)
+ retry=self.CHECKOUT_DELAY_AND_MAX_RETRIES_PAIR,
+ timeout=2 * 60 * 60,
+ alwaysUseLatest=True,
+ logEnviron=False,
+ method='clean',
+ progress=True,
+ **kwargs)
def getResultSummary(self):
if self.results == FAILURE:
@@ -254,6 +254,7 @@
def hideStepIf(self, results, step):
return results == SUCCESS
+
class CleanWorkingDirectory(shell.ShellCommand):
name = 'clean-working-directory'
description = ['clean-working-directory running']
@@ -715,7 +716,7 @@
try:
passwords = json.load(open('passwords.json'))
return passwords.get('BUGZILLA_API_KEY', '')
-except:
+except Exception as e:
print('Error in reading Bugzilla api key')
return ''
@@ -1836,15 +1837,15 @@
self._addToLog('stderr', 'ERROR: unable to parse data, exception: {}'.format(ex))
return
-if jsc_results.get('allMasmTestsPassed') == False:
+if jsc_results.get('allMasmTestsPassed') is False:
self.binaryFailures.append('testmasm')
-if jsc_results.get('allAirTestsPassed') == False:
+if jsc_results.get('allAirTestsPassed') is False:
self.binaryFailures.append('testair')
-if jsc_results.get('allB3TestsPassed') == False:
+if jsc_results.get('allB3TestsPassed') is False:
self.binaryFailures.append('testb3')
-if jsc_results.get('allDFGTestsPassed') == False:
+if jsc_results.get('allDFGTestsPassed') is False:
self.binaryFailures.append('testdfg')
-if jsc_results.get('allApiTestsPassed') == False:
+if jsc_results.get('allApiTestsPassed') is False:
self.binaryFailures.append('testapi')
self.stressTestFailures = jsc_results.get('stressTestFailures')
@@ -2025,7 +2026,6 @@
print('Error in sending email for pre-existing failure: {}'.format(e))
-
class CleanBuild(shell.Compile):
name = 'delete-WebKitBuild-directory'
description = ['deleting WebKitBuild directory']
@@ -2543,7 +2543,7 @@
print('Error in sending email for new layout test failures: {}'.format(e))
def _report_flaky_tests(self, flaky_tests):
-#TODO: implement this
+# TODO: implement this
pass
def start(self):
@@ -2700,8 +2700,8 @@
class DownloadBuiltProduct(shell.ShellCommand):
command = ['python', 'Tools/CISupport/download-built-product',
-WithProperties('--%(configuration)s'),
-WithProperties(S3URL + 'ews-archives.webkit.org/%(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']
@@ -2874,8 +2874,8 @@
return set([])
[webkit-changes] [277395] trunk/Tools
Title: [277395] trunk/Tools
Revision 277395
Author aakash_j...@apple.com
Date 2021-05-12 15:07:49 -0700 (Wed, 12 May 2021)
Log Message
[build.webkit.org] Bots should automatically recover from svn checkout is already locked issue
https://bugs.webkit.org/show_bug.cgi?id=225717
Reviewed by Jonathan Bedard.
* CISupport/build-webkit-org/steps.py:
(CheckOutSource): Set haltOnFailure to False so that cleanup step can run. Also set the step name while we are at it.
(CheckOutSource.__init__): Also set logEnviron to False.
(CheckOutSource.getResultSummary): Run SVNCleanup step in case of failure.
(SVNCleanup):
(SVNCleanup.__init__):
(SVNCleanup.evaluateCommand):
* CISupport/build-webkit-org/steps_unittest.py: Added unit-tests for the new step.
Modified Paths
trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (277394 => 277395)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-05-12 22:02:32 UTC (rev 277394)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-05-12 22:07:49 UTC (rev 277395)
@@ -21,7 +21,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from buildbot.process import buildstep, factory, logobserver, properties
-from buildbot.process.results import Results, SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION
+from buildbot.process.results import Results, SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION, RETRY
from buildbot.steps import master, shell, transfer, trigger
from buildbot.steps.source.svn import SVN
@@ -130,12 +130,38 @@
class CheckOutSource(SVN, object):
+name = 'clean-and-update-working-directory'
+haltOnFailure = False
+
def __init__(self, **kwargs):
kwargs['repourl'] = 'https://svn.webkit.org/repository/webkit/trunk'
kwargs['mode'] = 'incremental'
+kwargs['logEnviron'] = False
super(CheckOutSource, self).__init__(**kwargs)
+def getResultSummary(self):
+if self.results == FAILURE:
+self.build.addStepsAfterCurrentStep([SVNCleanup()])
+if self.results != SUCCESS:
+return {'step': 'Failed to updated working directory'}
+else:
+return {'step': 'Cleaned and updated working directory'}
+
+
+class SVNCleanup(shell.ShellCommand):
+name = 'svn-cleanup'
+command = ['svn', 'cleanup']
+descriptionDone = ['Run svn cleanup']
+
+def __init__(self, **kwargs):
+super(SVNCleanup, self).__init__(timeout=10 * 60, logEnviron=False, **kwargs)
+
+def evaluateCommand(self, cmd):
+self.build.buildFinished(['svn issue, retrying build'], RETRY)
+return super(SVNCleanup, self).evaluateCommand(cmd)
+
+
class InstallWin32Dependencies(shell.Compile):
description = ["installing dependencies"]
descriptionDone = ["installed dependencies"]
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (277394 => 277395)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-05-12 22:02:32 UTC (rev 277394)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-05-12 22:07:49 UTC (rev 277395)
@@ -991,3 +991,39 @@
)
self.expectOutcome(result=FAILURE, state_string='failed (1) (failure)')
return self.runStep()
+
+
+class TestSVNCleanup(BuildStepMixinAdditions, unittest.TestCase):
+def setUp(self):
+self.longMessage = True
+return self.setUpBuildStep()
+
+def tearDown(self):
+return self.tearDownBuildStep()
+
+def test_success(self):
+self.setupStep(SVNCleanup())
+self.expectRemoteCommands(
+ExpectShell(
+workdir='wkdir',
+timeout=600,
+logEnviron=False,
+command=['svn', 'cleanup'],
+) + 0,
+)
+self.expectOutcome(result=SUCCESS, state_string='Run svn cleanup')
+return self.runStep()
+
+def test_failure(self):
+self.setupStep(SVNCleanup())
+self.expectRemoteCommands(
+ExpectShell(
+workdir='wkdir',
+timeout=600,
+logEnviron=False,
+command=['svn', 'cleanup'],
+) + 2
++ ExpectShell.log('stdio', stdout='Unexpected error.'),
+)
+self.expectOutcome(result=FAILURE, state_string='Run svn cleanup (failure)')
+return self.runStep()
Modified: trunk/Tools/ChangeLog (277394 => 277395)
--- trunk/Tools/ChangeLog 2021-05-12 22:02:32 UTC (rev 277394)
+++ trunk/Tools/ChangeLog 2021-05-12 22:07:49 UTC (rev 277395)
@@ -1,3 +1,19 @@
+2021-05-12 Aakash Jain
+
+[build.webkit.org] Bots should automatically recover from svn checkout is already locked issue
+https://bugs.webkit.org/show_bug.cgi?id=225717
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/build-webkit-org/steps.py:
+
[webkit-changes] [277275] trunk/Tools
Title: [277275] trunk/Tools
Revision 277275
Author aakash_j...@apple.com
Date 2021-05-10 11:10:51 -0700 (Mon, 10 May 2021)
Log Message
[build.webkit.org] Rename master_buildbot2.cfg to master.cfg
https://bugs.webkit.org/show_bug.cgi?id=222600
Reviewed by Jonathan Bedard.
* CISupport/build-webkit-org/buildbot.tac:
* CISupport/build-webkit-org/master.cfg: Moved from Tools/CISupport/build-webkit-org/master_buildbot2.cfg.
* CISupport/build-webkit-org/master_buildbot2.cfg: Removed.
Modified Paths
trunk/Tools/CISupport/build-webkit-org/buildbot.tac
trunk/Tools/ChangeLog
Added Paths
trunk/Tools/CISupport/build-webkit-org/master.cfg
Removed Paths
trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/buildbot.tac (277274 => 277275)
--- trunk/Tools/CISupport/build-webkit-org/buildbot.tac 2021-05-10 18:10:03 UTC (rev 277274)
+++ trunk/Tools/CISupport/build-webkit-org/buildbot.tac 2021-05-10 18:10:51 UTC (rev 277275)
@@ -4,7 +4,7 @@
from buildbot.master import BuildMaster
basedir = '.'
-configfile = r'master_buildbot2.cfg'
+configfile = 'master.cfg'
rotateLength = 5000
maxRotatedFiles = 20
umask = 0o022
Copied: trunk/Tools/CISupport/build-webkit-org/master.cfg (from rev 277274, trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg) (0 => 277275)
--- trunk/Tools/CISupport/build-webkit-org/master.cfg (rev 0)
+++ trunk/Tools/CISupport/build-webkit-org/master.cfg 2021-05-10 18:10:51 UTC (rev 277275)
@@ -0,0 +1,71 @@
+import json
+import os
+import sys
+
+from buildbot.changes.pb import PBChangeSource
+from buildbot.plugins import util
+from datetime import timedelta
+from loadConfig import *
+
+# This is work-around for https://bugs.webkit.org/show_bug.cgi?id=222361
+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
+
+c = BuildmasterConfig = {}
+
+c['change_source'] = PBChangeSource(port=16000)
+
+# permissions for WebStatus
+
+c['www'] = dict(port=8710, plugins=dict(waterfall_view={}, console_view={}, grid_view={}), allowed_origins=["*"])
+c['www']['ui_default_config'] = {
+'Builders.show_workers_name': True,
+'Builders.buildFetchLimit': 1000,
+'Workers.showWorkerBuilders': True,
+}
+
+if not is_test_mode_enabled:
+passwords = json.load(open('passwords.json'))
+admin_username = passwords.get('ADMIN_USERNAME')
+admin_password = passwords.get('ADMIN_PASSWORD')
+if not admin_username or not admin_password:
+print('\n\nERROR: Admin username/password missing from passwords.json.\n')
+sys.exit(1)
+# See https://docs.buildbot.net/2.10.0/manual/configuration/www.html#example-configs
+authz = util.Authz(
+allowRules=[util.AnyControlEndpointMatcher(role="admin")],
+roleMatchers=[util.RolesFromEmails(admin=[admin_username])]
+)
+auth = util.UserPasswordAuth({admin_username: admin_password})
+c['www']['auth'] = auth
+c['www']['authz'] = authz
+
+c['protocols'] = {'pb': {'port': 17000}}
+c['projectName'] = 'WebKit'
+c['projectURL'] = 'https://webkit.org'
+
+if is_test_mode_enabled:
+c['buildbotURL'] = 'http://localhost:8710/'
+else:
+c['buildbotURL'] = 'https://build.webkit.org/'
+passwords = json.load(open('passwords.json'))
+db_url = passwords.get('DB_URL')
+db_name = passwords.get('DB_NAME')
+db_username = passwords.get('DB_USERNAME')
+db_password = passwords.get('DB_PASSWORD')
+if None in [db_url, db_name, db_username, db_password]:
+print('\n\nERROR: Database information missing from passwords.json.\n')
+sys.exit(1)
+# See https://docs.buildbot.net/2.10.0/manual/configuration/global.html#database-specification
+c['db_url'] = 'postgresql://{}:{}@{}/{}'.format(db_username, db_password, db_url, db_name)
+# configure a janitor to delete old logs
+c['configurators'] = [util.JanitorConfigurator(logHorizon=timedelta(weeks=26), hour='1', dayOfWeek='*')]
+
+c['buildCacheSize'] = 60
+c['logCompressionMethod'] = 'lz4'
+c['buildbotNetUsageData'] = None
+
+loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)
Deleted: trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg (277274 => 277275)
--- trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg 2021-05-10 18:10:03 UTC (rev 277274)
+++ trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg 2021-05-10 18:10:51 UTC (rev 277275)
@@ -1,71 +0,0 @@
-import json
-import os
-import sys
-
-from buildbot.changes.pb import PBChangeSource
-from buildbot.plugins import util
-from datetime import timedelta
-from loadConfig import *
-
-# This is work-around for https://bugs.webkit.org/show_bug.cgi?id=222361
-from buildbot.process.buildstep import BuildStep
-BuildStep.warn_deprecated_if_oldstyle_subclass = lambda self, name: None
-
-
-is_test_mode_enabled =
[webkit-changes] [277180] trunk/Tools
Title: [277180] trunk/Tools Revision 277180 Author aakash_j...@apple.com Date 2021-05-07 11:06:20 -0700 (Fri, 07 May 2021) Log Message Use test-tube emoji for EWS status bubbles for tester queues https://bugs.webkit.org/show_bug.cgi?id=225517 Reviewed by Alan Bujtas. * CISupport/ews-app/ews/views/statusbubble.py: (StatusBubble): Modified Paths trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py (277179 => 277180) --- trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2021-05-07 17:24:48 UTC (rev 277179) +++ trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2021-05-07 18:06:20 UTC (rev 277180) @@ -74,7 +74,7 @@ '^Updated branch information$', '^worker .* ready$'] DAYS_TO_CHECK = 1 BUILDER_ICON = u'\U0001f6e0' -TESTER_ICON = u'\U0001f52c' +TESTER_ICON = u'\U0001f9ea' BUILD_RETRY_MSG = 'retrying build' def _build_bubble(self, patch, queue, hide_icons=False): Modified: trunk/Tools/ChangeLog (277179 => 277180) --- trunk/Tools/ChangeLog 2021-05-07 17:24:48 UTC (rev 277179) +++ trunk/Tools/ChangeLog 2021-05-07 18:06:20 UTC (rev 277180) @@ -1,3 +1,13 @@ +2021-05-07 Aakash Jain + +Use test-tube emoji for EWS status bubbles for tester queues +https://bugs.webkit.org/show_bug.cgi?id=225517 + +Reviewed by Alan Bujtas. + +* CISupport/ews-app/ews/views/statusbubble.py: +(StatusBubble): + 2021-05-07 Chris Dumez Add API test for FileSystem::fileExists() and FileSystem::fileMetadata() when dealing with symlinks to symlinks ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [277103] trunk/Tools
Title: [277103] trunk/Tools
Revision 277103
Author aakash_j...@apple.com
Date 2021-05-06 11:34:11 -0700 (Thu, 06 May 2021)
Log Message
EWS bubbles should show current status after pressing 'Retry failed builds' button
https://bugs.webkit.org/show_bug.cgi?id=225411
Reviewed by Jonathan Bedard.
* CISupport/ews-app/ews/views/statusbubble.py:
(StatusBubble._build_bubble):
Modified Paths
trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py (277102 => 277103)
--- trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2021-05-06 18:32:40 UTC (rev 277102)
+++ trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2021-05-06 18:34:11 UTC (rev 277103)
@@ -122,7 +122,11 @@
bubble['details_message'] = 'Build is in-progress. Recent messages:' + self._steps_messages_from_multiple_builds(builds)
elif build.retried:
bubble['state'] = 'started'
-bubble['details_message'] = 'Waiting for available bot to retry the build.\n\nRecent messages:' + self._steps_messages_from_multiple_builds(builds)
+bubble['details_message'] = 'Waiting for available bot to retry the build.'
+bubble['url'] = None
+queue_full_name = Buildbot.queue_name_by_shortname_mapping.get(queue)
+if queue_full_name:
+bubble['url'] = 'https://{}/#/builders/{}'.format(config.BUILDBOT_SERVER_HOST, queue_full_name)
elif build.result == Buildbot.SUCCESS:
if is_parent_build:
if patch.created < (timezone.now() - datetime.timedelta(days=StatusBubble.DAYS_TO_CHECK)):
Modified: trunk/Tools/ChangeLog (277102 => 277103)
--- trunk/Tools/ChangeLog 2021-05-06 18:32:40 UTC (rev 277102)
+++ trunk/Tools/ChangeLog 2021-05-06 18:34:11 UTC (rev 277103)
@@ -1,3 +1,13 @@
+2021-05-06 Aakash Jain
+
+EWS bubbles should show current status after pressing 'Retry failed builds' button
+https://bugs.webkit.org/show_bug.cgi?id=225411
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-app/ews/views/statusbubble.py:
+(StatusBubble._build_bubble):
+
2021-05-06 Jonathan Bedard
[webkitcorepy] Add API to efficiently create a sequence of commits
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [277043] trunk/Tools
Title: [277043] trunk/Tools
Revision 277043
Author aakash_j...@apple.com
Date 2021-05-05 14:52:35 -0700 (Wed, 05 May 2021)
Log Message
[build.webkit.org] Add a build step to set appropriate permissions on uploaded test results
https://bugs.webkit.org/show_bug.cgi?id=225415
Reviewed by Dewei Zhu.
* CISupport/build-webkit-org/factories.py:
(TestFactory.__init__): Added the build-step.
* CISupport/build-webkit-org/steps.py:
(ExtractTestResults.resultDirectoryURL):
(SetPermissions): Build step to set permissions on uploaded test result directory.
Modified Paths
trunk/Tools/CISupport/build-webkit-org/factories.py
trunk/Tools/CISupport/build-webkit-org/steps.py
trunk/Tools/CISupport/build-webkit-org/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/factories.py (277042 => 277043)
--- trunk/Tools/CISupport/build-webkit-org/factories.py 2021-05-05 21:33:04 UTC (rev 277042)
+++ trunk/Tools/CISupport/build-webkit-org/factories.py 2021-05-05 21:52:35 UTC (rev 277043)
@@ -114,6 +114,7 @@
self.addStep(ArchiveTestResults())
self.addStep(UploadTestResults())
self.addStep(ExtractTestResults())
+self.addStep(SetPermissions())
if platform == "gtk":
self.addStep(RunGtkAPITests())
if additionalArguments and "--display-server=wayland" in additionalArguments:
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (277042 => 277043)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-05-05 21:33:04 UTC (rev 277042)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-05-05 21:52:35 UTC (rev 277043)
@@ -1117,6 +1117,7 @@
master.MasterShellCommand.__init__(self, **kwargs)
def resultDirectoryURL(self):
+self.setProperty('result_directory', self.resultDirectory)
return self.resultDirectory.replace('public_html/', '/') + '/'
def addCustomURLs(self):
@@ -1128,6 +1129,16 @@
return master.MasterShellCommand.finished(self, result)
+class SetPermissions(master.MasterShellCommand):
+name = 'set-permissions'
+
+def __init__(self, **kwargs):
+resultDirectory = Interpolate('%(prop:result_directory)s')
+kwargs['command'] = ['chmod', 'a+rx', resultDirectory]
+kwargs['logEnviron'] = False
+master.MasterShellCommand.__init__(self, **kwargs)
+
+
class ShowIdentifier(shell.ShellCommand):
name = 'show-identifier'
identifier_re = '^Identifier: (.*)$'
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (277042 => 277043)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-05-05 21:33:04 UTC (rev 277042)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-05-05 21:52:35 UTC (rev 277043)
@@ -962,3 +962,32 @@
)
self.expectOutcome(result=FAILURE, state_string='9 JSC tests failed')
return self.runStep()
+
+
+class TestSetPermissions(BuildStepMixinAdditions, unittest.TestCase):
+def setUp(self):
+self.longMessage = True
+return self.setUpBuildStep()
+
+def tearDown(self):
+return self.tearDownBuildStep()
+
+def test_success(self):
+self.setupStep(SetPermissions())
+self.setProperty('result_directory', 'public_html/results/Apple-BigSur-Release-WK2-Tests/r277034 (2346)')
+self.expectLocalCommands(
+ExpectMasterShellCommand(command=['chmod', 'a+rx', 'public_html/results/Apple-BigSur-Release-WK2-Tests/r277034 (2346)'])
++ 0,
+)
+self.expectOutcome(result=SUCCESS, state_string='Ran')
+return self.runStep()
+
+def test_failure(self):
+self.setupStep(SetPermissions())
+self.setProperty('result_directory', 'testdir')
+self.expectLocalCommands(
+ExpectMasterShellCommand(command=['chmod', 'a+rx', 'testdir'])
++ 1,
+)
+self.expectOutcome(result=FAILURE, state_string='failed (1) (failure)')
+return self.runStep()
Modified: trunk/Tools/ChangeLog (277042 => 277043)
--- trunk/Tools/ChangeLog 2021-05-05 21:33:04 UTC (rev 277042)
+++ trunk/Tools/ChangeLog 2021-05-05 21:52:35 UTC (rev 277043)
@@ -1,3 +1,16 @@
+2021-05-05 Aakash Jain
+
+[build.webkit.org] Add a build step to set appropriate permissions on uploaded test results
+https://bugs.webkit.org/show_bug.cgi?id=225415
+
+Reviewed by Dewei Zhu.
+
+* CISupport/build-webkit-org/factories.py:
+(TestFactory.__init__): Added the build-step.
+* CISupport/build-webkit-org/steps.py:
+(ExtractTestResults.resultDirectoryURL):
+(SetPermissions): Build step to set permissions on uploaded test result directory.
+
2021-05-05 Alicia Boya GarcÃa
[MSE][GStreamer] WebKitMediaSrc rework v2
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
[webkit-changes] [276970] trunk/Tools
Title: [276970] trunk/Tools Revision 276970 Author aakash_j...@apple.com Date 2021-05-04 11:14:48 -0700 (Tue, 04 May 2021) Log Message [ews] Ensure file handles are not leaked in unit tests https://bugs.webkit.org/show_bug.cgi?id=225360 Reviewed by Jonathan Bedard. * CISupport/ews-build/email_unittest.py: (EmailsDotJSONTest.test_valid_emails_json): (EmailsDotJSONTest.test_emails_json_required_categories_present): * CISupport/ews-build/loadConfig_unittest.py: (ConfigDotJSONTest.get_config): Modified Paths trunk/Tools/CISupport/ews-build/email_unittest.py trunk/Tools/CISupport/ews-build/loadConfig_unittest.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/CISupport/ews-build/email_unittest.py (276969 => 276970) --- trunk/Tools/CISupport/ews-build/email_unittest.py 2021-05-04 18:04:16 UTC (rev 276969) +++ trunk/Tools/CISupport/ews-build/email_unittest.py 2021-05-04 18:14:48 UTC (rev 276970) @@ -31,14 +31,16 @@ class EmailsDotJSONTest(unittest.TestCase): def test_valid_emails_json(self): cwd = os.path.dirname(os.path.abspath(__file__)) -json.load(open(os.path.join(cwd, 'emails.json'))) +with open(os.path.join(cwd, 'emails.json')) as emails_json: +json.load(emails_json) def test_emails_json_required_categories_present(self): cwd = os.path.dirname(os.path.abspath(__file__)) -emails = json.load(open(os.path.join(cwd, 'emails.json'))) -valid_email_categories = ['ADMIN_EMAILS', 'APPLE_BOT_WATCHERS_EMAILS', 'EMAIL_IDS_TO_UNSUBSCRIBE', 'IGALIA_JSC_TEAM_EMAILS', 'IGALIA_GTK_WPE_EMAILS'] -for category in valid_email_categories: -self.assertTrue(category in list(emails.keys())) +with open(os.path.join(cwd, 'emails.json')) as emails_json: +emails = json.load(emails_json) +valid_email_categories = ['ADMIN_EMAILS', 'APPLE_BOT_WATCHERS_EMAILS', 'EMAIL_IDS_TO_UNSUBSCRIBE', 'IGALIA_JSC_TEAM_EMAILS', 'IGALIA_GTK_WPE_EMAILS'] +for category in valid_email_categories: +self.assertTrue(category in list(emails.keys())) if __name__ == '__main__': Modified: trunk/Tools/CISupport/ews-build/loadConfig_unittest.py (276969 => 276970) --- trunk/Tools/CISupport/ews-build/loadConfig_unittest.py 2021-05-04 18:04:16 UTC (rev 276969) +++ trunk/Tools/CISupport/ews-build/loadConfig_unittest.py 2021-05-04 18:14:48 UTC (rev 276970) @@ -33,7 +33,8 @@ class ConfigDotJSONTest(unittest.TestCase): def get_config(self): cwd = os.path.dirname(os.path.abspath(__file__)) -return json.load(open(os.path.join(cwd, 'config.json'))) +with open(os.path.join(cwd, 'config.json'), 'r') as config: +return json.load(config) def get_builder_from_config(self, config, builder_name): for builder in config['builders']: Modified: trunk/Tools/ChangeLog (276969 => 276970) --- trunk/Tools/ChangeLog 2021-05-04 18:04:16 UTC (rev 276969) +++ trunk/Tools/ChangeLog 2021-05-04 18:14:48 UTC (rev 276970) @@ -1,3 +1,16 @@ +2021-05-04 Aakash Jain + +[ews] Ensure file handles are not leaked in unit tests +https://bugs.webkit.org/show_bug.cgi?id=225360 + +Reviewed by Jonathan Bedard. + +* CISupport/ews-build/email_unittest.py: +(EmailsDotJSONTest.test_valid_emails_json): +(EmailsDotJSONTest.test_emails_json_required_categories_present): +* CISupport/ews-build/loadConfig_unittest.py: +(ConfigDotJSONTest.get_config): + 2021-05-04 Kate Cheney Unreviewed, adding myself as a reviewer. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276898] trunk/Tools
Title: [276898] trunk/Tools Revision 276898 Author aakash_j...@apple.com Date 2021-05-03 07:04:22 -0700 (Mon, 03 May 2021) Log Message Remove unused gtk_im_multicontext_get_slave from valgrind/suppressions.txt https://bugs.webkit.org/show_bug.cgi?id=225300 Reviewed by Žan Doberšek. * Scripts/valgrind/suppressions.txt: Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/valgrind/suppressions.txt Diff Modified: trunk/Tools/ChangeLog (276897 => 276898) --- trunk/Tools/ChangeLog 2021-05-03 12:29:01 UTC (rev 276897) +++ trunk/Tools/ChangeLog 2021-05-03 14:04:22 UTC (rev 276898) @@ -1,3 +1,12 @@ +2021-05-03 Aakash Jain + +Remove unused gtk_im_multicontext_get_slave from valgrind/suppressions.txt +https://bugs.webkit.org/show_bug.cgi?id=225300 + +Reviewed by Žan Doberšek. + +* Scripts/valgrind/suppressions.txt: + 2021-05-03 Youenn Fablet Use OptionSet for MediaProducer::MutedStateFlags Modified: trunk/Tools/Scripts/valgrind/suppressions.txt (276897 => 276898) --- trunk/Tools/Scripts/valgrind/suppressions.txt 2021-05-03 12:29:01 UTC (rev 276897) +++ trunk/Tools/Scripts/valgrind/suppressions.txt 2021-05-03 14:04:22 UTC (rev 276898) @@ -203,7 +203,6 @@ fun:malloc fun:g_malloc fun:g_strdup - fun:gtk_im_multicontext_get_slave fun:gtk_im_multicontext_set_client_window fun:gtk_im_context_set_client_window } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276878] trunk/Tools
Title: [276878] trunk/Tools
Revision 276878
Author aakash_j...@apple.com
Date 2021-05-01 18:32:13 -0700 (Sat, 01 May 2021)
Log Message
start-local-buildbot-server should fail gracefully for Python 2
https://bugs.webkit.org/show_bug.cgi?id=225268
Reviewed by Alexey Proskuryakov.
* CISupport/start-local-buildbot-server:
Modified Paths
trunk/Tools/CISupport/start-local-buildbot-server
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/start-local-buildbot-server (276877 => 276878)
--- trunk/Tools/CISupport/start-local-buildbot-server 2021-05-01 20:40:57 UTC (rev 276877)
+++ trunk/Tools/CISupport/start-local-buildbot-server 2021-05-02 01:32:13 UTC (rev 276878)
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
#
# Copyright (C) 2017, 2021 Igalia S.L.
+# Copyright (C) 2020 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
@@ -360,6 +361,10 @@
if __name__ == '__main__':
+if sys.version_info < (3, 5):
+print('ERROR: Please use Python 3. This script is not compatible with Python 2.')
+sys.exit(1)
+
parser = argparse.ArgumentParser()
configuration = parser.add_mutually_exclusive_group(required=True)
configuration.add_argument('--ews', action='', const='ews', dest='configuration',
Modified: trunk/Tools/ChangeLog (276877 => 276878)
--- trunk/Tools/ChangeLog 2021-05-01 20:40:57 UTC (rev 276877)
+++ trunk/Tools/ChangeLog 2021-05-02 01:32:13 UTC (rev 276878)
@@ -1,5 +1,14 @@
2021-05-01 Aakash Jain
+start-local-buildbot-server should fail gracefully for Python 2
+https://bugs.webkit.org/show_bug.cgi?id=225268
+
+Reviewed by Alexey Proskuryakov.
+
+* CISupport/start-local-buildbot-server:
+
+2021-05-01 Aakash Jain
+
Disable search engine crawling on build.webkit.org webpages
https://bugs.webkit.org/show_bug.cgi?id=225252
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276873] trunk/Tools
Title: [276873] trunk/Tools Revision 276873 Author aakash_j...@apple.com Date 2021-05-01 06:27:35 -0700 (Sat, 01 May 2021) Log Message Disable search engine crawling on build.webkit.org webpages https://bugs.webkit.org/show_bug.cgi?id=225252 Reviewed by Jonathan Bedard. Referencec: https://developers.google.com/search/docs/advanced/robots/create-robots-txt * CISupport/build-webkit-org/public_html/robots.txt: Modified Paths trunk/Tools/CISupport/build-webkit-org/public_html/robots.txt trunk/Tools/ChangeLog Diff Modified: trunk/Tools/CISupport/build-webkit-org/public_html/robots.txt (276872 => 276873) --- trunk/Tools/CISupport/build-webkit-org/public_html/robots.txt 2021-05-01 12:54:29 UTC (rev 276872) +++ trunk/Tools/CISupport/build-webkit-org/public_html/robots.txt 2021-05-01 13:27:35 UTC (rev 276873) @@ -1,16 +1,6 @@ User-agent: * -Disallow: /waterfall -Disallow: /builders -Disallow: /changes -Disallow: /buildslaves -Disallow: /schedulers -Disallow: /one_line_per_build -Disallow: /one_box_per_builder -Disallow: /xmlrpc -Disallow: /grid -Disallow: /tgrid -Disallow: /console -Disallow: /results -Disallow: /dashboard -Disallow: /LeaksViewer -Disallow: /TestFailures +Disallow: / + +User-agent: Googlebot +User-agent: AdsBot-Google +Disallow: / Modified: trunk/Tools/ChangeLog (276872 => 276873) --- trunk/Tools/ChangeLog 2021-05-01 12:54:29 UTC (rev 276872) +++ trunk/Tools/ChangeLog 2021-05-01 13:27:35 UTC (rev 276873) @@ -1,3 +1,14 @@ +2021-05-01 Aakash Jain + +Disable search engine crawling on build.webkit.org webpages +https://bugs.webkit.org/show_bug.cgi?id=225252 + +Reviewed by Jonathan Bedard. + +Referencec: https://developers.google.com/search/docs/advanced/robots/create-robots-txt + +* CISupport/build-webkit-org/public_html/robots.txt: + 2021-04-30 Wenson Hsieh App highlight UI should be disabled when selecting text in image overlays ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276843] trunk/Tools
Title: [276843] trunk/Tools
Revision 276843
Author aakash_j...@apple.com
Date 2021-04-30 10:29:54 -0700 (Fri, 30 Apr 2021)
Log Message
report-non-inclusive-language should skip buildstream directory
https://bugs.webkit.org/show_bug.cgi?id=225212
Reviewed by Alexey Proskuryakov.
* Scripts/report-non-inclusive-language:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/report-non-inclusive-language
Diff
Modified: trunk/Tools/ChangeLog (276842 => 276843)
--- trunk/Tools/ChangeLog 2021-04-30 17:06:11 UTC (rev 276842)
+++ trunk/Tools/ChangeLog 2021-04-30 17:29:54 UTC (rev 276843)
@@ -1,3 +1,12 @@
+2021-04-30 Aakash Jain
+
+report-non-inclusive-language should skip buildstream directory
+https://bugs.webkit.org/show_bug.cgi?id=225212
+
+Reviewed by Alexey Proskuryakov.
+
+* Scripts/report-non-inclusive-language:
+
2021-04-30 Jonathan Bedard
[webkitscpy] Support arguments to TaskPool setup and teardown
Modified: trunk/Tools/Scripts/report-non-inclusive-language (276842 => 276843)
--- trunk/Tools/Scripts/report-non-inclusive-language 2021-04-30 17:06:11 UTC (rev 276842)
+++ trunk/Tools/Scripts/report-non-inclusive-language 2021-04-30 17:29:54 UTC (rev 276843)
@@ -41,7 +41,7 @@
[ "slave", "slave" ]
]
-IGNORE_DIRECTORIES = ['.svn', '.git', 'autoinstalled']
+IGNORE_DIRECTORIES = ['.svn', '.git', 'autoinstalled', 'buildstream']
IGNORE_FILES_STARTING_WITH = ('ChangeLog')
IGNORE_FILES_ENDING_WITH = ('.log', '.order', '.pyc', '.swp', '.xcuserstate', '.db', '.db-shm', '.db-wal')
IGNORE_FILE_NAMES = ['report-non-inclusive-language']
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276766] trunk/Tools
Title: [276766] trunk/Tools
Revision 276766
Author aakash_j...@apple.com
Date 2021-04-29 05:28:12 -0700 (Thu, 29 Apr 2021)
Log Message
[webkitpy] Remove deprecated slave-config-json-path parameter in perftestsrunner.py
https://bugs.webkit.org/show_bug.cgi?id=225106
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/performance_tests/perftestsrunner.py:
(PerfTestsRunner._parse_args):
* Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
(MainTest.test_parse_deprecated_args): Deleted.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py
trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
Diff
Modified: trunk/Tools/ChangeLog (276765 => 276766)
--- trunk/Tools/ChangeLog 2021-04-29 11:50:30 UTC (rev 276765)
+++ trunk/Tools/ChangeLog 2021-04-29 12:28:12 UTC (rev 276766)
@@ -1,5 +1,17 @@
2021-04-29 Aakash Jain
+[webkitpy] Remove deprecated slave-config-json-path parameter in perftestsrunner.py
+https://bugs.webkit.org/show_bug.cgi?id=225106
+
+Reviewed by Ryosuke Niwa.
+
+* Scripts/webkitpy/performance_tests/perftestsrunner.py:
+(PerfTestsRunner._parse_args):
+* Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+(MainTest.test_parse_deprecated_args): Deleted.
+
+2021-04-29 Aakash Jain
+
Remove unused slave parameter from run-jsc-benchmarks script
https://bugs.webkit.org/show_bug.cgi?id=225153
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (276765 => 276766)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2021-04-29 11:50:30 UTC (rev 276765)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2021-04-29 12:28:12 UTC (rev 276766)
@@ -111,7 +111,7 @@
help="Path to generate a JSON file at; may contain previous results if it already exists."),
optparse.make_option("--reset-results", action=""
help="Clears the content in the generated JSON file before adding the results."),
-optparse.make_option("--slave-config-json-path", "--worker-config-json-path", action='',
+optparse.make_option("--worker-config-json-path", action='',
callback=_expand_path, type="str", dest="worker_config_json_path",
help="Only used on bots. Path to a worker configuration file."),
optparse.make_option("--description",
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py (276765 => 276766)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py 2021-04-29 11:50:30 UTC (rev 276765)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py 2021-04-29 12:28:12 UTC (rev 276766)
@@ -174,11 +174,6 @@
self.assertEqual(options.test_runner_count, 5)
self.assertEqual(options.no_timeout, True)
-def test_parse_deprecated_args(self):
-# FIXME: remove this test and the corresponding parameter after all instances of this deprecated parameter have been removed
-options, _ = PerfTestsRunner._parse_args(['--slave-config-json-path=a/source1.json'])
-self.assertEqual(options.worker_config_json_path, 'a/source1.json')
-
def test_upload_json(self):
runner, port = self.create_runner()
port.host.filesystem.files['/mock-checkout/some.json'] = 'some content'
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276765] trunk/Tools
Title: [276765] trunk/Tools Revision 276765 Author aakash_j...@apple.com Date 2021-04-29 04:50:30 -0700 (Thu, 29 Apr 2021) Log Message Remove unused slave parameter from run-jsc-benchmarks script https://bugs.webkit.org/show_bug.cgi?id=225153 Reviewed by Alexey Proskuryakov. * Scripts/run-jsc-benchmarks: Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/run-jsc-benchmarks Diff Modified: trunk/Tools/ChangeLog (276764 => 276765) --- trunk/Tools/ChangeLog 2021-04-29 10:36:35 UTC (rev 276764) +++ trunk/Tools/ChangeLog 2021-04-29 11:50:30 UTC (rev 276765) @@ -1,3 +1,12 @@ +2021-04-29 Aakash Jain + +Remove unused slave parameter from run-jsc-benchmarks script +https://bugs.webkit.org/show_bug.cgi?id=225153 + +Reviewed by Alexey Proskuryakov. + +* Scripts/run-jsc-benchmarks: + 2021-04-29 Sam Sneddon Make sure webkitpy tests pass on Linux and on more Python versions Modified: trunk/Tools/Scripts/run-jsc-benchmarks (276764 => 276765) --- trunk/Tools/Scripts/run-jsc-benchmarks 2021-04-29 10:36:35 UTC (rev 276764) +++ trunk/Tools/Scripts/run-jsc-benchmarks 2021-04-29 11:50:30 UTC (rev 276765) @@ -2891,7 +2891,6 @@ ['--remote', GetoptLong::REQUIRED_ARGUMENT], ['--local', GetoptLong::NO_ARGUMENT], ['--ssh-options', GetoptLong::REQUIRED_ARGUMENT], - ['--slave', GetoptLong::NO_ARGUMENT], ['--prepare-only', GetoptLong::NO_ARGUMENT], ['--analyze', GetoptLong::REQUIRED_ARGUMENT], ['--vms', GetoptLong::REQUIRED_ARGUMENT], ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276704] trunk/Tools
Title: [276704] trunk/Tools Revision 276704 Author aakash_j...@apple.com Date 2021-04-28 03:42:12 -0700 (Wed, 28 Apr 2021) Log Message Delete unused iExploder https://bugs.webkit.org/show_bug.cgi?id=225118 Rubber-stamped by Alexey Proskuryakov. * iExploder: Removed. Modified Paths trunk/Tools/ChangeLog Removed Paths trunk/Tools/iExploder/ Diff Modified: trunk/Tools/ChangeLog (276703 => 276704) --- trunk/Tools/ChangeLog 2021-04-28 09:36:57 UTC (rev 276703) +++ trunk/Tools/ChangeLog 2021-04-28 10:42:12 UTC (rev 276704) @@ -1,3 +1,12 @@ +2021-04-27 Aakash Jain + +Delete unused iExploder +https://bugs.webkit.org/show_bug.cgi?id=225118 + +Rubber-stamped by Alexey Proskuryakov. + +* iExploder: Removed. + 2021-04-27 Kimmo Kinnunen Add a Condition type that supports thread safety analysis ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276636] trunk/Tools
Title: [276636] trunk/Tools
Revision 276636
Author aakash_j...@apple.com
Date 2021-04-27 07:02:50 -0700 (Tue, 27 Apr 2021)
Log Message
Rename slave to worker in TestFailures
https://bugs.webkit.org/show_bug.cgi?id=225079
Reviewed by Jonathan Bedard.
* CISupport/build-webkit-org/public_html/TestFailures/scripts/Builder.js:
* CISupport/build-webkit-org/public_html/TestFailures/scripts/builders_unittests.js:
* CISupport/build-webkit-org/public_html/TestFailures/scripts/results_unittests.js:
Modified Paths
trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/Builder.js
trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/builders_unittests.js
trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/results_unittests.js
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/Builder.js (276635 => 276636)
--- trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/Builder.js 2021-04-27 11:50:47 UTC (rev 276635)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/Builder.js 2021-04-27 14:02:50 UTC (rev 276636)
@@ -145,7 +145,7 @@
}
if (layoutTestStep.results[0] === 4) {
-// This build step was interrupted (perhaps due to the build slave restarting).
+// This build step was interrupted (perhaps due to the build worker restarting).
PersistentCache.set(cacheKey, result);
callback(result.failureCount, result.tooManyFailures);
return;
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/builders_unittests.js (276635 => 276636)
--- trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/builders_unittests.js 2021-04-27 11:50:47 UTC (rev 276635)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/builders_unittests.js 2021-04-27 14:02:50 UTC (rev 276636)
@@ -34,7 +34,7 @@
"category": "6webkit linux latest",
"currentBuilds": [11462],
"pendingBuilds": 0,
-"slaves": ["vm124-m1"],
+"workers": ["vm124-m1"],
"state": "building"
},
"WebKit Mac10.6": {
@@ -43,7 +43,7 @@
"category": "6webkit linux latest",
"currentBuilds": [11461, 11462],
"pendingBuilds": 0,
-"slaves": ["vm124-m1"],
+"workers": ["vm124-m1"],
"state": "building"
},
"WebKit ASAN": {
@@ -52,7 +52,7 @@
"category": "6webkit linux latest",
"currentBuilds": [11461, 11462],
"pendingBuilds": 0,
-"slaves": ["vm124-m1"],
+"workers": ["vm124-m1"],
"state": "building"
},
};
@@ -64,7 +64,7 @@
"category": "6webkit linux latest",
"currentBuilds": [11462],
"pendingBuilds": 0,
-"slaves": ["vm124-m1"],
+"workers": ["vm124-m1"],
"state": "building"
},
"GTK Linux 64-bit Debug": {
@@ -73,7 +73,7 @@
"category": "6webkit linux latest",
"currentBuilds": [11461, 11462],
"pendingBuilds": 0,
-"slaves": ["vm124-m1"],
+"workers": ["vm124-m1"],
"state": "building"
},
"Qt Linux Release": {
@@ -82,7 +82,7 @@
"category": "6webkit linux latest",
"currentBuilds": [11461, 11462],
"pendingBuilds": 0,
-"slaves": ["vm124-m1"],
+"workers": ["vm124-m1"],
"state": "building"
},
};
@@ -116,7 +116,7 @@
["mastername", "chromium.webkit", "master.cfg"],
["revision", "92358", "Build"],
["scheduler", "s6_webkit_rel", "Scheduler"],
-["slavename", "vm124-m1", "BuildSlave"]
+["workername", "vm124-m1", "Worker"]
],
"reason": "",
"requests": [{
@@ -155,7 +155,7 @@
"submittedAt": 1312444298.989818
}],
"results": 2,
-"slave": "vm124-m1",
+"worker": "vm124-m1",
"sourceStamp": {
"branch": "trunk",
"changes": [{
@@ -376,11 +376,11 @@
["repository", "svn://svn-mirror.golo.chromium.org/chrome/trunk", "Build"],
["revision", "104939", "Build"],
["scheduler", "s1_chromium_dbg_dep", "Scheduler"],
-["slavename", "vm114-m1", "BuildSlave"]
+["workername", "vm114-m1", "Worker"]
],
"reason": "downstream",
"results": 2,
-"slave": "vm114-m1",
+"worker": "vm114-m1",
"sourceStamp": {
"branch": "src",
"changes": [{
@@ -641,11 +641,11 @@
["repository", "svn://svn-mirror.golo.chromium.org/chrome/trunk", "Build"],
["revision", "104939", "Build"],
["scheduler", "s1_chromium_dbg_dep", "Scheduler"],
-["slavename", "vm114-m1", "BuildSlave"]
+["workername", "vm114-m1", "Worker"]
],
"reason": "downstream",
"results": 2,
-"slave": "vm114-m1",
+"worker": "vm114-m1",
"sourceStamp": {
[webkit-changes] [276613] trunk/Tools
Title: [276613] trunk/Tools Revision 276613 Author aakash_j...@apple.com Date 2021-04-26 14:31:12 -0700 (Mon, 26 Apr 2021) Log Message [ews-app] Status bubble should only display important messages in pop-over - part 4 https://bugs.webkit.org/show_bug.cgi?id=225076 Reviewed by Jonathan Bedard. * CISupport/ews-app/ews/views/statusbubble.py: (StatusBubble): Modified Paths trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py (276612 => 276613) --- trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2021-04-26 21:03:49 UTC (rev 276612) +++ trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py 2021-04-26 21:31:12 UTC (rev 276613) @@ -70,7 +70,8 @@ '^Printed configuration$', '^Patch contains relevant changes$', '^Deleted .git/index.lock$', '^triggered.*$', '^Found modified ChangeLogs$', '^Created local git commit$', '^Set build summary$', '^Validated commiter$', '^Validated commiter and reviewer$', '^Validated ChangeLog and Reviewer$', - '^Removed flags on bugzilla patch$', '^Checked patch status on other queues$', '^Identifier:.*$'] + '^Removed flags on bugzilla patch$', '^Checked patch status on other queues$', '^Identifier:.*$', + '^Updated branch information$', '^worker .* ready$'] DAYS_TO_CHECK = 1 BUILDER_ICON = u'\U0001f6e0' TESTER_ICON = u'\U0001f52c' Modified: trunk/Tools/ChangeLog (276612 => 276613) --- trunk/Tools/ChangeLog 2021-04-26 21:03:49 UTC (rev 276612) +++ trunk/Tools/ChangeLog 2021-04-26 21:31:12 UTC (rev 276613) @@ -1,3 +1,13 @@ +2021-04-26 Aakash Jain + +[ews-app] Status bubble should only display important messages in pop-over - part 4 +https://bugs.webkit.org/show_bug.cgi?id=225076 + +Reviewed by Jonathan Bedard. + +* CISupport/ews-app/ews/views/statusbubble.py: +(StatusBubble): + 2021-04-26 Don Olmstead [CMake] Modernize WebKit GLib testing ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276561] trunk/Tools
Title: [276561] trunk/Tools Revision 276561 Author aakash_j...@apple.com Date 2021-04-24 17:50:32 -0700 (Sat, 24 Apr 2021) Log Message Rename slave to worker in webkitpy - part 2 https://bugs.webkit.org/show_bug.cgi?id=224988 Reviewed by Jonathan Bedard. * Scripts/webkitpy/common/system/crashlogs_unittest.py: Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py Diff Modified: trunk/Tools/ChangeLog (276560 => 276561) --- trunk/Tools/ChangeLog 2021-04-25 00:47:41 UTC (rev 276560) +++ trunk/Tools/ChangeLog 2021-04-25 00:50:32 UTC (rev 276561) @@ -1,3 +1,12 @@ +2021-04-24 Aakash Jain + +Rename slave to worker in webkitpy - part 2 +https://bugs.webkit.org/show_bug.cgi?id=224988 + +Reviewed by Jonathan Bedard. + +* Scripts/webkitpy/common/system/crashlogs_unittest.py: + 2021-04-24 Ryosuke Niwa Add an option to not enable all experimental features in WebKitTestRunner Modified: trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py (276560 => 276561) --- trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py 2021-04-25 00:47:41 UTC (rev 276560) +++ trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py 2021-04-25 00:50:32 UTC (rev 276561) @@ -57,7 +57,7 @@ Crashed Thread: 0 Dyld Error Message: - Library not loaded: /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release/build/WebKitBuild/Release/WebCore.framework/Versions/A/WebCore + Library not loaded: /Volumes/Data/WebKit-Worker/snowleopard-intel-release/build/WebKitBuild/Release/WebCore.framework/Versions/A/WebCore Referenced from: /Volumes/Data/worker/snowleopard-intel-release/build/WebKitBuild/Release/WebKit.framework/Versions/A/WebKit Reason: image not found ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276540] trunk/Tools
Title: [276540] trunk/Tools
Revision 276540
Author aakash_j...@apple.com
Date 2021-04-23 17:25:50 -0700 (Fri, 23 Apr 2021)
Log Message
Delete unused buildbot.css and default.css
https://bugs.webkit.org/show_bug.cgi?id=224997
Reviewed by Alexey Proskuryakov.
* CISupport/build-webkit-org/public_html/buildbot.css: Removed.
* CISupport/build-webkit-org/public_html/default.css: Removed.
Modified Paths
trunk/Tools/ChangeLog
Removed Paths
trunk/Tools/CISupport/build-webkit-org/public_html/buildbot.css
trunk/Tools/CISupport/build-webkit-org/public_html/default.css
Diff
Deleted: trunk/Tools/CISupport/build-webkit-org/public_html/buildbot.css (276539 => 276540)
--- trunk/Tools/CISupport/build-webkit-org/public_html/buildbot.css 2021-04-24 00:22:47 UTC (rev 276539)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/buildbot.css 2021-04-24 00:25:50 UTC (rev 276540)
@@ -1,382 +0,0 @@
-body {
- margin-bottom:50px;
-}
-
-body, td {
- font-family: Verdana, Cursor;
- font-size: 10px;
- font-weight: bold;
-}
-
-a:link,a:visited,a:active {
- color: #444;
-}
-
-a:hover {
- color: #00;
-}
-
-table {
- border-spacing: 1px 1px;
-}
-
-table td {
- padding: 3px 0px 3px 0px;
- text-align: center;
-}
-
-.Project {
- width: 100px;
-}
-
-.LastBuild, .Activity {
- padding: 0 0 0 4px;
-}
-
-.LastBuild, .Activity, .Builder, .BuildStep {
-width: 155px;
-max-width: 155px;
-}
-
-td.Time {
- color: #000;
- border-bottom: 1px solid #aaa;
- background-color: #eee;
-}
-
-td.Activity, td.Change, td.Builder {
- color: #33;
- background-color: #CC;
-}
-
-td.Change {
- border-radius: 5px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-td.Event {
- color: #777;
- background-color: #ddd;
- border-radius: 5px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-
-td.Activity {
- border-top-left-radius: 10px;
- -webkit-border-top-left-radius: 10px;
- -moz-border-radius-topleft: 10px;
- min-height: 20px;
- padding: 2px 0 2px 0;
-}
-
-td.idle, td.waiting, td.offline, td.building {
- border-top-left-radius: 0px;
- -webkit-border-top-left-radius: 0px;
- -moz-border-radius-topleft: 0px;
-}
-
-.LastBuild {
- border-top-left-radius: 5px;
- -webkit-border-top-left-radius: 5px;
- -moz-border-radius-topleft: 5px;
- border-top-right-radius: 5px;
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topright: 5px;
-}
-
-/* Console view styles */
-
-td.DevRev {
-padding: 4px 8px 4px 8px;
-color: #33;
-border-top-left-radius: 5px;
--webkit-border-top-left-radius: 5px;
--moz-border-radius-topleft: 5px;
-background-color: #eee;
-width: 1%;
-}
-
-td.DevRevCollapse {
-border-bottom-left-radius: 5px;
--webkit-border-bottom-left-radius: 5px;
--moz-border-radius-bottomleft: 5px;
-}
-
-td.DevName {
-padding: 4px 8px 4px 8px;
-color: #33;
-background-color: #eee;
-width: 1%;
-text-align: left;
-}
-
-td.DevStatus {
-padding: 4px 4px 4px 4px;
-color: #33;
-background-color: #eee;
-}
-
-td.DevSlave {
-padding: 4px 4px 4px 4px;
-color: #33;
-background-color: #eee;
-}
-
-td.first {
-border-top-left-radius: 5px;
--webkit-border-top-left-radius: 5px;
--moz-border-radius-topleft: 5px;
-}
-
-td.last {
-border-top-right-radius: 5px;
--webkit-border-top-right-radius: 5px;
--moz-border-radius-topright: 5px;
-}
-
-td.DevStatusCategory {
-border-radius: 5px;
--webkit-border-radius: 5px;
--moz-border-radius: 5px;
-border-width:1px;
-border-style:solid;
-}
-
-td.DevStatusCollapse {
-border-bottom-right-radius: 5px;
--webkit-border-bottom-right-radius: 5px;
--moz-border-radius-bottomright: 5px;
-}
-
-td.DevDetails {
-font-weight: normal;
-padding: 8px 8px 8px 8px;
-color: #33;
-background-color: #eee;
-text-align: left;
-}
-
-td.DevComment {
-font-weight: normal;
-padding: 8px 8px 8px 8px;
-color: #33;
-border-bottom-right-radius: 5px;
--webkit-border-bottom-right-radius: 5px;
--moz-border-radius-bottomright: 5px;
-border-bottom-left-radius: 5px;
--webkit-border-bottom-left-radius: 5px;
--moz-border-radius-bottomleft: 5px;
-background-color: #eee;
-text-align: left;
-}
-
-td.Alt {
-background-color: #CC;
-}
-
-.legend {
-border-radius: 5px;
--webkit-border-radius: 5px;
--moz-border-radius: 5px;
-width: 100px;
-max-width: 100px;
-text-align:center;
-padding: 2px 2px 2px 2px;
-height:14px;
-white-space:nowrap;
-}
-
-.DevStatusBox {
-text-align:center;
-height:20px;
-padding:0 2px;
-line-height:0;
-white-space:nowrap;
-}
-
-.DevStatusBox a {
-opacity:
[webkit-changes] [276505] trunk/Tools
Title: [276505] trunk/Tools
Revision 276505
Author aakash_j...@apple.com
Date 2021-04-23 10:31:54 -0700 (Fri, 23 Apr 2021)
Log Message
Make report-non-inclusive-language ignore .db files
https://bugs.webkit.org/show_bug.cgi?id=224979
Reviewed by Darin Adler.
* Scripts/report-non-inclusive-language:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/report-non-inclusive-language
Diff
Modified: trunk/Tools/ChangeLog (276504 => 276505)
--- trunk/Tools/ChangeLog 2021-04-23 17:21:25 UTC (rev 276504)
+++ trunk/Tools/ChangeLog 2021-04-23 17:31:54 UTC (rev 276505)
@@ -1,3 +1,12 @@
+2021-04-23 Aakash Jain
+
+Make report-non-inclusive-language ignore .db files
+https://bugs.webkit.org/show_bug.cgi?id=224979
+
+Reviewed by Darin Adler.
+
+* Scripts/report-non-inclusive-language:
+
2021-04-23 Youenn Fablet
Fix KVO for camera/microphone capture state WKWebView API
Modified: trunk/Tools/Scripts/report-non-inclusive-language (276504 => 276505)
--- trunk/Tools/Scripts/report-non-inclusive-language 2021-04-23 17:21:25 UTC (rev 276504)
+++ trunk/Tools/Scripts/report-non-inclusive-language 2021-04-23 17:31:54 UTC (rev 276505)
@@ -43,7 +43,7 @@
IGNORE_DIRECTORIES = ['.svn', '.git', 'autoinstalled']
IGNORE_FILES_STARTING_WITH = ('ChangeLog')
-IGNORE_FILES_ENDING_WITH = ('.log', '.order', '.pyc', '.swp', '.xcuserstate')
+IGNORE_FILES_ENDING_WITH = ('.log', '.order', '.pyc', '.swp', '.xcuserstate', '.db', '.db-shm', '.db-wal')
IGNORE_FILE_NAMES = ['report-non-inclusive-language']
parser = argparse.ArgumentParser(description='Report counts and locations of non-inclusive terms.')
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276438] trunk/Tools
Title: [276438] trunk/Tools
Revision 276438
Author aakash_j...@apple.com
Date 2021-04-22 09:12:34 -0700 (Thu, 22 Apr 2021)
Log Message
Services EWS should run for webkitscmpy and webkitcorepy changes
https://bugs.webkit.org/show_bug.cgi?id=223941
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(CheckPatchRelevance):
* CISupport/ews-build/steps_unittest.py: Added unit-test.
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (276437 => 276438)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-04-22 16:04:13 UTC (rev 276437)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-04-22 16:12:34 UTC (rev 276438)
@@ -387,6 +387,8 @@
'Tools/CISupport/ews-build',
'Tools/CISupport/Shared',
'Tools/Scripts/libraries/resultsdbpy',
+'Tools/Scripts/libraries/webkitcorepy',
+'Tools/Scripts/libraries/webkitscmpy',
]
jsc_paths = [
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (276437 => 276438)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-22 16:04:13 UTC (rev 276437)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-22 16:12:34 UTC (rev 276438)
@@ -2753,6 +2753,17 @@
rc = self.runStep()
return rc
+def test_relevant_services_patch(self):
+file_names = ['Tools/CISupport/build-webkit-org', 'Tools/CISupport/ews-build', 'Tools/CISupport/Shared',
+ 'Tools/Scripts/libraries/resultsdbpy', 'Tools/Scripts/libraries/webkitcorepy', 'Tools/Scripts/libraries/webkitscmpy']
+self.setupStep(CheckPatchRelevance())
+self.setProperty('buildername', 'Services-EWS')
+for file_name in file_names:
+CheckPatchRelevance._get_patch = lambda x: 'Sample patch; file: {}'.format(file_name)
+self.expectOutcome(result=SUCCESS, state_string='Patch contains relevant changes')
+rc = self.runStep()
+return rc
+
def test_relevant_bindings_tests_patch(self):
file_names = ['Source/WebCore', 'Tools']
self.setupStep(CheckPatchRelevance())
Modified: trunk/Tools/ChangeLog (276437 => 276438)
--- trunk/Tools/ChangeLog 2021-04-22 16:04:13 UTC (rev 276437)
+++ trunk/Tools/ChangeLog 2021-04-22 16:12:34 UTC (rev 276438)
@@ -1,3 +1,14 @@
+2021-04-22 Aakash Jain
+
+Services EWS should run for webkitscmpy and webkitcorepy changes
+https://bugs.webkit.org/show_bug.cgi?id=223941
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(CheckPatchRelevance):
+* CISupport/ews-build/steps_unittest.py: Added unit-test.
+
2021-04-22 Sam Sneddon
Add an xfail marker for webkitpy's tests; get SCM passing
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276406] trunk/Tools
Title: [276406] trunk/Tools
Revision 276406
Author aakash_j...@apple.com
Date 2021-04-21 16:50:10 -0700 (Wed, 21 Apr 2021)
Log Message
[build.webkit.org] Disable unused parameters in force build dialog box
https://bugs.webkit.org/show_bug.cgi?id=224544
Unreviewed minor infrastructure fix.
* CISupport/build-webkit-org/loadConfig.py:
Modified Paths
trunk/Tools/CISupport/build-webkit-org/loadConfig.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/loadConfig.py (276405 => 276406)
--- trunk/Tools/CISupport/build-webkit-org/loadConfig.py 2021-04-21 23:39:37 UTC (rev 276405)
+++ trunk/Tools/CISupport/build-webkit-org/loadConfig.py 2021-04-21 23:50:10 UTC (rev 276406)
@@ -27,7 +27,7 @@
import re
from buildbot.scheduler import AnyBranchScheduler, Triggerable, Nightly
-from buildbot.schedulers.forcesched import FixedParameter, ForceScheduler, StringParameter, BooleanParameter
+from buildbot.schedulers.forcesched import BooleanParameter, CodebaseParameter, FixedParameter, ForceScheduler, StringParameter
from buildbot.schedulers.filter import ChangeFilter
from buildbot.process import buildstep, factory, properties
from buildbot.util import identifiers as buildbot_identifiers
@@ -76,7 +76,13 @@
builderNames = [str(builder['name']) for builder in config['builders']]
reason = StringParameter(name='reason', default='', size=40)
properties = [BooleanParameter(name='is_clean', label='Force Clean build')]
-forceScheduler = ForceScheduler(name='force', builderNames=builderNames, reason=reason, properties=properties)
+# Disable default enabled input fields: revision, repository, project and branch
+codebases = [CodebaseParameter("",
+ revision=FixedParameter(name="revision", default=""),
+ repository=FixedParameter(name="repository", default=""),
+ project=FixedParameter(name="project", default=""),
+ branch=FixedParameter(name="branch", default=""))]
+forceScheduler = ForceScheduler(name='force', builderNames=builderNames, reason=reason, codebases=codebases, properties=properties)
c['schedulers'].append(forceScheduler)
c['builders'] = []
Modified: trunk/Tools/ChangeLog (276405 => 276406)
--- trunk/Tools/ChangeLog 2021-04-21 23:39:37 UTC (rev 276405)
+++ trunk/Tools/ChangeLog 2021-04-21 23:50:10 UTC (rev 276406)
@@ -1,3 +1,12 @@
+2021-04-21 Aakash Jain
+
+[build.webkit.org] Disable unused parameters in force build dialog box
+https://bugs.webkit.org/show_bug.cgi?id=224544
+
+Unreviewed minor infrastructure fix.
+
+* CISupport/build-webkit-org/loadConfig.py:
+
2021-04-21 Don Olmstead
[Python 3] Update gni-to-cmake.py
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276315] trunk/Tools
Title: [276315] trunk/Tools
Revision 276315
Author aakash_j...@apple.com
Date 2021-04-20 12:29:40 -0700 (Tue, 20 Apr 2021)
Log Message
Switch commit-queue back to git.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=224762
Reviewed by Jonathan Bedard.
* CISupport/ews-build/factories.py:
(CommitQueueFactory.__init__): Use git.webkit.org for Commit-Queue.
* CISupport/ews-build/factories_unittest.py:
(TestCommitQueueFactory.test_commit_queue_factory): Updated unit-tests.
* CISupport/ews-build/steps.py:
(CheckOutSource.__init__):
(PushCommitToWebKitRepo.evaluateCommand):
Modified Paths
trunk/Tools/CISupport/ews-build/factories.py
trunk/Tools/CISupport/ews-build/factories_unittest.py
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/factories.py (276314 => 276315)
--- trunk/Tools/CISupport/ews-build/factories.py 2021-04-20 18:38:48 UTC (rev 276314)
+++ trunk/Tools/CISupport/ews-build/factories.py 2021-04-20 19:29:40 UTC (rev 276315)
@@ -282,7 +282,7 @@
self.addStep(ValidateCommiterAndReviewer())
self.addStep(PrintConfiguration())
self.addStep(CleanGitRepo())
-self.addStep(CheckOutSource())
+self.addStep(CheckOutSource(repourl='https://git.webkit.org/git/WebKit-https'))
self.addStep(FetchBranches())
self.addStep(ShowIdentifier())
self.addStep(UpdateWorkingDirectory())
@@ -296,7 +296,7 @@
self.addStep(CheckPatchStatusOnEWSQueues())
self.addStep(RunWebKitTests())
self.addStep(ValidatePatch(addURLs=False, verifycqplus=True))
-self.addStep(CheckOutSource())
+self.addStep(CheckOutSource(repourl='https://git.webkit.org/git/WebKit-https'))
self.addStep(ShowIdentifier())
self.addStep(UpdateWorkingDirectory())
self.addStep(ApplyPatch())
Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (276314 => 276315)
--- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-04-20 18:38:48 UTC (rev 276314)
+++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-04-20 19:29:40 UTC (rev 276315)
@@ -414,7 +414,7 @@
_BuildStepFactory(steps.ValidateCommiterAndReviewer),
_BuildStepFactory(steps.PrintConfiguration),
_BuildStepFactory(steps.CleanGitRepo),
-_BuildStepFactory(steps.CheckOutSource),
+_BuildStepFactory(steps.CheckOutSource, repourl='https://git.webkit.org/git/WebKit-https'),
_BuildStepFactory(steps.FetchBranches),
_BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.UpdateWorkingDirectory),
@@ -428,7 +428,7 @@
_BuildStepFactory(steps.CheckPatchStatusOnEWSQueues),
_BuildStepFactory(steps.RunWebKitTests),
_BuildStepFactory(steps.ValidatePatch, addURLs=False, verifycqplus=True),
-_BuildStepFactory(steps.CheckOutSource),
+_BuildStepFactory(steps.CheckOutSource, repourl='https://git.webkit.org/git/WebKit-https'),
_BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.UpdateWorkingDirectory),
_BuildStepFactory(steps.ApplyPatch),
Modified: trunk/Tools/CISupport/ews-build/steps.py (276314 => 276315)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-04-20 18:38:48 UTC (rev 276314)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-04-20 19:29:40 UTC (rev 276315)
@@ -109,9 +109,8 @@
CHECKOUT_DELAY_AND_MAX_RETRIES_PAIR = (0, 2)
haltOnFailure = False
-def __init__(self, **kwargs):
-self.repourl = 'https://github.com/WebKit/WebKit.git'
-super(CheckOutSource, self).__init__(repourl=self.repourl,
+def __init__(self, repourl='https://github.com/WebKit/WebKit.git', **kwargs):
+super(CheckOutSource, self).__init__(repourl=repourl,
retry=self.CHECKOUT_DELAY_AND_MAX_RETRIES_PAIR,
timeout=2 * 60 * 60,
alwaysUseLatest=True,
@@ -222,6 +221,8 @@
match = re.search(self.identifier_re, log_text, re.MULTILINE)
if match:
identifier = match.group(1)
+if identifier:
+identifier = identifier.replace('master', 'main')
self.setProperty('identifier', identifier)
ews_revision = self.getProperty('ews_revision')
if ews_revision:
@@ -3139,9 +3140,9 @@
# git situations we've gotten ourself into in the past.
command_list = [['git', 'clean', '-f', '-d'], # Remove any left-over layout test results, added files, etc.
['git', 'fetch', 'origin'], # Avoid updating the working copy to a stale revision.
-['git', 'checkout', 'origin/main', '-f'],
-['git', 'branch', '-D', 'main'],
-
[webkit-changes] [276277] trunk/Tools
Title: [276277] trunk/Tools Revision 276277 Author aakash_j...@apple.com Date 2021-04-19 16:37:20 -0700 (Mon, 19 Apr 2021) Log Message [ews] Enabled detailed error log when unit-tests fails https://bugs.webkit.org/show_bug.cgi?id=224789 Unreviewed minor unit-test fix. * CISupport/ews-build/factories_unittest.py: (TestCase): Set maxDiff to None. Modified Paths trunk/Tools/CISupport/ews-build/factories_unittest.py trunk/Tools/ChangeLog Diff Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (276276 => 276277) --- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-04-19 23:03:26 UTC (rev 276276) +++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-04-19 23:37:20 UTC (rev 276277) @@ -30,6 +30,8 @@ class TestCase(unittest.TestCase): +maxDiff = None + def assertBuildSteps(self, actual_steps, expected_steps): assert all([isinstance(step, _BuildStepFactory) for step in actual_steps]) assert all([isinstance(step, _BuildStepFactory) for step in expected_steps]) Modified: trunk/Tools/ChangeLog (276276 => 276277) --- trunk/Tools/ChangeLog 2021-04-19 23:03:26 UTC (rev 276276) +++ trunk/Tools/ChangeLog 2021-04-19 23:37:20 UTC (rev 276277) @@ -1,3 +1,13 @@ +2021-04-19 Aakash Jain + +[ews] Enabled detailed error log when unit-tests fails +https://bugs.webkit.org/show_bug.cgi?id=224789 + +Unreviewed minor unit-test fix. + +* CISupport/ews-build/factories_unittest.py: +(TestCase): Set maxDiff to None. + 2021-04-19 BJ Burg Can't use Web Inspector on web views made by TestWebKitAPI ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276199] trunk/Tools
Title: [276199] trunk/Tools
Revision 276199
Author aakash_j...@apple.com
Date 2021-04-17 05:20:32 -0700 (Sat, 17 Apr 2021)
Log Message
Do not configure Janitor to delete old logs in local testing mode
https://bugs.webkit.org/show_bug.cgi?id=224552
Reviewed by Jonathan Bedard.
* CISupport/build-webkit-org/master_buildbot2.cfg:
* CISupport/ews-build/master.cfg:
Modified Paths
trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg
trunk/Tools/CISupport/ews-build/master.cfg
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg (276198 => 276199)
--- trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg 2021-04-17 12:08:32 UTC (rev 276198)
+++ trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg 2021-04-17 12:20:32 UTC (rev 276199)
@@ -61,12 +61,11 @@
sys.exit(1)
# See https://docs.buildbot.net/2.10.0/manual/configuration/global.html#database-specification
c['db_url'] = 'postgresql://{}:{}@{}/{}'.format(db_username, db_password, db_url, db_name)
+# configure a janitor to delete old logs
+c['configurators'] = [util.JanitorConfigurator(logHorizon=timedelta(weeks=26), hour='1', dayOfWeek='*')]
c['buildCacheSize'] = 60
c['logCompressionMethod'] = 'lz4'
c['buildbotNetUsageData'] = None
-# configure a janitor to delete old logs
-c['configurators'] = [util.JanitorConfigurator(logHorizon=timedelta(weeks=26), hour='1', dayOfWeek='*')]
-
loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)
Modified: trunk/Tools/CISupport/ews-build/master.cfg (276198 => 276199)
--- trunk/Tools/CISupport/ews-build/master.cfg 2021-04-17 12:08:32 UTC (rev 276198)
+++ trunk/Tools/CISupport/ews-build/master.cfg 2021-04-17 12:20:32 UTC (rev 276199)
@@ -63,13 +63,12 @@
sys.exit(1)
# See https://docs.buildbot.net/1.7.0/manual/configuration/global.html#database-specification
c['db_url'] = 'postgresql://{}:{}@{}/{}'.format(db_username, db_password, db_url, db_name)
+# configure a janitor to delete old logs
+c['configurators'] = [util.JanitorConfigurator(logHorizon=timedelta(weeks=52), hour='1', dayOfWeek='*')]
c['logCompressionMethod'] = 'lz4'
c['buildbotNetUsageData'] = None
-# configure a janitor to delete old logs
-c['configurators'] = [util.JanitorConfigurator(logHorizon=timedelta(weeks=52), hour='1', dayOfWeek='*')]
-
loadConfig.loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)
mail_notifier = reporters.MailNotifier(
Modified: trunk/Tools/ChangeLog (276198 => 276199)
--- trunk/Tools/ChangeLog 2021-04-17 12:08:32 UTC (rev 276198)
+++ trunk/Tools/ChangeLog 2021-04-17 12:20:32 UTC (rev 276199)
@@ -1,3 +1,13 @@
+2021-04-17 Aakash Jain
+
+Do not configure Janitor to delete old logs in local testing mode
+https://bugs.webkit.org/show_bug.cgi?id=224552
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/build-webkit-org/master_buildbot2.cfg:
+* CISupport/ews-build/master.cfg:
+
2021-04-16 Lauro Moura
REGRESSION(r276164) [GTK] WKPreferencesDefaults API test is failing
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276139] trunk/Tools
Title: [276139] trunk/Tools
Revision 276139
Author aakash_j...@apple.com
Date 2021-04-16 09:15:18 -0700 (Fri, 16 Apr 2021)
Log Message
[ews] Improve step description when layout-tests step is skipped
https://bugs.webkit.org/show_bug.cgi?id=224666
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(RunWebKitTests.getResultSummary):
* CISupport/ews-build/steps_unittest.py: Updated unit-tests.
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (276138 => 276139)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-04-16 15:46:21 UTC (rev 276138)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-04-16 16:15:18 UTC (rev 276139)
@@ -2270,6 +2270,10 @@
if self.results != SUCCESS and self.incorrectLayoutLines:
status = ' '.join(self.incorrectLayoutLines)
return {'step': status}
+if self.results == SKIPPED:
+if self.getProperty('fast_commit_queue'):
+return {'step': 'Skipped layout-tests in fast-cq mode'}
+return {'step': 'Skipped layout-tests'}
return super(RunWebKitTests, self).getResultSummary()
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (276138 => 276139)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-16 15:46:21 UTC (rev 276138)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-16 16:15:18 UTC (rev 276139)
@@ -1721,7 +1721,7 @@
self.setProperty('fullPlatform', 'mac')
self.setProperty('configuration', 'debug')
self.setProperty('fast_commit_queue', True)
-self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
+self.expectOutcome(result=SKIPPED, state_string='Skipped layout-tests in fast-cq mode')
return self.runStep()
def test_skip_for_mac_wk2_passed_patch_on_commit_queue(self):
@@ -1731,7 +1731,7 @@
self.setProperty('fullPlatform', 'mac')
self.setProperty('configuration', 'debug')
self.setProperty('passed_mac_wk2', True)
-self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
+self.expectOutcome(result=SKIPPED, state_string='Skipped layout-tests')
return self.runStep()
def test_parse_results_json_regression(self):
@@ -2260,7 +2260,7 @@
self.setProperty('fullPlatform', 'mac')
self.setProperty('configuration', 'debug')
self.setProperty('fast_commit_queue', True)
-self.expectOutcome(result=SKIPPED, state_string='layout-tests (skipped)')
+self.expectOutcome(result=SKIPPED, state_string='Skipped layout-tests in fast-cq mode')
return self.runStep()
Modified: trunk/Tools/ChangeLog (276138 => 276139)
--- trunk/Tools/ChangeLog 2021-04-16 15:46:21 UTC (rev 276138)
+++ trunk/Tools/ChangeLog 2021-04-16 16:15:18 UTC (rev 276139)
@@ -1,3 +1,14 @@
+2021-04-16 Aakash Jain
+
+[ews] Improve step description when layout-tests step is skipped
+https://bugs.webkit.org/show_bug.cgi?id=224666
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(RunWebKitTests.getResultSummary):
+* CISupport/ews-build/steps_unittest.py: Updated unit-tests.
+
2021-04-16 Manuel Rego Casasnovas
Avoid converting HTML chars in _W3CTestConverter
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276100] trunk/Tools
Title: [276100] trunk/Tools
Revision 276100
Author aakash_j...@apple.com
Date 2021-04-15 18:06:47 -0700 (Thu, 15 Apr 2021)
Log Message
Pass -d parameter to git clean in commit-queue
https://bugs.webkit.org/show_bug.cgi?id=224636
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(CleanGitRepo):
* CISupport/ews-build/steps_unittest.py:
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (276099 => 276100)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-04-16 00:53:33 UTC (rev 276099)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-04-16 01:06:47 UTC (rev 276100)
@@ -3133,7 +3133,7 @@
logEnviron = False
# This somewhat quirky sequence of steps seems to clear up all the broken
# git situations we've gotten ourself into in the past.
-command_list = [['git', 'clean', '-f'], # Remove any left-over layout test results, added files, etc.
+command_list = [['git', 'clean', '-f', '-d'], # Remove any left-over layout test results, added files, etc.
['git', 'fetch', 'origin'], # Avoid updating the working copy to a stale revision.
['git', 'checkout', 'origin/main', '-f'],
['git', 'branch', '-D', 'main'],
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (276099 => 276100)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-16 00:53:33 UTC (rev 276099)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-16 01:06:47 UTC (rev 276100)
@@ -3902,7 +3902,7 @@
self.setProperty('buildername', 'Commit-Queue')
self.expectRemoteCommands(
-ExpectShell(command=['git', 'clean', '-f'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ ExpectShell.log('stdio', stdout=''),
ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ ExpectShell.log('stdio', stdout=''),
@@ -3921,7 +3921,7 @@
self.setProperty('buildername', 'Commit-Queue')
self.expectRemoteCommands(
-ExpectShell(command=['git', 'clean', '-f'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ ExpectShell.log('stdio', stdout=''),
ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=1200, logEnviron=False) + 128
+ ExpectShell.log('stdio', stdout='fatal: unable to access https://github.com/WebKit/WebKit.git/: Could not resolve host: github.com'),
Modified: trunk/Tools/ChangeLog (276099 => 276100)
--- trunk/Tools/ChangeLog 2021-04-16 00:53:33 UTC (rev 276099)
+++ trunk/Tools/ChangeLog 2021-04-16 01:06:47 UTC (rev 276100)
@@ -1,3 +1,14 @@
+2021-04-15 Aakash Jain
+
+Pass -d parameter to git clean in commit-queue
+https://bugs.webkit.org/show_bug.cgi?id=224636
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(CleanGitRepo):
+* CISupport/ews-build/steps_unittest.py:
+
2021-04-15 Sam Sneddon
scm_unittest.py fails at import-time on Python 2
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276020] trunk/Tools
Title: [276020] trunk/Tools
Revision 276020
Author aakash_j...@apple.com
Date 2021-04-15 06:41:55 -0700 (Thu, 15 Apr 2021)
Log Message
Allow fast-cq as a prefix for patch name for fast-cq mode on commit-queue
https://bugs.webkit.org/show_bug.cgi?id=224580
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(BugzillaMixin):
(BugzillaMixin._is_patch_obsolete):
* CISupport/ews-build/steps_unittest.py: Updated unit-test.
Modified Paths
trunk/Tools/CISupport/ews-build/steps.py
trunk/Tools/CISupport/ews-build/steps_unittest.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (276019 => 276020)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-04-15 13:02:06 UTC (rev 276019)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-04-15 13:41:55 UTC (rev 276020)
@@ -528,9 +528,7 @@
addURLs = False
bug_open_statuses = ['UNCONFIRMED', 'NEW', 'ASSIGNED', 'REOPENED']
bug_closed_statuses = ['RESOLVED', 'VERIFIED', 'CLOSED']
-revert_preamble = 'revert of r'
-fast_cq_preamble = '[fast-cq]'
-
+fast_cq_preambles = ('revert of r', 'fast-cq', '[fast-cq]')
@defer.inlineCallbacks
def _addToLog(self, logName, message):
try:
@@ -615,7 +613,7 @@
patch_author = patch_json.get('creator')
self.setProperty('patch_author', patch_author)
patch_title = patch_json.get('summary')
-if patch_title.lower().startswith((self.revert_preamble, self.fast_cq_preamble)):
+if patch_title.lower().startswith(self.fast_cq_preambles):
self.setProperty('fast_commit_queue', True)
if self.addURLs:
self.addURL('Patch by: {}'.format(patch_author), '')
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (276019 => 276020)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-15 13:02:06 UTC (rev 276019)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-15 13:41:55 UTC (rev 276020)
@@ -4100,25 +4100,18 @@
self.assertEqual(self.getProperty('fast_commit_queue'), None, 'fast_commit_queue is unexpectedly set')
return rc
-def test_revert_patch_trigger_fast_cq_mode(self):
-self.setupStep(ValidatePatch(verifyBugClosed=False))
-ValidatePatch.get_patch_json = lambda x, patch_id: self.get_patch(title='REVERT OF r123456')
-self.setProperty('patch_id', '425806')
-self.expectOutcome(result=SUCCESS, state_string='Validated patch')
-rc = self.runStep()
-self.assertEqual(self.getProperty('fast_commit_queue'), True, 'fast_commit_queue is not set')
+def test_fast_cq_patches_trigger_fast_cq_mode(self):
+fast_cq_patch_titles = ('REVERT OF r1234', 'revert of r1234', '[fast-cq]Patch', '[FAST-cq] patch', 'fast-cq-patch', 'FAST-CQ Patch')
+for fast_cq_patch_title in fast_cq_patch_titles:
+self.setupStep(ValidatePatch(verifyBugClosed=False))
+ValidatePatch.get_patch_json = lambda x, patch_id: self.get_patch(title=fast_cq_patch_title)
+self.setProperty('patch_id', '425806')
+self.expectOutcome(result=SUCCESS, state_string='Validated patch')
+rc = self.runStep()
+self.assertEqual(self.getProperty('fast_commit_queue'), True, 'fast_commit_queue is not set, patch title: {}'.format(fast_cq_patch_title))
return rc
-def test_fast_cq_patch_trigger_fast_cq_mode(self):
-self.setupStep(ValidatePatch(verifyBugClosed=False))
-ValidatePatch.get_patch_json = lambda x, patch_id: self.get_patch(title='[fast-cq] Patch')
-self.setProperty('patch_id', '425806')
-self.expectOutcome(result=SUCCESS, state_string='Validated patch')
-rc = self.runStep()
-self.assertEqual(self.getProperty('fast_commit_queue'), True, 'fast_commit_queue is not set')
-return rc
-
class TestValidateCommiterAndReviewer(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
Modified: trunk/Tools/ChangeLog (276019 => 276020)
--- trunk/Tools/ChangeLog 2021-04-15 13:02:06 UTC (rev 276019)
+++ trunk/Tools/ChangeLog 2021-04-15 13:41:55 UTC (rev 276020)
@@ -1,3 +1,15 @@
+2021-04-15 Aakash Jain
+
+Allow fast-cq as a prefix for patch name for fast-cq mode on commit-queue
+https://bugs.webkit.org/show_bug.cgi?id=224580
+
+Reviewed by Jonathan Bedard.
+
+* CISupport/ews-build/steps.py:
+(BugzillaMixin):
+(BugzillaMixin._is_patch_obsolete):
+* CISupport/ews-build/steps_unittest.py: Updated unit-test.
+
2021-04-14 Devin Rousso
Promote `-[WKWebView _themeColor]` SPI to API
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
