Skip to content

Commit

Permalink
[EWS] Skip upload of WPE Skia builds
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=270515

Reviewed by Jonathan Bedard.

Due to an oversight, WPE Skia build products are getting
uploaded to the same directory than cairo builds, which
is causing some of the cairo-builds to be overwritten
and used in the test runners.

Create a new WPE Skia factory that explicitly skips the
upload step, since we are not testing Skia builds yet,
and when we do, we will most likely use the WPE factory
and do away with cairo testing in a similar way.

* Tools/CISupport/ews-build/config.json:
* Tools/CISupport/ews-build/factories.py:
(WPESkiaBuildFactory):
* Tools/CISupport/ews-build/loadConfig.py:

Canonical link: https://commits.webkit.org/275688@main
  • Loading branch information
csaavedra committed Mar 5, 2024
1 parent c28bce0 commit 75f6f39
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
12 changes: 6 additions & 6 deletions Tools/CISupport/ews-build/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,12 @@
"triggered_by": ["wpe-build-ews"],
"workernames": ["igalia4-wpe-ews", "igalia5-wpe-ews", "igalia6-wpe-ews", "igalia7-wpe-ews", "igalia8-wpe-ews", "igalia9-wpe-ews", "igalia10-wpe-ews", "igalia11-wpe-ews"]
},
{
"name": "WPE-Skia-Build-EWS", "shortname": "wpe-skia", "icon": "buildOnly",
"factory": "WPESkiaBuildFactory", "platform": "wpe",
"configuration": "release", "architectures": ["x86_64"],
"workernames": ["igalia16-wpe-ews", "igalia17-wpe-ews", "igalia18-wpe-ews", "igalia19-wpe-ews"]
},
{
"name": "JSC-Tests-EWS", "shortname": "jsc", "icon": "buildAndTest",
"factory": "JSCBuildAndTestsFactory", "platform": "mac-monterey",
Expand Down Expand Up @@ -387,12 +393,6 @@
"name": "Safe-Merge-Queue", "shortname": "safe-merge", "icon": "buildAndTest",
"factory": "SafeMergeQueueFactory", "platform": "*",
"workernames": ["webkit-cq-01", "webkit-cq-02", "webkit-cq-03", "webkit-cq-04", "webkit-cq-05"]
},
{
"name": "WPE-Skia-Build-EWS", "shortname": "wpe-skia", "icon": "buildOnly",
"factory": "WPEBuildFactory", "platform": "wpe",
"configuration": "release", "architectures": ["x86_64"],
"workernames": ["igalia16-wpe-ews", "igalia17-wpe-ews", "igalia18-wpe-ews", "igalia19-wpe-ews"]
}
],
"schedulers": [
Expand Down
4 changes: 4 additions & 0 deletions Tools/CISupport/ews-build/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,10 @@ class WPEBuildFactory(BuildFactory):
branches = [r'main', r'webkit.+']


class WPESkiaBuildFactory(WPEBuildFactory):
skipUpload = True


class WPETestsFactory(TestFactory):
LayoutTestClass = RunWebKitTestsRedTree

Expand Down
8 changes: 4 additions & 4 deletions Tools/CISupport/ews-build/loadConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
from twisted.internet import defer

from .factories import (APITestsFactory, BindingsFactory, BuildFactory, CommitQueueFactory, Factory, GTKBuildFactory,
GTKTestsFactory, JSCBuildFactory, JSCBuildAndTestsFactory, JSCTestsFactory, MergeQueueFactory, SafeMergeQueueFactory, StressTestFactory,
StyleFactory, TestFactory, tvOSBuildFactory, WPEBuildFactory, WPETestsFactory, WebKitPerlFactory, WebKitPyFactory,
WinCairoFactory, iOSBuildFactory, iOSEmbeddedBuildFactory, iOSTestsFactory, macOSBuildFactory, macOSBuildOnlyFactory,
macOSWK1Factory, macOSWK2Factory, ServicesFactory, UnsafeMergeQueueFactory, WatchListFactory, watchOSBuildFactory)
GTKTestsFactory, JSCBuildFactory, JSCBuildAndTestsFactory, JSCTestsFactory, MergeQueueFactory, SafeMergeQueueFactory, StressTestFactory,
StyleFactory, TestFactory, tvOSBuildFactory, WPEBuildFactory, WPESkiaBuildFactory, WPETestsFactory, WebKitPerlFactory, WebKitPyFactory,
WinCairoFactory, iOSBuildFactory, iOSEmbeddedBuildFactory, iOSTestsFactory, macOSBuildFactory, macOSBuildOnlyFactory,
macOSWK1Factory, macOSWK2Factory, ServicesFactory, UnsafeMergeQueueFactory, WatchListFactory, watchOSBuildFactory)

BUILDER_NAME_LENGTH_LIMIT = 70
STEP_NAME_LENGTH_LIMIT = 50
Expand Down

0 comments on commit 75f6f39

Please sign in to comment.