git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220166 268f45cc-cd09-0410...
authorlforschler@apple.com <lforschler@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Aug 2017 01:32:27 +0000 (01:32 +0000)
committerlforschler@apple.com <lforschler@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Aug 2017 01:32:27 +0000 (01:32 +0000)
Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
Tools/ChangeLog

index 2064325d3667be52806af9763b1b45c1bce81a0b..004ce85ec5074f74b1e6413712cf85125a086d43 100644 (file)
@@ -24,6 +24,7 @@ import urllib
 from committer_auth import CommitterAuth
 import wkbuild
 
+APPLE_WEBKIT_AWS_PROXY = "http://54.190.50.182:873"
 S3URL = "https://s3-us-west-2.amazonaws.com/"
 
 c = BuildmasterConfig = {}
@@ -317,6 +318,11 @@ class DownloadBuiltProduct(shell.ShellCommand):
     haltOnFailure = True
     flunkOnFailure = True
 
+    def start(self):
+        if 'apple' in self.getProperty('buildername').lower():
+            self.slaveEnvironment['HTTPS_PROXY'] = APPLE_WEBKIT_AWS_PROXY  # curl env var to use a proxy
+        return shell.ShellCommand.start(self)
+
 
 class RunJavaScriptCoreTests(TestWithFailureCount):
     name = "jscore-test"
index 22dde55608acaa394d83021358684ebb53d28e1b..b28dfe3b50a7b390a1d1ed4f6464de319146bd39 100644 (file)
@@ -1,3 +1,14 @@
+2017-08-02  Lucas Forschler  <lforschler@apple.com>
+
+        download-built-product should allow for a proxy option
+        https://bugs.webkit.org/show_bug.cgi?id=174875
+
+        Reviewed by Aakash Jain, Alexey Proskuryakov, Dean Johnson
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (DownloadBuiltProduct.start): Teach buildbot to pass along proxy for Apple bots
+        
+
 2017-08-02  Jonathan Bedard  <jbedard@apple.com>
 
         check-webkit-style: deleting lines in a file runs the linter on the whole file