Changeset 243759 in webkit

Timestamp:

Apr 2, 2019, 2:09:18 PM (7 years ago)

Author:

aakash_jain@apple.com

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.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-app/ews/common/buildbot.py (modified) (1 diff)
• BuildSlaveSupport/ews-app/ews/config.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/loadConfig.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py

@@ -44 +44 @@
                    '--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=']

trunk/Tools/BuildSlaveSupport/ews-app/ews/config.py

@@ -29 +29 @@
 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

trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py

@@ -80 +80 @@
         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))
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-02  Aakash Jain  <aakash_jain@apple.com>
+
+        [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  <wenson_hsieh@apple.com>