<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277275] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277275">277275</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2021-05-10 11:10:51 -0700 (Mon, 10 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[build.webkit.org] Rename master_buildbot2.cfg to master.cfg
https://bugs.webkit.org/show_bug.cgi?id=222600

Reviewed by Jonathan Bedard.

* CISupport/build-webkit-org/buildbot.tac:
* CISupport/build-webkit-org/master.cfg: Moved from Tools/CISupport/build-webkit-org/master_buildbot2.cfg.
* CISupport/build-webkit-org/master_buildbot2.cfg: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsCISupportbuildwebkitorgbuildbottac">trunk/Tools/CISupport/build-webkit-org/buildbot.tac</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsCISupportbuildwebkitorgmastercfg">trunk/Tools/CISupport/build-webkit-org/master.cfg</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsCISupportbuildwebkitorgmaster_buildbot2cfg">trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsCISupportbuildwebkitorgbuildbottac"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CISupport/build-webkit-org/buildbot.tac (277274 => 277275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CISupport/build-webkit-org/buildbot.tac      2021-05-10 18:10:03 UTC (rev 277274)
+++ trunk/Tools/CISupport/build-webkit-org/buildbot.tac 2021-05-10 18:10:51 UTC (rev 277275)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> from buildbot.master import BuildMaster
</span><span class="cx"> 
</span><span class="cx"> basedir = '.'
</span><del>-configfile = r'master_buildbot2.cfg'
</del><ins>+configfile = 'master.cfg'
</ins><span class="cx"> rotateLength = 50000000
</span><span class="cx"> maxRotatedFiles = 20
</span><span class="cx"> umask = 0o022
</span></span></pre></div>
<a id="trunkToolsCISupportbuildwebkitorgmastercfgfromrev277274trunkToolsCISupportbuildwebkitorgmaster_buildbot2cfg"></a>
<div class="copfile"><h4>Copied: trunk/Tools/CISupport/build-webkit-org/master.cfg (from rev 277274, trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg) (0 => 277275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CISupport/build-webkit-org/master.cfg                                (rev 0)
+++ trunk/Tools/CISupport/build-webkit-org/master.cfg   2021-05-10 18:10:51 UTC (rev 277275)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+import json
+import os
+import sys
+
+from buildbot.changes.pb import PBChangeSource
+from buildbot.plugins import util
+from datetime import timedelta
+from loadConfig import *
+
+# This is work-around for https://bugs.webkit.org/show_bug.cgi?id=222361
+from buildbot.process.buildstep import BuildStep
+BuildStep.warn_deprecated_if_oldstyle_subclass = lambda self, name: None
+
+
+is_test_mode_enabled = os.getenv('BUILDBOT_PRODUCTION') is None
+
+c = BuildmasterConfig = {}
+
+c['change_source'] = PBChangeSource(port=16000)
+
+# permissions for WebStatus
+
+c['www'] = dict(port=8710, plugins=dict(waterfall_view={}, console_view={}, grid_view={}), allowed_origins=["*"])
+c['www']['ui_default_config'] = {
+    'Builders.show_workers_name': True,
+    'Builders.buildFetchLimit': 1000,
+    'Workers.showWorkerBuilders': True,
+}
+
+if not is_test_mode_enabled:
+    passwords = json.load(open('passwords.json'))
+    admin_username = passwords.get('ADMIN_USERNAME')
+    admin_password = passwords.get('ADMIN_PASSWORD')
+    if not admin_username or not admin_password:
+        print('\n\nERROR: Admin username/password missing from passwords.json.\n')
+        sys.exit(1)
+    # See https://docs.buildbot.net/2.10.0/manual/configuration/www.html#example-configs
+    authz = util.Authz(
+        allowRules=[util.AnyControlEndpointMatcher(role="admin")],
+        roleMatchers=[util.RolesFromEmails(admin=[admin_username])]
+    )
+    auth = util.UserPasswordAuth({admin_username: admin_password})
+    c['www']['auth'] = auth
+    c['www']['authz'] = authz
+
+c['protocols'] = {'pb': {'port': 17000}}
+c['projectName'] = 'WebKit'
+c['projectURL'] = 'https://webkit.org'
+
+if is_test_mode_enabled:
+    c['buildbotURL'] = 'http://localhost:8710/'
+else:
+    c['buildbotURL'] = 'https://build.webkit.org/'
+    passwords = json.load(open('passwords.json'))
+    db_url = passwords.get('DB_URL')
+    db_name = passwords.get('DB_NAME')
+    db_username = passwords.get('DB_USERNAME')
+    db_password = passwords.get('DB_PASSWORD')
+    if None in [db_url, db_name, db_username, db_password]:
+        print('\n\nERROR: Database information missing from passwords.json.\n')
+        sys.exit(1)
+    # See https://docs.buildbot.net/2.10.0/manual/configuration/global.html#database-specification
+    c['db_url'] = 'postgresql://{}:{}@{}/{}'.format(db_username, db_password, db_url, db_name)
+    # configure a janitor to delete old logs
+    c['configurators'] = [util.JanitorConfigurator(logHorizon=timedelta(weeks=26), hour='1', dayOfWeek='*')]
+
+c['buildCacheSize'] = 60
+c['logCompressionMethod'] = 'lz4'
+c['buildbotNetUsageData'] = None
+
+loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)
</ins></span></pre></div>
<a id="trunkToolsCISupportbuildwebkitorgmaster_buildbot2cfg"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg (277274 => 277275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg      2021-05-10 18:10:03 UTC (rev 277274)
+++ trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg 2021-05-10 18:10:51 UTC (rev 277275)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-import json
-import os
-import sys
-
-from buildbot.changes.pb import PBChangeSource
-from buildbot.plugins import util
-from datetime import timedelta
-from loadConfig import *
-
-# This is work-around for https://bugs.webkit.org/show_bug.cgi?id=222361
-from buildbot.process.buildstep import BuildStep
-BuildStep.warn_deprecated_if_oldstyle_subclass = lambda self, name: None
-
-
-is_test_mode_enabled = os.getenv('BUILDBOT_PRODUCTION') is None
-
-c = BuildmasterConfig = {}
-
-c['change_source'] = PBChangeSource(port=16000)
-
-# permissions for WebStatus
-
-c['www'] = dict(port=8710, plugins=dict(waterfall_view={}, console_view={}, grid_view={}), allowed_origins=["*"])
-c['www']['ui_default_config'] = {
-    'Builders.show_workers_name': True,
-    'Builders.buildFetchLimit': 1000,
-    'Workers.showWorkerBuilders': True,
-}
-
-if not is_test_mode_enabled:
-    passwords = json.load(open('passwords.json'))
-    admin_username = passwords.get('ADMIN_USERNAME')
-    admin_password = passwords.get('ADMIN_PASSWORD')
-    if not admin_username or not admin_password:
-        print('\n\nERROR: Admin username/password missing from passwords.json.\n')
-        sys.exit(1)
-    # See https://docs.buildbot.net/2.10.0/manual/configuration/www.html#example-configs
-    authz = util.Authz(
-        allowRules=[util.AnyControlEndpointMatcher(role="admin")],
-        roleMatchers=[util.RolesFromEmails(admin=[admin_username])]
-    )
-    auth = util.UserPasswordAuth({admin_username: admin_password})
-    c['www']['auth'] = auth
-    c['www']['authz'] = authz
-
-c['protocols'] = {'pb': {'port': 17000}}
-c['projectName'] = 'WebKit'
-c['projectURL'] = 'https://webkit.org'
-
-if is_test_mode_enabled:
-    c['buildbotURL'] = 'http://localhost:8710/'
-else:
-    c['buildbotURL'] = 'https://build.webkit.org/'
-    passwords = json.load(open('passwords.json'))
-    db_url = passwords.get('DB_URL')
-    db_name = passwords.get('DB_NAME')
-    db_username = passwords.get('DB_USERNAME')
-    db_password = passwords.get('DB_PASSWORD')
-    if None in [db_url, db_name, db_username, db_password]:
-        print('\n\nERROR: Database information missing from passwords.json.\n')
-        sys.exit(1)
-    # See https://docs.buildbot.net/2.10.0/manual/configuration/global.html#database-specification
-    c['db_url'] = 'postgresql://{}:{}@{}/{}'.format(db_username, db_password, db_url, db_name)
-    # configure a janitor to delete old logs
-    c['configurators'] = [util.JanitorConfigurator(logHorizon=timedelta(weeks=26), hour='1', dayOfWeek='*')]
-
-c['buildCacheSize'] = 60
-c['logCompressionMethod'] = 'lz4'
-c['buildbotNetUsageData'] = None
-
-loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277274 => 277275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-10 18:10:03 UTC (rev 277274)
+++ trunk/Tools/ChangeLog       2021-05-10 18:10:51 UTC (rev 277275)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-05-10  Aakash Jain  <aakash_jain@apple.com>
+
+        [build.webkit.org] Rename master_buildbot2.cfg to master.cfg
+        https://bugs.webkit.org/show_bug.cgi?id=222600
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/build-webkit-org/buildbot.tac:
+        * CISupport/build-webkit-org/master.cfg: Moved from Tools/CISupport/build-webkit-org/master_buildbot2.cfg.
+        * CISupport/build-webkit-org/master_buildbot2.cfg: Removed.
+
</ins><span class="cx"> 2021-05-10  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Add unit test for r274129
</span></span></pre>
</div>
</div>

</body>
</html>