Changeset 269699 in webkit

Timestamp:

Nov 11, 2020 12:56:46 PM (3 years ago)

Author:

aakash_jain@apple.com

Message:

[build.webkit.org] Update CheckOutSource step for new buildbot
​https://bugs.webkit.org/show_bug.cgi?id=218802

Reviewed by Jonathan Bedard.

• CISupport/build-webkit-org/steps.py:

(CheckOutSource):
(CheckOutSource.init):

Location:

trunk/Tools

Files:

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

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

@@ -22 +22 @@
 
 from buildbot.process import buildstep, factory, properties
-from buildbot.steps import master, shell, source, transfer, trigger
+from buildbot.steps import master, shell, transfer, trigger
 from buildbot.status.builder import SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION
 
@@ -45 +45 @@
     Interpolate = properties.Interpolate
     from buildbot.process import logobserver
+    from buildbot.steps.source.svn import SVN
 else:
+    from buildbot.steps.source import SVN
     logobserver = lambda: None
     logobserver.LineConsumerLogObserver = type('LineConsumerLogObserver', (object,), {})
@@ -132 +134 @@
 
 
-class CheckOutSource(source.SVN):
-    mode = "update"
-
+class CheckOutSource(SVN):
     def __init__(self, **kwargs):
-        kwargs['baseURL'] = "https://svn.webkit.org/repository/webkit/"
-        kwargs['defaultBranch'] = "trunk"
-        kwargs['mode'] = self.mode
-        source.SVN.__init__(self, **kwargs)
+        if USE_BUILDBOT_VERSION2:
+            kwargs['repourl'] = 'https://svn.webkit.org/repository/webkit/trunk'
+            kwargs['mode'] = 'incremental'
+        else:
+            kwargs['baseURL'] = "https://svn.webkit.org/repository/webkit/"
+            kwargs['defaultBranch'] = "trunk"
+            kwargs['mode'] = 'update'
+        super(CheckOutSource, self).__init__(**kwargs)
 
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-11  Aakash Jain  <aakash_jain@apple.com>
+
+        [build.webkit.org] Update CheckOutSource step for new buildbot
+        https://bugs.webkit.org/show_bug.cgi?id=218802
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/build-webkit-org/steps.py:
+        (CheckOutSource):
+        (CheckOutSource.__init__):
+
 2020-11-11  Chris Dumez  <cdumez@apple.com>