Modified: trunk/Tools/CISupport/build-webkit-org/loadConfig.py (271405 => 271406)
--- trunk/Tools/CISupport/build-webkit-org/loadConfig.py 2021-01-12 17:20:08 UTC (rev 271405)
+++ trunk/Tools/CISupport/build-webkit-org/loadConfig.py 2021-01-12 17:30:52 UTC (rev 271406)
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2020 Apple Inc. All rights reserved.
+# Copyright (C) 2017-2021 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -75,20 +75,27 @@
schedulerClass = globals()[schedulerClassName]
c['schedulers'].append(schedulerClass(**scheduler))
- forceScheduler = ForceScheduler(
- name="force",
- builderNames=[str(builder['name']) for builder in config['builders']],
- reason=StringParameter(name="reason", default="", size=40),
+ # Setup force schedulers
+ builderNames = [str(builder['name']) for builder in config['builders']]
+ reason = StringParameter(name='reason', default='', size=40)
+ properties = [BooleanParameter(name='is_clean', label='Force Clean build')]
+ if USE_BUILDBOT_VERSION2:
+ forceScheduler = ForceScheduler(name='force', builderNames=builderNames, reason=reason, properties=properties)
+ else:
+ forceScheduler = ForceScheduler(
+ name='force',
+ builderNames=builderNames,
+ reason=reason,
- # Validate SVN revision: number or empty string
- revision=StringParameter(name="revision", default="", regex=re.compile(r'^(\d*)$')),
+ # Validate SVN revision: number or empty string
+ revision=StringParameter(name="revision", default="", regex=re.compile(r'^(\d*)$')),
- # Disable default enabled input fields: branch, repository, project, additional properties
- branch=FixedParameter(name="branch"),
- repository=FixedParameter(name="repository"),
- project=FixedParameter(name="project"),
- properties=[BooleanParameter(name="is_clean", label="Force Clean build")]
- )
+ # Disable default enabled input fields: branch, repository, project, additional properties
+ branch=FixedParameter(name="branch"),
+ repository=FixedParameter(name="repository"),
+ project=FixedParameter(name="project"),
+ properties=properties
+ )
c['schedulers'].append(forceScheduler)
c['builders'] = []
Modified: trunk/Tools/ChangeLog (271405 => 271406)
--- trunk/Tools/ChangeLog 2021-01-12 17:20:08 UTC (rev 271405)
+++ trunk/Tools/ChangeLog 2021-01-12 17:30:52 UTC (rev 271406)
@@ -1,3 +1,13 @@
+2021-01-12 Aakash Jain <[email protected]>
+
+ [build.webkit.org] Update force schedulers as per new buildbot
+ https://bugs.webkit.org/show_bug.cgi?id=220544
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/build-webkit-org/loadConfig.py:
+ (loadBuilderConfig):
+
2021-01-11 Lauro Moura <[email protected]>
[WPE] Gardening API test crash
