Backed out changeset ae11e3061f5b (bug 1285529) to allow me to do a merge, relanding later
authorWes Kocher <wkocher@mozilla.com>
Fri, 08 Jul 2016 15:10:31 -0700
changeset 346339 751186781016d52db0b7a957af1ffe0358574012
parent 346338 53b24e115c194df3cc9cbd9a99959209637a4beb
child 346340 7a7f440d578febfd991a3f657ae8f57815d27909
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1285529
milestone50.0a1
backs outae11e3061f5b12a1fe131c5bedaa57ea3be9970a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset ae11e3061f5b (bug 1285529) to allow me to do a merge, relanding later
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -38,20 +38,20 @@ if test -z "$SCCACHE_DISABLE" -a -z "$no
             bucket=mozilla-releng-s3-cache-us-west-2-prod
             ;;
         esac
         ;;
     esac
 fi
 
 # taskcluster:
-elif test -z "$CCACHE_DIR"; then
+else
     # timeout after 1 second, and don't retry (failure indicates instance is not in ec2 or wget, network issue)
     # availability_zone is of the form <region><letter> where region is e.g. us-west-2, and az is us-west-2a
-    availability_zone=$(wget -T 1 -t 1 -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone || true)
+    availability_zone=$(wget -T 1 -t 1 -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone)
     # region is az with last letter trimmed
     region=${availability_zone%?}
     if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache" -a -z "$MOZ_PGO_IS_SET" -a -z "$MOZ_PGO"; then
         # set S3 bucket according to tree (level)
         case "${GECKO_HEAD_REPOSITORY}" in
         *hg.mozilla.org/try*)
             bucket=taskcluster-level-1-sccache-${region}
             ;;