Title: [232866] trunk/Tools
- Revision
- 232866
- Author
- [email protected]
- Date
- 2018-06-14 19:11:35 -0700 (Thu, 14 Jun 2018)
Log Message
[GTK][buildbot] Raise timeouts for the step benchmark-test on the GTK perf bot
https://bugs.webkit.org/show_bug.cgi?id=186635
Reviewed by Michael Catanzaro.
The current maximum timeout for a run-benchmark test is 1800 (Motionmark plan),
but the buildbot default timeout for the whole step without text output is 1200.
That means that a timeout on a single test can cause a whole step abort because
the buildbot one will trigger first.
Set the benchmark-test step timeout to 2000 to avoid this.
When this benchmark-test was added in r197505 it was already added with a higher
timeout than default (1500) due to the above problem, but it seems this has been
ignored so far because buildbot won't accept the timeout to be set on the class
definition (not even on the class constructor).
The new timeout has to be defined in the addStep call itself.
I have double-checked that by testing locally with the script run-buildbot-test.py
And this upstream issue confirms that https://github.com/buildbot/buildbot/issues/3887
* BuildSlaveSupport/build.webkit.org-config/factories.py:
(BuildAndPerfTestFactory.__init__):
(DownloadAndPerfTestFactory.__init__):
* BuildSlaveSupport/build.webkit.org-config/steps.py:
(RunBenchmarkTests):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py (232865 => 232866)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py 2018-06-15 01:53:58 UTC (rev 232865)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py 2018-06-15 02:11:35 UTC (rev 232866)
@@ -200,7 +200,7 @@
self.addStep(CompileWebKit())
self.addStep(RunAndUploadPerfTests())
if platform == "gtk":
- self.addStep(RunBenchmarkTests())
+ self.addStep(RunBenchmarkTests(timeout=2000))
class DownloadAndPerfTestFactory(Factory):
@@ -210,4 +210,4 @@
self.addStep(ExtractBuiltProduct())
self.addStep(RunAndUploadPerfTests())
if platform == "gtk":
- self.addStep(RunBenchmarkTests())
+ self.addStep(RunBenchmarkTests(timeout=2000))
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (232865 => 232866)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2018-06-15 01:53:58 UTC (rev 232865)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2018-06-15 02:11:35 UTC (rev 232866)
@@ -825,10 +825,6 @@
name = "benchmark-test"
description = ["benchmark tests running"]
descriptionDone = ["benchmark tests"]
- # Buildbot default timeout without output for a step is 1200.
- # The current maximum timeout for a benchmark plan is also 1200.
- # So raise the buildbot timeout to avoid aborting this whole step when a test timeouts.
- timeout = 1500
command = ["python", "./Tools/Scripts/browserperfdash-benchmark", "--allplans",
"--config-file", "../../browserperfdash-benchmark-config.txt",
"--browser-version", WithProperties("r%(got_revision)s")]
Modified: trunk/Tools/ChangeLog (232865 => 232866)
--- trunk/Tools/ChangeLog 2018-06-15 01:53:58 UTC (rev 232865)
+++ trunk/Tools/ChangeLog 2018-06-15 02:11:35 UTC (rev 232866)
@@ -1,3 +1,31 @@
+2018-06-14 Carlos Alberto Lopez Perez <[email protected]>
+
+ [GTK][buildbot] Raise timeouts for the step benchmark-test on the GTK perf bot
+ https://bugs.webkit.org/show_bug.cgi?id=186635
+
+ Reviewed by Michael Catanzaro.
+
+ The current maximum timeout for a run-benchmark test is 1800 (Motionmark plan),
+ but the buildbot default timeout for the whole step without text output is 1200.
+ That means that a timeout on a single test can cause a whole step abort because
+ the buildbot one will trigger first.
+
+ Set the benchmark-test step timeout to 2000 to avoid this.
+
+ When this benchmark-test was added in r197505 it was already added with a higher
+ timeout than default (1500) due to the above problem, but it seems this has been
+ ignored so far because buildbot won't accept the timeout to be set on the class
+ definition (not even on the class constructor).
+ The new timeout has to be defined in the addStep call itself.
+ I have double-checked that by testing locally with the script run-buildbot-test.py
+ And this upstream issue confirms that https://github.com/buildbot/buildbot/issues/3887
+
+ * BuildSlaveSupport/build.webkit.org-config/factories.py:
+ (BuildAndPerfTestFactory.__init__):
+ (DownloadAndPerfTestFactory.__init__):
+ * BuildSlaveSupport/build.webkit.org-config/steps.py:
+ (RunBenchmarkTests):
+
2018-06-14 Roy Reapor <[email protected]>
Use new jQuery file layout
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
