Title: [243759] trunk/Tools
Revision
243759
Author
[email protected]
Date
2019-04-02 14:09:18 -0700 (Tue, 02 Apr 2019)

Log Message

[ews-build] Configure buildbot try credentials in environment variables
https://bugs.webkit.org/show_bug.cgi?id=196501

Reviewed by Lucas Forschler.

* BuildSlaveSupport/ews-build/loadConfig.py: Read credentials from environment variables.
* BuildSlaveSupport/ews-app/ews/common/buildbot.py: Rename BUILDBOT_PB_USERNAME to BUILDBOT_TRY_USERNAME.
* BuildSlaveSupport/ews-app/ews/config.py: Ditto.

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py (243758 => 243759)


--- trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py	2019-04-02 21:06:49 UTC (rev 243758)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py	2019-04-02 21:09:18 UTC (rev 243759)
@@ -43,8 +43,8 @@
         command = ['buildbot', 'try',
                    '--connect=pb',
                    '--master={}:{}'.format(config.BUILDBOT_SERVER_HOST, config.BUILDBOT_SERVER_PORT),
-                   '--username={}'.format(config.BUILDBOT_PB_USERNAME),
-                   '--passwd={}'.format(config.BUILDBOT_PB_PASSWORD),
+                   '--username={}'.format(config.BUILDBOT_TRY_USERNAME),
+                   '--passwd={}'.format(config.BUILDBOT_TRY_PASSWORD),
                    '--diff={}'.format(patch_path),
                    '--repository=']
 

Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/config.py (243758 => 243759)


--- trunk/Tools/BuildSlaveSupport/ews-app/ews/config.py	2019-04-02 21:06:49 UTC (rev 243758)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/config.py	2019-04-02 21:09:18 UTC (rev 243759)
@@ -28,8 +28,8 @@
 
 BUILDBOT_SERVER_HOST = 'ews-build.webkit.org'
 BUILDBOT_SERVER_PORT = '5555'
-BUILDBOT_PB_USERNAME = os.getenv('BUILDBOT_PB_USERNAME', 'sampleuser')
-BUILDBOT_PB_PASSWORD = os.getenv('BUILDBOT_PB_PASSWORD', 'samplepass')
+BUILDBOT_TRY_USERNAME = os.getenv('BUILDBOT_TRY_USERNAME', 'sampleuser')
+BUILDBOT_TRY_PASSWORD = os.getenv('BUILDBOT_TRY_PASSWORD', 'samplepass')
 
 SUCCESS = 0
 ERR_UNEXPECTED = -1

Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py (243758 => 243759)


--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py	2019-04-02 21:06:49 UTC (rev 243758)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py	2019-04-02 21:09:18 UTC (rev 243759)
@@ -79,7 +79,7 @@
         scheduler = dict(map(lambda key_value_pair: (str(key_value_pair[0]), key_value_pair[1]), scheduler.items()))
         if (schedulerClassName == 'Try_Userpass'):
             # FIXME: Read the credentials from local file on disk.
-            scheduler['userpass'] = [('sampleuser', 'samplepass')]
+            scheduler['userpass'] = [(os.getenv('BUILDBOT_TRY_USERNAME', 'sampleuser'), os.getenv('BUILDBOT_TRY_PASSWORD', 'samplepass'))]
         c['schedulers'].append(schedulerClass(**scheduler))
 
 

Modified: trunk/Tools/ChangeLog (243758 => 243759)


--- trunk/Tools/ChangeLog	2019-04-02 21:06:49 UTC (rev 243758)
+++ trunk/Tools/ChangeLog	2019-04-02 21:09:18 UTC (rev 243759)
@@ -1,3 +1,14 @@
+2019-04-02  Aakash Jain  <[email protected]>
+
+        [ews-build] Configure buildbot try credentials in environment variables
+        https://bugs.webkit.org/show_bug.cgi?id=196501
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-build/loadConfig.py: Read credentials from environment variables.
+        * BuildSlaveSupport/ews-app/ews/common/buildbot.py: Rename BUILDBOT_PB_USERNAME to BUILDBOT_TRY_USERNAME.
+        * BuildSlaveSupport/ews-app/ews/config.py: Ditto.
+
 2019-04-02  Wenson Hsieh  <[email protected]>
 
         REGRESSION (r243726): Crash at unrecognized selector: -[WKWebpagePreferences webpagePreferences]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to