Attachment 342779 Details for Bug 186635 – Patch

[patch] Patch

bug-186635-20180615020453.patch (text/plain), 3.71 KB, created by Carlos Alberto Lopez Perez on 2018-06-14 17:04:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Alberto Lopez Perez

Created: 2018-06-14 17:04:54 PDT

Size: 3.71 KB

patch

obsolete

>Subversion Revision: 232859
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2e7625625f2cec9117ad8852441263d230de846c..a198cf58d1ba97113a0871a01f1662d0b25a7c33 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,31 @@
>+2018-06-14  Carlos Alberto Lopez Perez  <clopez@igalia.com>
>+
>+        [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 NOBODY (OOPS!).
>+
>+        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  Matt Lewis  <jlewis3@apple.com>
> 
>         Unreviewed, rolling out r232823.
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py b/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py
>index f8b733e316672f98c213a6d864bcb67e54f0c5a9..f99625bc7a1ce673e0527737fc99455e0ee52315 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py
>@@ -200,7 +200,7 @@ class BuildAndPerfTestFactory(Factory):
>         self.addStep(CompileWebKit())
>         self.addStep(RunAndUploadPerfTests())
>         if platform == "gtk":
>-            self.addStep(RunBenchmarkTests())
>+            self.addStep(RunBenchmarkTests(timeout=2000))
> 
> 
> class DownloadAndPerfTestFactory(Factory):
>@@ -210,4 +210,4 @@ class DownloadAndPerfTestFactory(Factory):
>         self.addStep(ExtractBuiltProduct())
>         self.addStep(RunAndUploadPerfTests())
>         if platform == "gtk":
>-            self.addStep(RunBenchmarkTests())
>+            self.addStep(RunBenchmarkTests(timeout=2000))
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>index 19d5df71b65fb421f572ea7698ccf8a783353700..cad9b9bb5191a2a3f2d73b39037fbb666a881c76 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>@@ -825,10 +825,6 @@ class RunBenchmarkTests(shell.Test):
>     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")]

Actions: View | Formatted Diff | Diff

Attachments on bug 186635: 342779