[webkit-changes] [262975] trunk/Tools

Fri, 12 Jun 2020 14:03:33 -0700

Title: [262975] trunk/Tools
Revision
262975
Author
dp...@igalia.com
Date
2020-06-12 14:02:23 -0700 (Fri, 12 Jun 2020)

Log Message

[buildbot] [GTK][WPE] Move WebDriver test to own bot
https://bugs.webkit.org/show_bug.cgi?id=212527

Reviewed by Carlos Alberto Lopez Perez.

Move 'webdriver-test' step from GTK Release and GTK Debug test bots
to separated bots.

For bots that require a Wayland display (WPE and GTK Wayland),
'webdriver-test' step is run on the corresponding general test bot,
since it's not possible at the moment to run tests that require a
Wayland display in a bot set as a container.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/factories.py:
(TestFactory.__init__):
(TestWebDriverFactory):
(TestWebDriverFactory.__init__):
* BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (262974 => 262975)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2020-06-12 20:56:24 UTC (rev 262974)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2020-06-12 21:02:23 UTC (rev 262975)
@@ -80,6 +80,7 @@
                     { "name": "gtk-linux-bot-12", "platform": "gtk" },
                     { "name": "gtk-linux-bot-13", "platform": "gtk" },
                     { "name": "gtk-linux-bot-14", "platform": "gtk" },
+                    { "name": "gtk-linux-bot-15", "platform": "gtk" },
 
                     { "name": "jsconly-linux-igalia-bot-1", "platform": "jsc-only" },
                     { "name": "jsconly-linux-igalia-bot-2", "platform": "jsc-only" },
@@ -257,7 +258,7 @@
                     {
                       "name": "GTK Linux 64-bit Release (Build)", "type": "BuildAndGenerateJSCBundle", "builddir": "gtk-linux-64-release",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
-                      "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-tests-js",
+                      "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-tests-js", "gtk-linux-64-release-tests-webdriver",
                                    "gtk-linux-64-release-wayland-tests", "gtk-linux-64-release-perf-tests"],
                       "slavenames": ["gtk-linux-slave-2"]
                     },
@@ -272,9 +273,14 @@
                       "slavenames": ["gtk-linux-bot-12"]
                     },
                     {
+                      "name": "GTK Linux 64-bit Release (Tests WebDriver)", "type": "TestWebDriver", "builddir": "gtk-linux-64-release-tests-webdriver",
+                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
+                      "slavenames": ["gtk-linux-bot-14"]
+                    },
+                    {
                       "name": "GTK Linux 64-bit Debug (Build)", "type": "Build", "builddir": "gtk-linux-64-debug",
                       "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
-                      "triggers": ["gtk-linux-64-debug-tests", "gtk-linux-64-debug-tests-js"],
+                      "triggers": ["gtk-linux-64-debug-tests", "gtk-linux-64-debug-tests-js", "gtk-linux-64-debug-tests-webdriver"],
                       "slavenames": ["gtk-linux-slave-3"]
                     },
                     {
@@ -288,6 +294,11 @@
                       "slavenames": ["gtk-linux-bot-13"]
                     },
                     {
+                      "name": "GTK Linux 64-bit Debug (Tests WebDriver)", "type": "TestWebDriver", "builddir": "gtk-linux-64-debug-tests-webdriver",
+                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
+                      "slavenames": ["gtk-linux-bot-15"]
+                    },
+                    {
                       "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "gtk-linux-64-release-perf-tests",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--display-server=xorg"],
@@ -500,6 +511,9 @@
                     { "type": "Triggerable", "name": "gtk-linux-64-release-tests-js",
                       "builderNames": ["GTK Linux 64-bit Release (Tests JS)"]
                     },
+                    { "type": "Triggerable", "name": "gtk-linux-64-release-tests-webdriver",
+                      "builderNames": ["GTK Linux 64-bit Release (Tests WebDriver)"]
+                    },
                     { "type": "Triggerable", "name": "gtk-linux-64-debug-tests",
                       "builderNames": ["GTK Linux 64-bit Debug (Tests)"]
                     },
@@ -506,6 +520,9 @@
                     { "type": "Triggerable", "name": "gtk-linux-64-debug-tests-js",
                       "builderNames": ["GTK Linux 64-bit Debug (Tests JS)"]
                     },
+                    { "type": "Triggerable", "name": "gtk-linux-64-debug-tests-webdriver",
+                      "builderNames": ["GTK Linux 64-bit Debug (Tests WebDriver)"]
+                    },
                     { "type": "Triggerable", "name": "gtk-linux-64-release-perf-tests",
                       "builderNames": ["GTK Linux 64-bit Release (Perf)"]
                     },

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py (262974 => 262975)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py	2020-06-12 20:56:24 UTC (rev 262974)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py	2020-06-12 21:02:23 UTC (rev 262975)
@@ -116,9 +116,11 @@
             self.addStep(GenerateJSCBundle())
         if platform == "gtk":
             self.addStep(RunGtkAPITests())
-            self.addStep(RunWebDriverTests())
+            if additionalArguments and "--display-server=wayland" in additionalArguments:
+                self.addStep(RunWebDriverTests())
         if platform == "wpe":
             self.addStep(RunWPEAPITests())
+            self.addStep(RunWebDriverTests())
 
 
 class BuildAndTestFactory(TestFactory):
@@ -206,6 +208,14 @@
         self.addStep(RunTest262Tests())
 
 
+class TestWebDriverFactory(Factory):
+    def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, device_model=None):
+        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, device_model)
+        self.addStep(DownloadBuiltProduct())
+        self.addStep(ExtractBuiltProduct())
+        self.addStep(RunWebDriverTests())
+
+
 class TestWebKit1Factory(TestFactory):
     LayoutTestClass = RunWebKit1Tests

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (262974 => 262975)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	2020-06-12 20:56:24 UTC (rev 262974)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	2020-06-12 21:02:23 UTC (rev 262975)
@@ -564,11 +564,13 @@
     'JSCOnly Linux MIPS32el Release': ['configure build', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
 
     'GTK Linux 64-bit Debug (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
-    'GTK Linux 64-bit Debug (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests', 'webdriver-test'],
+    'GTK Linux 64-bit Debug (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
+    'GTK Linux 64-bit Debug (Tests WebDriver)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'webdriver-test'],
     'GTK Linux 64-bit Debug (Tests JS)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'test262-test'],
     'GTK Linux 64-bit Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'archive-built-product', 'upload', 'generate-jsc-bundle', 'transfer-to-s3', 'trigger'],
     'GTK Linux 64-bit Release (Perf)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'perf-test', 'benchmark-test'],
-    'GTK Linux 64-bit Release (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests', 'webdriver-test'],
+    'GTK Linux 64-bit Release (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
+    'GTK Linux 64-bit Release (Tests WebDriver)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'webdriver-test'],
     'GTK Linux 64-bit Release (Tests JS)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'test262-test'],
     'GTK Linux 64-bit Release Wayland (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests', 'webdriver-test'],
     'GTK Linux 64-bit Release Ubuntu LTS (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
@@ -585,10 +587,10 @@
     'WinCairo 64-bit WKL Release (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'wincairo-requirements', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
 
     'WPE Linux 64-bit Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
-    'WPE Linux 64-bit Release (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
+    'WPE Linux 64-bit Release (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests', 'webdriver-test'],
     'WPE Linux 64-bit Release (Tests JS)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'test262-test'],
     'WPE Linux 64-bit Debug (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
-    'WPE Linux 64-bit Debug (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
+    'WPE Linux 64-bit Debug (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests', 'webdriver-test'],
     'WPE Linux 64-bit Debug (Tests JS)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'test262-test'],
 }

Modified: trunk/Tools/ChangeLog (262974 => 262975)


--- trunk/Tools/ChangeLog	2020-06-12 20:56:24 UTC (rev 262974)
+++ trunk/Tools/ChangeLog	2020-06-12 21:02:23 UTC (rev 262975)
@@ -1,3 +1,25 @@
+2020-06-12  Diego Pino Garcia  <dp...@igalia.com>
+
+        [buildbot] [GTK][WPE] Move WebDriver test to own bot
+        https://bugs.webkit.org/show_bug.cgi?id=212527
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Move 'webdriver-test' step from GTK Release and GTK Debug test bots
+        to separated bots.
+
+        For bots that require a Wayland display (WPE and GTK Wayland),
+        'webdriver-test' step is run on the corresponding general test bot,
+        since it's not possible at the moment to run tests that require a 
+        Wayland display in a bot set as a container.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/factories.py:
+        (TestFactory.__init__):
+        (TestWebDriverFactory):
+        (TestWebDriverFactory.__init__):
+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
+
 2020-06-12  Takashi Komori  <takashi.kom...@sony.com>
 
         [Curl] Implement functions to use ResourceLoadStatistics.

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

Reply via email to