[webkit-changes] [268768] trunk/Tools

[aakash_jain]

Title: [268768] trunk/Tools

Revision

268768

Author

aakash_j...@apple.com

Date

2020-10-20 15:33:03 -0700 (Tue, 20 Oct 2020)

Log Message

[build.webkit.org] Rename slavename to workername in steps.py
https://bugs.webkit.org/show_bug.cgi?id=217988

Reviewed by Dewei Zhu.

* BuildSlaveSupport/build.webkit.org-config/steps.py:

Modified Paths

• trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
• trunk/Tools/ChangeLog

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (268767 => 268768)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py	2020-10-20 22:25:16 UTC (rev 268767)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py	2020-10-20 22:33:03 UTC (rev 268768)
@@ -97,6 +97,9 @@
         self.setProperty("buildOnly", self.buildOnly)
         self.setProperty("additionalArguments", self.additionalArguments)
         self.setProperty("device_model", self.device_model)
+        worker_name = self.getProperty("slavename")
+        if worker_name:
+            self.setProperty("workername", worker_name)  # Temporary workaround for supporting both older and newer buildbot versions.
         self.finished(SUCCESS)
         return defer.succeed(None)
 
@@ -361,7 +364,7 @@
         WithProperties("--%(configuration)s"),
         "--builder-name", WithProperties("%(buildername)s"),
         "--build-number", WithProperties("%(buildnumber)s"),
-        "--buildbot-worker", WithProperties("%(slavename)s"),
+        "--buildbot-worker", WithProperties("%(workername)s"),
         "--buildbot-master", BUILD_WEBKIT_URL,
         "--report", RESULTS_WEBKIT_URL,
     ]
@@ -446,7 +449,7 @@
                "--clobber-old-results",
                "--builder-name", WithProperties("%(buildername)s"),
                "--build-number", WithProperties("%(buildnumber)s"),
-               "--buildbot-worker", WithProperties("%(slavename)s"),
+               "--buildbot-worker", WithProperties("%(workername)s"),
                "--master-name", "webkit.org",
                "--buildbot-master", BUILD_WEBKIT_URL,
                "--report", RESULTS_WEBKIT_URL,
@@ -580,7 +583,7 @@
         "--buildbot-master", BUILD_WEBKIT_URL,
         "--builder-name", WithProperties("%(buildername)s"),
         "--build-number", WithProperties("%(buildnumber)s"),
-        "--buildbot-worker", WithProperties("%(slavename)s"),
+        "--buildbot-worker", WithProperties("%(workername)s"),
         "--report", RESULTS_WEBKIT_URL,
     ]
     failedTestsFormatString = "%d api test%s failed or timed out"
@@ -640,7 +643,7 @@
         "--buildbot-master", BUILD_WEBKIT_URL,
         "--builder-name", WithProperties("%(buildername)s"),
         "--build-number", WithProperties("%(buildnumber)s"),
-        "--buildbot-worker", WithProperties("%(slavename)s"),
+        "--buildbot-worker", WithProperties("%(workername)s"),
         "--report", RESULTS_WEBKIT_URL,
     ]
     failedTestsFormatString = "%d python test%s failed"
@@ -700,7 +703,7 @@
         WithProperties("--%(configuration)s"),
         "--builder-name", WithProperties("%(buildername)s"),
         "--build-number", WithProperties("%(buildnumber)s"),
-        "--buildbot-worker", WithProperties("%(slavename)s"),
+        "--buildbot-worker", WithProperties("%(workername)s"),
         "--buildbot-master", BUILD_WEBKIT_URL,
         "--report", RESULTS_WEBKIT_URL,
     ]
@@ -740,7 +743,7 @@
         WithProperties("--%(configuration)s"),
         "--builder-name", WithProperties("%(buildername)s"),
         "--build-number", WithProperties("%(buildnumber)s"),
-        "--buildbot-worker", WithProperties("%(slavename)s"),
+        "--buildbot-worker", WithProperties("%(workername)s"),
         "--buildbot-master", BUILD_WEBKIT_URL,
         "--report", RESULTS_WEBKIT_URL,
     ]

Modified: trunk/Tools/ChangeLog (268767 => 268768)

--- trunk/Tools/ChangeLog	2020-10-20 22:25:16 UTC (rev 268767)
+++ trunk/Tools/ChangeLog	2020-10-20 22:33:03 UTC (rev 268768)
@@ -1,5 +1,14 @@
 2020-10-20  Aakash Jain  <aakash_j...@apple.com>
 
+        [build.webkit.org] Rename slavename to workername in steps.py
+        https://bugs.webkit.org/show_bug.cgi?id=217988
+
+        Reviewed by Dewei Zhu.
+
+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
+
+2020-10-20  Aakash Jain  <aakash_j...@apple.com>
+
         Make report-non-inclusive-language ignore autoinstalled directories and certain file types (follow-up fix)
         https://bugs.webkit.org/show_bug.cgi?id=217972
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes