Title: [269052] trunk/Tools
Revision
269052
Author
[email protected]
Date
2020-10-27 10:38:13 -0700 (Tue, 27 Oct 2020)

Log Message

Rename BuildSlaveSupport to CISupport
https://bugs.webkit.org/show_bug.cgi?id=218026

Reviewed by Jonathan Bedard.

* CISupport: Copied from Tools/BuildSlaveSupport.
* CISupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js:
* CISupport/build.webkit.org-config/steps.py:
* CISupport/build.webkit.org-config/wkbuild.py:
* CISupport/build.webkit.org-config/wkbuild_unittest.py:
* CISupport/ews-app/ews/views/statusbubble.py:
* CISupport/ews-build/steps.py:
* CISupport/ews-build/steps_unittest.py:
* BuildSlaveSupport: Replaced.
* EWSTools/Start-Queue.ps1:
* Scripts/bisect-builds:
* Scripts/run-dashboard-tests:
* Scripts/webkitpy/common/config/watchlist:
* Scripts/webkitpy/layout_tests/views/buildbot_results.py:
* Scripts/webkitpy/style/checker_unittest.py:
* Scripts/webkitpy/tool/servers/gardeningserver.py:
* .gitattributes:

Modified Paths

Added Paths

Removed Paths

  • trunk/Tools/BuildSlaveSupport/

Diff

Modified: trunk/Tools/.gitattributes (269051 => 269052)


--- trunk/Tools/.gitattributes	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/.gitattributes	2020-10-27 17:38:13 UTC (rev 269052)
@@ -1,4 +1,4 @@
-BuildSlaveSupport/win/kill-old-processes -crlf
+CISupport/win/kill-old-processes -crlf
 DumpRenderTree/cairo/PixelDumpSupportCairo.cpp -crlf
 FindSafari/Safari.exe.manifest -crlf
 MiniBrowser/win/MiniBrowser.rc -crlf

Added: trunk/Tools/BuildSlaveSupport (0 => 269052)


--- trunk/Tools/BuildSlaveSupport	                        (rev 0)
+++ trunk/Tools/BuildSlaveSupport	2020-10-27 17:38:13 UTC (rev 269052)
@@ -0,0 +1 @@
+link CISupport
\ No newline at end of file
Property changes on: trunk/Tools/BuildSlaveSupport
___________________________________________________________________

Added: svn:special

+* \ No newline at end of property

Modified: trunk/Tools/CISupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js (269051 => 269052)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/CISupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js	2020-10-27 17:38:13 UTC (rev 269052)
@@ -90,7 +90,7 @@
 var kExampleBuildInfoJSON = {
     "blame": ["[email protected]"],
     "builderName": "WebKit Linux",
-    "changes": ["Files:\n Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js\n Tools/ChangeLog\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:Properties: \n\n\n", "Files:\n LayoutTests/ChangeLog\n LayoutTests/platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments:
  Update baselines after <http://trac.webkit.org/changeset/92340>.\n\n* platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png:Properties: \n\n\n"],
+    "changes": ["Files:\n Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js\n Tools/ChangeLog\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:Properties: \n\n\n", "Files:\n LayoutTests/ChangeLog\n LayoutTests/platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Update baselines
  after <http://trac.webkit.org/changeset/92340>.\n\n* platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png:Properties: \n\n\n"],
     "currentStep": null,
     "eta": null,
     "logs": [
@@ -127,8 +127,8 @@
             "changes": [{
                 "branch": "trunk",
                 "category": null,
-                "comments": "Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:",
-                "files": ["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
+                "comments": "Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:",
+                "files": ["Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
                 "number": 43707,
                 "properties": [],
                 "repository": "",
@@ -161,8 +161,8 @@
         "changes": [{
             "branch": "trunk",
             "category": null,
-            "comments": "Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:",
-            "files": ["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
+            "comments": "Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:",
+            "files": ["Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
             "number": 43707,
             "properties": [],
             "repository": "",
@@ -715,7 +715,7 @@
 var kExamplePerfBuildInfoJSON = {
     "blame": ["[email protected]"],
     "builderName": "Mac10.6 Perf",
-    "changes": ["Files:\n Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js\n Tools/ChangeLog\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:Properties: \n\n\n", "Files:\n LayoutTests/ChangeLog\n LayoutTests/platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments:
  Update baselines after <http://trac.webkit.org/changeset/92340>.\n\n* platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png:Properties: \n\n\n"],
+    "changes": ["Files:\n Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js\n Tools/ChangeLog\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:Properties: \n\n\n", "Files:\n LayoutTests/ChangeLog\n LayoutTests/platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Update baselines
  after <http://trac.webkit.org/changeset/92340>.\n\n* platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png:Properties: \n\n\n"],
     "currentStep": null,
     "eta": null,
     "logs": [
@@ -752,8 +752,8 @@
             "changes": [{
                 "branch": "trunk",
                 "category": null,
-                "comments": "Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:",
-                "files": ["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
+                "comments": "Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:",
+                "files": ["Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
                 "number": 43707,
                 "properties": [],
                 "repository": "",
@@ -786,8 +786,8 @@
         "changes": [{
             "branch": "trunk",
             "category": null,
-            "comments": "Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js:",
-            "files": ["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
+            "comments": "Fix types.  Sadly, main.js has no test coverage.  (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:",
+            "files": ["Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
             "number": 43707,
             "properties": [],
             "repository": "",

Modified: trunk/Tools/CISupport/build.webkit.org-config/steps.py (269051 => 269052)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/CISupport/build.webkit.org-config/steps.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -124,7 +124,7 @@
     name = "kill-old-processes"
     description = ["killing old processes"]
     descriptionDone = ["killed old processes"]
-    command = ["python", "./Tools/BuildSlaveSupport/kill-old-processes", "buildbot"]
+    command = ["python", "./Tools/CISupport/kill-old-processes", "buildbot"]
 
 
 class TriggerCrashLogSubmission(shell.Compile):
@@ -131,7 +131,7 @@
     name = "trigger-crash-log-submission"
     description = ["triggering crash log submission"]
     descriptionDone = ["triggered crash log submission"]
-    command = ["python", "./Tools/BuildSlaveSupport/trigger-crash-log-submission"]
+    command = ["python", "./Tools/CISupport/trigger-crash-log-submission"]
 
 
 class WaitForCrashCollection(shell.Compile):
@@ -138,7 +138,7 @@
     name = "wait-for-crash-collection"
     description = ["waiting for crash collection to quiesce"]
     descriptionDone = ["crash collection has quiesced"]
-    command = ["python", "./Tools/BuildSlaveSupport/wait-for-crash-collection", "--timeout", str(5 * 60)]
+    command = ["python", "./Tools/CISupport/wait-for-crash-collection", "--timeout", str(5 * 60)]
 
 
 class CleanBuildIfScheduled(shell.Compile):
@@ -145,7 +145,7 @@
     name = "delete-WebKitBuild-directory"
     description = ["deleting WebKitBuild directory"]
     descriptionDone = ["deleted WebKitBuild directory"]
-    command = ["python", "./Tools/BuildSlaveSupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+    command = ["python", "./Tools/CISupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
 
     def start(self):
         if not self.getProperty('is_clean'):
@@ -158,7 +158,7 @@
     name = "delete-stale-build-files"
     description = ["deleting stale build files"]
     descriptionDone = ["deleted stale build files"]
-    command = ["python", "./Tools/BuildSlaveSupport/delete-stale-build-files", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+    command = ["python", "./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.
@@ -274,7 +274,7 @@
 
 
 class ArchiveBuiltProduct(shell.ShellCommand):
-    command = ["python", "./Tools/BuildSlaveSupport/built-product-archive",
+    command = ["python", "./Tools/CISupport/built-product-archive",
                WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive"]
     name = "archive-built-product"
     description = ["archiving built product"]
@@ -283,7 +283,7 @@
 
 
 class ArchiveMinifiedBuiltProduct(ArchiveBuiltProduct):
-    command = ["python", "./Tools/BuildSlaveSupport/built-product-archive",
+    command = ["python", "./Tools/CISupport/built-product-archive",
                WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive", "--minify"]
 
 
@@ -310,7 +310,7 @@
 
 
 class ExtractBuiltProduct(shell.ShellCommand):
-    command = ["python", "./Tools/BuildSlaveSupport/built-product-archive",
+    command = ["python", "./Tools/CISupport/built-product-archive",
                WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "extract"]
     name = "extract-built-product"
     description = ["extracting built product"]
@@ -337,7 +337,7 @@
 
 
 class DownloadBuiltProduct(shell.ShellCommand):
-    command = ["python", "./Tools/BuildSlaveSupport/download-built-product",
+    command = ["python", "./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"
@@ -563,7 +563,7 @@
     resultDirectory = os.path.join(RunWebKitTests.resultDirectory, "dashboard-layout-test-results")
 
     def start(self):
-        self.setCommand(self.command + ["--layout-tests-directory", "./Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests"])
+        self.setCommand(self.command + ["--layout-tests-directory", "./Tools/CISupport/build.webkit.org-config/public_html/dashboard/Scripts/tests"])
         return RunWebKitTests.start(self)
 
 
@@ -1002,7 +1002,7 @@
 
 
 class ArchiveTestResults(shell.ShellCommand):
-    command = ["python", "./Tools/BuildSlaveSupport/test-result-archive",
+    command = ["python", "./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/build.webkit.org-config/wkbuild.py (269051 => 269052)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/CISupport/build.webkit.org-config/wkbuild.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -59,7 +59,7 @@
         ("Examples", []),
         ("PerformanceTests", []),
         ("ManualTests", []),
-        ("Tools/BuildSlaveSupport/build.webkit.org-config/public_html", []),
+        ("Tools/CISupport/build.webkit.org-config/public_html", []),
         ("Websites", []),
         ("opengl", []),
         ("opentype", []),

Modified: trunk/Tools/CISupport/build.webkit.org-config/wkbuild_unittest.py (269051 => 269052)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/CISupport/build.webkit.org-config/wkbuild_unittest.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -65,7 +65,7 @@
         (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
         (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
         (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
-        (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
+        (["Tools/CISupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
     ]
 
     def test_should_build(self):

Modified: trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py (269051 => 269052)


--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/CISupport/ews-app/ews/views/statusbubble.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -40,7 +40,7 @@
 
 
 class StatusBubble(View):
-    # These queue names are from shortname in https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/ews-build/config.json
+    # These queue names are from shortname in https://trac.webkit.org/browser/webkit/trunk/Tools/CISupport/ews-build/config.json
     # 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', 'tv', 'tv-sim', 'watch', 'watch-sim', 'gtk', 'wpe', 'wincairo', 'win',

Modified: trunk/Tools/CISupport/ews-build/steps.py (269051 => 269052)


--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/CISupport/ews-build/steps.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -255,9 +255,9 @@
     ]
 
     services_paths = [
-        'Tools/BuildSlaveSupport/build.webkit.org-config',
-        'Tools/BuildSlaveSupport/ews-build',
-        'Tools/BuildSlaveSupport/Shared',
+        'Tools/CISupport/build.webkit.org-config',
+        'Tools/CISupport/ews-build',
+        'Tools/CISupport/Shared',
         'Tools/Scripts/libraries/resultsdbpy',
     ]
 
@@ -1125,7 +1125,7 @@
     command = ['python', 'steps_unittest.py']
 
     def __init__(self, **kwargs):
-        shell.ShellCommand.__init__(self, workdir='build/Tools/BuildSlaveSupport/build.webkit.org-config', timeout=2 * 60, logEnviron=False, **kwargs)
+        shell.ShellCommand.__init__(self, workdir='build/Tools/CISupport/build.webkit.org-config', timeout=2 * 60, logEnviron=False, **kwargs)
 
     def getResultSummary(self):
         if self.results == SUCCESS:
@@ -1136,7 +1136,7 @@
 class RunEWSUnitTests(shell.ShellCommand):
     name = 'ews-unit-tests'
     description = ['ews-unit-tests running']
-    command = ['python', 'Tools/BuildSlaveSupport/ews-build/runUnittests.py']
+    command = ['python', 'Tools/CISupport/ews-build/runUnittests.py']
 
     def __init__(self, **kwargs):
         super(RunEWSUnitTests, self).__init__(timeout=2 * 60, logEnviron=False, **kwargs)
@@ -1153,7 +1153,7 @@
     command = ['buildbot', 'checkconfig']
 
     def __init__(self, **kwargs):
-        super(RunEWSBuildbotCheckConfig, self).__init__(workdir='build/Tools/BuildSlaveSupport/ews-build', timeout=2 * 60, logEnviron=False, **kwargs)
+        super(RunEWSBuildbotCheckConfig, self).__init__(workdir='build/Tools/CISupport/ews-build', timeout=2 * 60, logEnviron=False, **kwargs)
 
     def getResultSummary(self):
         if self.results == SUCCESS:
@@ -1824,7 +1824,7 @@
     name = 'delete-WebKitBuild-directory'
     description = ['deleting WebKitBuild directory']
     descriptionDone = ['Deleted WebKitBuild directory']
-    command = ['python', 'Tools/BuildSlaveSupport/clean-build', WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s')]
+    command = ['python', 'Tools/CISupport/clean-build', WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s')]
 
 
 class KillOldProcesses(shell.Compile):
@@ -1831,7 +1831,7 @@
     name = 'kill-old-processes'
     description = ['killing old processes']
     descriptionDone = ['Killed old processes']
-    command = ['python', 'Tools/BuildSlaveSupport/kill-old-processes', 'buildbot']
+    command = ['python', 'Tools/CISupport/kill-old-processes', 'buildbot']
 
     def __init__(self, **kwargs):
         super(KillOldProcesses, self).__init__(timeout=60, logEnviron=False, **kwargs)
@@ -1851,7 +1851,7 @@
     name = 'trigger-crash-log-submission'
     description = ['triggering crash log submission']
     descriptionDone = ['Triggered crash log submission']
-    command = ['python', 'Tools/BuildSlaveSupport/trigger-crash-log-submission']
+    command = ['python', 'Tools/CISupport/trigger-crash-log-submission']
 
     def __init__(self, **kwargs):
         super(TriggerCrashLogSubmission, self).__init__(timeout=60, logEnviron=False, **kwargs)
@@ -1866,7 +1866,7 @@
     name = 'wait-for-crash-collection'
     description = ['waiting-for-crash-collection-to-quiesce']
     descriptionDone = ['Crash collection has quiesced']
-    command = ['python', 'Tools/BuildSlaveSupport/wait-for-crash-collection', '--timeout', str(5 * 60)]
+    command = ['python', 'Tools/CISupport/wait-for-crash-collection', '--timeout', str(5 * 60)]
 
     def __init__(self, **kwargs):
         super(WaitForCrashCollection, self).__init__(timeout=6 * 60, logEnviron=False, **kwargs)
@@ -2339,7 +2339,7 @@
 
 
 class ArchiveBuiltProduct(shell.ShellCommand):
-    command = ['python', 'Tools/BuildSlaveSupport/built-product-archive',
+    command = ['python', 'Tools/CISupport/built-product-archive',
                WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'archive']
     name = 'archive-built-product'
     description = ['archiving built product']
@@ -2414,7 +2414,7 @@
 
 
 class DownloadBuiltProduct(shell.ShellCommand):
-    command = ['python', 'Tools/BuildSlaveSupport/download-built-product',
+    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')]
     name = 'download-built-product'
@@ -2438,7 +2438,7 @@
 
 
 class DownloadBuiltProductFromMaster(DownloadBuiltProduct):
-    command = ['python', 'Tools/BuildSlaveSupport/download-built-product',
+    command = ['python', 'Tools/CISupport/download-built-product',
         WithProperties('--%(configuration)s'),
         WithProperties(EWS_BUILD_URL + 'archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
     haltOnFailure = True
@@ -2454,7 +2454,7 @@
 
 
 class ExtractBuiltProduct(shell.ShellCommand):
-    command = ['python', 'Tools/BuildSlaveSupport/built-product-archive',
+    command = ['python', 'Tools/CISupport/built-product-archive',
                WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'extract']
     name = 'extract-built-product'
     description = ['extracting built product']
@@ -2696,7 +2696,7 @@
             print('Error in sending email for pre-existing failure: {}'.format(e))
 
 class ArchiveTestResults(shell.ShellCommand):
-    command = ['python', 'Tools/BuildSlaveSupport/test-result-archive',
+    command = ['python', '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 (269051 => 269052)


--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -626,7 +626,7 @@
     def test_success(self):
         self.setupStep(RunEWSBuildbotCheckConfig())
         self.expectRemoteCommands(
-            ExpectShell(workdir='build/Tools/BuildSlaveSupport/ews-build',
+            ExpectShell(workdir='build/Tools/CISupport/ews-build',
                         timeout=120,
                         logEnviron=False,
                         command=['buildbot', 'checkconfig'],
@@ -639,7 +639,7 @@
     def test_failure(self):
         self.setupStep(RunEWSBuildbotCheckConfig())
         self.expectRemoteCommands(
-            ExpectShell(workdir='build/Tools/BuildSlaveSupport/ews-build',
+            ExpectShell(workdir='build/Tools/CISupport/ews-build',
                         timeout=120,
                         logEnviron=False,
                         command=['buildbot', 'checkconfig'],
@@ -665,7 +665,7 @@
             ExpectShell(workdir='wkdir',
                         timeout=120,
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/ews-build/runUnittests.py'],
+                        command=['python', 'Tools/CISupport/ews-build/runUnittests.py'],
                         )
             + 0,
         )
@@ -678,7 +678,7 @@
             ExpectShell(workdir='wkdir',
                         timeout=120,
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/ews-build/runUnittests.py'],
+                        command=['python', 'Tools/CISupport/ews-build/runUnittests.py'],
                         )
             + ExpectShell.log('stdio', stdout='Unhandled Error. Traceback (most recent call last): Keys in cmd missing from expectation: [logfiles.json]')
             + 2,
@@ -734,7 +734,7 @@
     def test_success(self):
         self.setupStep(RunBuildWebKitOrgUnitTests())
         self.expectRemoteCommands(
-            ExpectShell(workdir='build/Tools/BuildSlaveSupport/build.webkit.org-config',
+            ExpectShell(workdir='build/Tools/CISupport/build.webkit.org-config',
                         timeout=120,
                         logEnviron=False,
                         command=['python', 'steps_unittest.py'],
@@ -747,7 +747,7 @@
     def test_failure(self):
         self.setupStep(RunBuildWebKitOrgUnitTests())
         self.expectRemoteCommands(
-            ExpectShell(workdir='build/Tools/BuildSlaveSupport/build.webkit.org-config',
+            ExpectShell(workdir='build/Tools/CISupport/build.webkit.org-config',
                         timeout=120,
                         logEnviron=False,
                         command=['python', 'steps_unittest.py'],
@@ -771,7 +771,7 @@
         self.setupStep(KillOldProcesses())
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
-                        command=['python', 'Tools/BuildSlaveSupport/kill-old-processes', 'buildbot'],
+                        command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
                         logEnviron=False,
                         timeout=60,
                         )
@@ -784,7 +784,7 @@
         self.setupStep(KillOldProcesses())
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
-                        command=['python', 'Tools/BuildSlaveSupport/kill-old-processes', 'buildbot'],
+                        command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
                         logEnviron=False,
                         timeout=60,
                         )
@@ -809,7 +809,7 @@
         self.setProperty('configuration', 'release')
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
-                        command=['python', 'Tools/BuildSlaveSupport/clean-build', '--platform=ios-11', '--release'],
+                        command=['python', 'Tools/CISupport/clean-build', '--platform=ios-11', '--release'],
                         )
             + 0,
         )
@@ -822,7 +822,7 @@
         self.setProperty('configuration', 'debug')
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
-                        command=['python', 'Tools/BuildSlaveSupport/clean-build', '--platform=ios-simulator-11', '--debug'],
+                        command=['python', 'Tools/CISupport/clean-build', '--platform=ios-simulator-11', '--debug'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected error.')
             + 2,
@@ -2463,7 +2463,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/built-product-archive', '--platform=ios-simulator',  '--release', 'archive'],
+                        command=['python', 'Tools/CISupport/built-product-archive', '--platform=ios-simulator',  '--release', 'archive'],
                         )
             + 0,
         )
@@ -2477,7 +2477,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/built-product-archive', '--platform=mac-sierra',  '--debug', 'archive'],
+                        command=['python', 'Tools/CISupport/built-product-archive', '--platform=mac-sierra',  '--debug', 'archive'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
@@ -2554,7 +2554,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--release', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/ios-simulator-12-x86_64-release/1234.zip'],
+                        command=['python', 'Tools/CISupport/download-built-product', '--release', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/ios-simulator-12-x86_64-release/1234.zip'],
                         )
             + 0,
         )
@@ -2570,7 +2570,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--debug', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/mac-sierra-x86_64-debug/123456.zip'],
+                        command=['python', 'Tools/CISupport/download-built-product', '--debug', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/mac-sierra-x86_64-debug/123456.zip'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
@@ -2596,7 +2596,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--release', 'https://ews-build.webkit.org/archives/ios-simulator-12-x86_64-release/1234.zip'],
+                        command=['python', 'Tools/CISupport/download-built-product', '--release', 'https://ews-build.webkit.org/archives/ios-simulator-12-x86_64-release/1234.zip'],
                         )
             + 0,
         )
@@ -2612,7 +2612,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--debug', 'https://ews-build.webkit.org/archives/mac-sierra-x86_64-debug/123456.zip'],
+                        command=['python', 'Tools/CISupport/download-built-product', '--debug', 'https://ews-build.webkit.org/archives/mac-sierra-x86_64-debug/123456.zip'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
@@ -2636,7 +2636,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/built-product-archive', '--platform=ios-simulator',  '--release', 'extract'],
+                        command=['python', 'Tools/CISupport/built-product-archive', '--platform=ios-simulator',  '--release', 'extract'],
                         )
             + 0,
         )
@@ -2650,7 +2650,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/built-product-archive', '--platform=mac-sierra',  '--debug', 'extract'],
+                        command=['python', 'Tools/CISupport/built-product-archive', '--platform=mac-sierra',  '--debug', 'extract'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,
@@ -3104,7 +3104,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/test-result-archive', '--platform=ios-simulator',  '--release', 'archive'],
+                        command=['python', 'Tools/CISupport/test-result-archive', '--platform=ios-simulator',  '--release', 'archive'],
                         )
             + 0,
         )
@@ -3119,7 +3119,7 @@
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        command=['python', 'Tools/BuildSlaveSupport/test-result-archive', '--platform=mac',  '--debug', 'archive'],
+                        command=['python', 'Tools/CISupport/test-result-archive', '--platform=mac',  '--debug', 'archive'],
                         )
             + ExpectShell.log('stdio', stdout='Unexpected failure.')
             + 2,

Modified: trunk/Tools/ChangeLog (269051 => 269052)


--- trunk/Tools/ChangeLog	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/ChangeLog	2020-10-27 17:38:13 UTC (rev 269052)
@@ -1,3 +1,28 @@
+2020-10-27  Aakash Jain  <[email protected]>
+
+        Rename BuildSlaveSupport to CISupport
+        https://bugs.webkit.org/show_bug.cgi?id=218026
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport: Copied from Tools/BuildSlaveSupport.
+        * CISupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js:
+        * CISupport/build.webkit.org-config/steps.py:
+        * CISupport/build.webkit.org-config/wkbuild.py:
+        * CISupport/build.webkit.org-config/wkbuild_unittest.py:
+        * CISupport/ews-app/ews/views/statusbubble.py:
+        * CISupport/ews-build/steps.py:
+        * CISupport/ews-build/steps_unittest.py:
+        * BuildSlaveSupport: Replaced.
+        * EWSTools/Start-Queue.ps1:
+        * Scripts/bisect-builds:
+        * Scripts/run-dashboard-tests:
+        * Scripts/webkitpy/common/config/watchlist:
+        * Scripts/webkitpy/layout_tests/views/buildbot_results.py:
+        * Scripts/webkitpy/style/checker_unittest.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        * .gitattributes:
+
 2020-10-27  Sam Weinig  <[email protected]>
 
         Rename WKPreferencesSet*ValueForKey SPI to WKPreferencesSet*ValueForKeyForTesting

Modified: trunk/Tools/EWSTools/Start-Queue.ps1 (269051 => 269052)


--- trunk/Tools/EWSTools/Start-Queue.ps1	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/EWSTools/Start-Queue.ps1	2020-10-27 17:38:13 UTC (rev 269052)
@@ -99,5 +99,5 @@
 
     perl ./Tools/Scripts/update-webkit;
     python ./Tools/Scripts/webkit-patch $queue --bot-id=$name --no-confirm --exit-after-iteration $iterations;
-    python /Tools/BuildSlaveSupport/kill-old-processes
+    python /Tools/CISupport/kill-old-processes
 }

Modified: trunk/Tools/Scripts/bisect-builds (269051 => 269052)


--- trunk/Tools/Scripts/bisect-builds	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/Scripts/bisect-builds	2020-10-27 17:38:13 UTC (rev 269052)
@@ -68,13 +68,13 @@
     api_url = get_api_archive_url(options)
     s3_url = get_s3_location_for_revision(api_url, revision)
     print('Archive URL: {}'.format(s3_url))
-    command = ['python', '../BuildSlaveSupport/download-built-product', '--{}'.format(options.configuration), '--platform', options.platform, s3_url]
+    command = ['python', '../CISupport/download-built-product', '--{}'.format(options.configuration), '--platform', options.platform, s3_url]
     print('Downloading revision: {}'.format(revision))
     subprocess.check_call(command)
 
 
 def extract_archive(options):
-    command = ['python', '../BuildSlaveSupport/built-product-archive', '--platform', options.platform, '--%s' % options.configuration, 'extract']
+    command = ['python', '../CISupport/built-product-archive', '--platform', options.platform, '--%s' % options.configuration, 'extract']
     subprocess.check_call(command)
 
 

Modified: trunk/Tools/Scripts/run-dashboard-tests (269051 => 269052)


--- trunk/Tools/Scripts/run-dashboard-tests	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/Scripts/run-dashboard-tests	2020-10-27 17:38:13 UTC (rev 269052)
@@ -25,6 +25,6 @@
 
 TOOLS_DIRECTORY="$(dirname $0)"
 RUN_WEBKIT_TESTS="$TOOLS_DIRECTORY/run-webkit-tests"
-TEST_DIRECTORY="$TOOLS_DIRECTORY/../BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests"
+TEST_DIRECTORY="$TOOLS_DIRECTORY/../CISupport/build.webkit.org-config/public_html/dashboard/Scripts/tests"
 
 $RUN_WEBKIT_TESTS --layout-tests-directory=$TEST_DIRECTORY "$@"

Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (269051 => 269052)


--- trunk/Tools/Scripts/webkitpy/common/config/watchlist	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist	2020-10-27 17:38:13 UTC (rev 269052)
@@ -33,8 +33,8 @@
         "WebIDL": {
             "filename": r"Source/WebCore/(?!inspector)(?!testing).*\.idl"
         },
-        "BuildSlaveSupport": {
-            "filename": r"Tools/BuildSlaveSupport/",
+        "CISupport": {
+            "filename": r"Tools/CISupport/",
         },
         "webkitpy": {
             "filename": r"Tools/Scripts/webkitpy/",
@@ -412,7 +412,7 @@
         "Animation" : [ "[email protected]", "[email protected]", "[email protected]" ],
         "MotionMark" : [ "[email protected]" ],
         "BindingsScripts": [ "[email protected]" ],
-        "BuildSlaveSupport": [ "[email protected]" ],
+        "CISupport": [ "[email protected]" ],
         "CMake": [ "[email protected]", "[email protected]", "[email protected]", "[email protected]" ],
         "CoordinatedGraphics" : [ "[email protected]", "[email protected]", "[email protected]", "[email protected]", "[email protected]", "[email protected]", "[email protected]" ],
         "ConsoleUsage" : [ "[email protected]" ],

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py (269051 => 269052)


--- trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -39,7 +39,7 @@
 
 class BuildBotPrinter(object):
     # This output is parsed by buildbots and must only be changed in coordination with buildbot scripts (see webkit.org's
-    # Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg: RunWebKitTests._parseNewRunWebKitTestsOutput
+    # Tools/CISupport/build.webkit.org-config/master.cfg: RunWebKitTests._parseNewRunWebKitTestsOutput
     # and chromium.org's buildbot/master.chromium/scripts/master/log_parser/webkit_test_command.py).
 
     def __init__(self, stream, debug_logging):

Modified: trunk/Tools/Scripts/webkitpy/style/checker_unittest.py (269051 => 269052)


--- trunk/Tools/Scripts/webkitpy/style/checker_unittest.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/Scripts/webkitpy/style/checker_unittest.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -501,7 +501,7 @@
         """Test paths that should be checked as JSON."""
         paths = [
            os.path.join('Source', 'WebCore', 'inspector', 'Inspector.json'),
-           os.path.join('Tools', 'BuildSlaveSupport', 'build.webkit.org-config', 'config.json'),
+           os.path.join('Tools', 'CISupport', 'build.webkit.org-config', 'config.json'),
         ]
 
         for path in paths:

Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py (269051 => 269052)


--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py	2020-10-27 17:35:09 UTC (rev 269051)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py	2020-10-27 17:38:13 UTC (rev 269052)
@@ -69,7 +69,7 @@
         '..',
         '..',
         '..',
-        'BuildSlaveSupport',
+        'CISupport',
         'build.webkit.org-config',
         'public_html',
         'TestFailures')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to