Changeset 271406 in webkit

Timestamp:

Jan 12, 2021, 9:30:52 AM (6 years ago)

Author:

aakash_jain@apple.com

Message:

[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):

Location:

trunk/Tools

Files:

• CISupport/build-webkit-org/loadConfig.py (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/CISupport/build-webkit-org/loadConfig.py

@@ -1 @@
-# 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
@@ -76 +76 @@
         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)
 

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-12  Aakash Jain  <aakash_jain@apple.com>
+
+        [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  <lmoura@igalia.com>