Bug 1381770 - In tooltool-download.sh, only use the relengapi proxy when it's configured. r?mshal draft
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 18 Jul 2017 16:12:58 +0900
changeset 610376 8b3e3c753332b3e624374f52ca5845a5c3d037ce
parent 610375 ba2de15b1dd624f2e8863be5cd4642af2546840a
child 610377 897af4c1b1872f433e302ed7d0194e6c8d8c245e
push id68887
push userbmo:mh+mozilla@glandium.org
push dateTue, 18 Jul 2017 09:07:47 +0000
reviewersmshal
bugs1381770
milestone56.0a1
Bug 1381770 - In tooltool-download.sh, only use the relengapi proxy when it's configured. r?mshal
taskcluster/scripts/misc/tooltool-download.sh
--- a/taskcluster/scripts/misc/tooltool-download.sh
+++ b/taskcluster/scripts/misc/tooltool-download.sh
@@ -1,10 +1,17 @@
 # Fetch a tooltool manifest.
 
 cd $WORKSPACE/build/src
 
+TOOLTOOL_DL_FLAGS=
+
+if [ -n "$RELENGAPI_PORT" ]; then
+    # When the worker has the relengapi proxy setup, use it.
+    TOOLTOOL_DL_FLAGS="${TOOLTOOL_DL_FLAGS=} --tooltool-url=http://relengapi/tooltool/"
+fi
+
 : TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
 export TOOLTOOL_CACHE
 
-./mach artifact toolchain -v --tooltool-url=http://relengapi/tooltool/ --tooltool-manifest "${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}} --retry 5
+./mach artifact toolchain -v${TOOLTOOL_DL_FLAGS} --tooltool-manifest "${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}} --retry 5
 
 cd $OLDPWD