Title: [268931] trunk/Tools
- Revision
- 268931
- Author
- aakash_j...@apple.com
- Date
- 2020-10-23 11:23:22 -0700 (Fri, 23 Oct 2020)
Log Message
[build.webkit.org] Create master.cfg for newer buildbot
https://bugs.webkit.org/show_bug.cgi?id=218102
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/build.webkit.org-config/buildbot.tac:
* BuildSlaveSupport/build.webkit.org-config/master_buildbot2.cfg: Copied from Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac (268930 => 268931)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac 2020-10-23 18:15:46 UTC (rev 268930)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac 2020-10-23 18:23:22 UTC (rev 268931)
@@ -1,10 +1,15 @@
import os
+USE_BUILDBOT_VERSION2 = os.getenv('USE_BUILDBOT_VERSION2') is not None
+
from twisted.application import service
from buildbot.master import BuildMaster
basedir = '.'
-configfile = r'master.cfg'
+if USE_BUILDBOT_VERSION2:
+ configfile = r'master_buildbot2.cfg'
+else:
+ configfile = r'master.cfg'
rotateLength = 50000000
maxRotatedFiles = 20
umask = 022
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master_buildbot2.cfg (0 => 268931)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master_buildbot2.cfg (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master_buildbot2.cfg 2020-10-23 18:23:22 UTC (rev 268931)
@@ -0,0 +1,48 @@
+# -*- python -*-
+# ex: set syntax=python:
+
+from buildbot.changes.pb import PBChangeSource
+from buildbot.status import html
+from buildbot.status.web.authz import Authz
+
+from committer_auth import CommitterAuth
+from loadConfig import *
+
+
+is_test_mode_enabled = os.getenv('BUILDBOT_TESTING') is not None
+
+c = BuildmasterConfig = {}
+
+c['change_source'] = PBChangeSource(port=16000)
+
+# permissions for WebStatus
+authz = Authz(
+ auth=CommitterAuth('auth.json'),
+ forceBuild='auth',
+ forceAllBuilds='auth',
+ pingBuilder=True,
+ gracefulShutdown=False,
+ stopBuild='auth',
+ stopAllBuilds='auth',
+ cancelPendingBuild='auth',
+ stopChange=True,
+ cleanShutdown=False)
+
+c['status'] = []
+c['status'].append(html.WebStatus(http_port=8710,
+ revlink="https://trac.webkit.org/changeset/%s",
+ changecommentlink=(r"(https://bugs\.webkit\.org/show_bug\.cgi\?id=|webkit\.org/b/)(\d+)", r"https://bugs.webkit.org/show_bug.cgi?id=\2"),
+ authz=authz))
+
+c['slavePortnum'] = 17000
+c['projectName'] = "WebKit"
+c['projectURL'] = "https://webkit.org"
+c['buildbotURL'] = "https://build.webkit.org/"
+
+c['buildHorizon'] = 1000
+c['logHorizon'] = 500
+c['eventHorizon'] = 200
+c['buildCacheSize'] = 60
+
+
+loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)
Modified: trunk/Tools/ChangeLog (268930 => 268931)
--- trunk/Tools/ChangeLog 2020-10-23 18:15:46 UTC (rev 268930)
+++ trunk/Tools/ChangeLog 2020-10-23 18:23:22 UTC (rev 268931)
@@ -1,3 +1,13 @@
+2020-10-23 Aakash Jain <aakash_j...@apple.com>
+
+ [build.webkit.org] Create master.cfg for newer buildbot
+ https://bugs.webkit.org/show_bug.cgi?id=218102
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/build.webkit.org-config/buildbot.tac:
+ * BuildSlaveSupport/build.webkit.org-config/master_buildbot2.cfg: Copied from Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg.
+
2020-10-23 Jonathan Bedard <jbed...@apple.com>
[webkitpy] Use webkitcorepy's autoinstaller for buildbot and twisted
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
