Title: [275950] trunk/Tools
- Revision
- 275950
- Author
- aakash_j...@apple.com
- Date
- 2021-04-14 09:55:49 -0700 (Wed, 14 Apr 2021)
Log Message
Add support for using local-worker for build.webkit.org
https://bugs.webkit.org/show_bug.cgi?id=224551
Reviewed by Carlos Alberto Lopez Perez.
* CISupport/build-webkit-org/loadConfig.py:
(loadBuilderConfig): Added local-worker support.
* CISupport/ews-build/loadConfig.py:
(loadBuilderConfig): Removed use_localhost_worker variable.
Modified Paths
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/loadConfig.py (275949 => 275950)
--- trunk/Tools/CISupport/build-webkit-org/loadConfig.py 2021-04-14 16:53:26 UTC (rev 275949)
+++ trunk/Tools/CISupport/build-webkit-org/loadConfig.py 2021-04-14 16:55:49 UTC (rev 275950)
@@ -61,6 +61,8 @@
checkValidSchedulers(config, config['schedulers'])
c['workers'] = [Worker(worker['name'], passwords.get(worker['name'], 'password'), max_builds=1) for worker in config['workers']]
+ if is_test_mode_enabled:
+ c['workers'].append(Worker('local-worker', 'password', max_builds=1))
c['schedulers'] = []
for scheduler in config['schedulers']:
@@ -91,6 +93,9 @@
builder['factory'] = factory(**factorykwargs)
+ if is_test_mode_enabled:
+ builder['workernames'].append('local-worker')
+
builder_name = builder['name']
for step in builder["factory"].steps:
step_name = step.buildStep().name
Modified: trunk/Tools/CISupport/ews-build/loadConfig.py (275949 => 275950)
--- trunk/Tools/CISupport/ews-build/loadConfig.py 2021-04-14 16:53:26 UTC (rev 275949)
+++ trunk/Tools/CISupport/ews-build/loadConfig.py 2021-04-14 16:55:49 UTC (rev 275950)
@@ -42,7 +42,6 @@
def loadBuilderConfig(c, is_test_mode_enabled=False, master_prefix_path='./'):
config = json.load(open(os.path.join(master_prefix_path, 'config.json')))
- use_localhost_worker = is_test_mode_enabled
if is_test_mode_enabled:
passwords = {}
else:
@@ -52,7 +51,7 @@
checkValidSchedulers(config, config['schedulers'])
c['workers'] = [Worker(worker['name'], passwords.get(worker['name'], 'password'), max_builds=worker.get('max_builds', 1)) for worker in config['workers']]
- if use_localhost_worker:
+ if is_test_mode_enabled:
c['workers'].append(Worker('local-worker', 'password', max_builds=1))
c['builders'] = []
@@ -70,7 +69,7 @@
builder['factory'] = factory(**factorykwargs)
- if use_localhost_worker:
+ if is_test_mode_enabled:
builder['workernames'].append('local-worker')
c['builders'].append(builder)
Modified: trunk/Tools/ChangeLog (275949 => 275950)
--- trunk/Tools/ChangeLog 2021-04-14 16:53:26 UTC (rev 275949)
+++ trunk/Tools/ChangeLog 2021-04-14 16:55:49 UTC (rev 275950)
@@ -1,5 +1,17 @@
2021-04-14 Aakash Jain <aakash_j...@apple.com>
+ Add support for using local-worker for build.webkit.org
+ https://bugs.webkit.org/show_bug.cgi?id=224551
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * CISupport/build-webkit-org/loadConfig.py:
+ (loadBuilderConfig): Added local-worker support.
+ * CISupport/ews-build/loadConfig.py:
+ (loadBuilderConfig): Removed use_localhost_worker variable.
+
+2021-04-14 Aakash Jain <aakash_j...@apple.com>
+
Commit queue isn't skipping builds and test on revert patches
https://bugs.webkit.org/show_bug.cgi?id=224477
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
