Title: [268601] trunk/Tools
- Revision
- 268601
- Author
- [email protected]
- Date
- 2020-10-16 12:18:37 -0700 (Fri, 16 Oct 2020)
Log Message
[build.webkit.org Rename slave to worker in steps.py
https://bugs.webkit.org/show_bug.cgi?id=217836
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/build.webkit.org-config/steps.py: Renamed slave to worker.
* BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Ditto.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (268600 => 268601)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2020-10-16 18:31:58 UTC (rev 268600)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2020-10-16 19:18:37 UTC (rev 268601)
@@ -316,12 +316,12 @@
class UploadBuiltProduct(transfer.FileUpload):
- slavesrc = WithProperties("WebKitBuild/%(configuration)s.zip")
+ workersrc = WithProperties("WebKitBuild/%(configuration)s.zip")
masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(got_revision)s.zip")
haltOnFailure = True
def __init__(self, **kwargs):
- kwargs['slavesrc'] = self.slavesrc
+ kwargs['slavesrc'] = self.workersrc
kwargs['masterdest'] = self.masterdest
kwargs['mode'] = 0o644
kwargs['blocksize'] = 1024 * 256
@@ -329,7 +329,7 @@
class UploadMinifiedBuiltProduct(UploadBuiltProduct):
- slavesrc = WithProperties("WebKitBuild/minified-%(configuration)s.zip")
+ workersrc = WithProperties("WebKitBuild/minified-%(configuration)s.zip")
masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/minified-%(got_revision)s.zip")
@@ -959,7 +959,7 @@
if cmd.rc == -1 & 0xff:
return ["build not up to date"]
elif cmd.rc == -2 & 0xff:
- return ["slave config JSON error"]
+ return ["worker config JSON error"]
elif cmd.rc == -3 & 0xff:
return ["output JSON merge error"]
elif cmd.rc == -4 & 0xff:
@@ -1008,11 +1008,11 @@
class UploadTestResults(transfer.FileUpload):
- slavesrc = "layout-test-results.zip"
+ workersrc = "layout-test-results.zip"
masterdest = WithProperties("public_html/results/%(buildername)s/r%(got_revision)s (%(buildnumber)s).zip")
def __init__(self, **kwargs):
- kwargs['slavesrc'] = self.slavesrc
+ kwargs['slavesrc'] = self.workersrc
kwargs['masterdest'] = self.masterdest
kwargs['mode'] = 0o644
kwargs['blocksize'] = 1024 * 256
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (268600 => 268601)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-10-16 18:31:58 UTC (rev 268600)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-10-16 19:18:37 UTC (rev 268601)
@@ -38,8 +38,8 @@
# When files are passed to the python interpreter on the command line (e.g. python test.py) __file__ is a relative path.
absolute_file_path = os.path.abspath(__file__)
webkit_org_config_dir = os.path.dirname(absolute_file_path)
- build_slave_support_dir = os.path.dirname(webkit_org_config_dir)
- webkit_tools_dir = os.path.dirname(build_slave_support_dir)
+ worker_support_dir = os.path.dirname(webkit_org_config_dir)
+ webkit_tools_dir = os.path.dirname(worker_support_dir)
scripts_dir = os.path.join(webkit_tools_dir, 'Scripts')
sys.path.append(scripts_dir)
@@ -361,7 +361,7 @@
TestWTF.WTF.StringConcatenate_Unsigned
**FAIL** WTF.StringConcatenate_Unsigned
- C:\\cygwin\\home\\buildbot\\slave\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
+ C:\\cygwin\\home\\buildbot\\worker\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
Value of: makeString("hello ", static_cast<unsigned short>(42) , " world")
Actual: hello 42 world
Expected: "hello * world"
@@ -388,7 +388,7 @@
TestWTF.WTF.StringConcatenate_Unsigned
**FAIL** WTF.StringConcatenate_Unsigned
- C:\\cygwin\\home\\buildbot\\slave\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
+ C:\\cygwin\\home\\buildbot\\worker\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
Value of: makeString("hello ", static_cast<unsigned short>(42) , " world")
Actual: hello 42 world
Expected: "hello * world"
@@ -397,7 +397,7 @@
TestWTF.WTF_Expected.Unexpected
**FAIL** WTF_Expected.Unexpected
- C:\cygwin\home\buildbot\slave\win-release\build\Tools\TestWebKitAPI\Tests\WTF\Expected.cpp:96
+ C:\\cygwin\\home\\buildbot\\worker\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\Expected.cpp:96
Value of: s1
Actual: oops
Expected: s0
@@ -465,7 +465,7 @@
TestWTF.WTF.StringConcatenate_Unsigned
**FAIL** WTF.StringConcatenate_Unsigned
- C:\\cygwin\\home\\buildbot\\slave\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
+ C:\\cygwin\\home\\buildbot\\worker\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
Value of: makeString("hello ", static_cast<unsigned short>(42) , " world")
Actual: hello 42 world
Expected: "hello * world"
@@ -474,7 +474,7 @@
TestWTF.WTF_Expected.Unexpected
**FAIL** WTF_Expected.Unexpected
- C:\cygwin\home\buildbot\slave\win-release\build\Tools\TestWebKitAPI\Tests\WTF\Expected.cpp:96
+ C:\\cygwin\\home\\buildbot\\worker\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\Expected.cpp:96
Value of: s1
Actual: oops
Expected: s0
@@ -648,7 +648,7 @@
self.assertResults(255, "build not up to date")
def test_build_bad_source_json(self):
- self.assertResults(254, "slave config JSON error")
+ self.assertResults(254, "worker config JSON error")
def test_build_bad_marge(self):
self.assertResults(253, "output JSON merge error")
Modified: trunk/Tools/ChangeLog (268600 => 268601)
--- trunk/Tools/ChangeLog 2020-10-16 18:31:58 UTC (rev 268600)
+++ trunk/Tools/ChangeLog 2020-10-16 19:18:37 UTC (rev 268601)
@@ -1,3 +1,13 @@
+2020-10-16 Aakash Jain <[email protected]>
+
+ [build.webkit.org Rename slave to worker in steps.py
+ https://bugs.webkit.org/show_bug.cgi?id=217836
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/build.webkit.org-config/steps.py: Renamed slave to worker.
+ * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Ditto.
+
2020-10-16 Jonathan Bedard <[email protected]>
[webkitpy] Use webkitcorepy's autoinstaller for plint
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
