Backed out changeset d5d91aa3a430 (bug 1285529) because this only changed code that was backed out from bug 1278990 CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Fri, 08 Jul 2016 15:17:20 -0700
changeset 304242 0215f0988f9c5712da7dce9a6e605cf8337ce9bd
parent 304241 d5d91aa3a4305a769d4ae057353de3e56c4c8765
child 304243 09f43c44d25059cebe9bdb802cea8eaaba2b5ef7
push id30419
push userphilringnalda@gmail.com
push dateSat, 09 Jul 2016 15:51:15 +0000
treeherdermozilla-central@e3dcf062007e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1285529, 1278990
milestone50.0a1
backs outd5d91aa3a4305a769d4ae057353de3e56c4c8765
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 d5d91aa3a430 (bug 1285529) because this only changed code that was backed out from bug 1278990 CLOSED TREE
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -35,56 +35,16 @@ if test -z "$SCCACHE_DISABLE" -a -z "$no
         *usw2.mozilla.com*)
             bucket=mozilla-releng-s3-cache-us-west-2-prod
             ;;
         esac
         ;;
     esac
 fi
 
-# taskcluster:
-elif test -z "$CCACHE_DIR"; then
-    # 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)
-    # 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}
-            ;;
-        *hg.mozilla.org/integration/mozilla-inbound*|*hg.mozilla.org/integration/fx-team*)
-            bucket=taskcluster-level-3-sccache-${region}
-            ;;
-        esac
-    fi
-
-    # set a dummy master
-    case "${region}" in
-    us-east-1)
-        master=dummy.use1.mozilla.com
-        ;;
-    us-west-1)
-        master=dummy.usw1.mozilla.com
-        ;;
-    us-west-2)
-        master=dummy.usw2.mozilla.com
-        ;;
-    esac
-
-    # set platform based on the SYSTEMROOT env var
-    case "${SYSTEMROOT}" in
-    *Windows)
-        platform=windows
-        ;;
-    esac
-fi
-
 if test -z "$bucket"; then
     case "$platform" in
     win*) : ;;
     *)
         ac_add_options --with-ccache
     esac
 else
     if ! test -e $topsrcdir/sccache/sccache.py; then