Title: [271450] trunk/Tools
Revision
271450
Author
[email protected]
Date
2021-01-13 12:21:35 -0800 (Wed, 13 Jan 2021)

Log Message

[build.webkit.org] Use PostgreSQL for new build.webkit.org database
https://bugs.webkit.org/show_bug.cgi?id=220589

Reviewed by Jonathan Bedard.

* CISupport/build-webkit-org/master_buildbot2.cfg:

Modified Paths

Diff

Modified: trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg (271449 => 271450)


--- trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg	2021-01-13 20:16:23 UTC (rev 271449)
+++ trunk/Tools/CISupport/build-webkit-org/master_buildbot2.cfg	2021-01-13 20:21:35 UTC (rev 271450)
@@ -1,5 +1,6 @@
-# -*- python -*-
-# ex: set syntax=python:
+import json
+import os
+import sys
 
 from buildbot.changes.pb import PBChangeSource
 from buildbot.plugins import util
@@ -23,10 +24,24 @@
 }
 
 c['protocols'] = {'pb': {'port': 17000}}
-c['projectName'] = "WebKit"
-c['projectURL'] = "https://webkit.org"
-c['buildbotURL'] = "https://build.webkit.org/"
+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('Database information missing from passwords.json.')
+        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)
+
 c['buildCacheSize'] = 60
 c['logCompressionMethod'] = 'lz4'
 c['buildbotNetUsageData'] = None

Modified: trunk/Tools/ChangeLog (271449 => 271450)


--- trunk/Tools/ChangeLog	2021-01-13 20:16:23 UTC (rev 271449)
+++ trunk/Tools/ChangeLog	2021-01-13 20:21:35 UTC (rev 271450)
@@ -1,3 +1,12 @@
+2021-01-13  Aakash Jain  <[email protected]>
+
+        [build.webkit.org] Use PostgreSQL for new build.webkit.org database
+        https://bugs.webkit.org/show_bug.cgi?id=220589
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/build-webkit-org/master_buildbot2.cfg:
+
 2021-01-13  Sam Sneddon  <[email protected]>
 
         Avoid over-aggressive clearing of *.pyc files running webkitpy tests
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to