Bug 1007991 - Enable sccache on mozilla-inbound and fx-team builds on AWS. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 15 May 2014 07:14:37 +0900
changeset 202533 37cd8f374ed806e8e84135fba6c8b5a1ac79ad22
parent 202532 5c6cf0b0f31e4d7ccbef22ce988927da8c77daea
child 202534 1a020b7e4802b3c4e25d9c53b1170e819af964fe
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1007991
milestone32.0a1
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
Bug 1007991 - Enable sccache on mozilla-inbound and fx-team builds on AWS. r=mshal
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -8,36 +8,44 @@
 if test -z "$bucket"; then
 
 read branch platform master <<EOF
 $(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.json").read())["properties"]; print p["branch"], p["platform"], p["master"]' 2> /dev/null)
 EOF
 
 bucket=
 if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache"; then
-    case "${branch}_${master}" in
-    try_*scl1.mozilla.com*|try_*.scl3.mozilla.com*)
-        bucket=mozilla-releng-ceph-cache-scl3-try
-        mk_add_options "export SCCACHE_NO_HTTPS=1"
-        ;;
-    try_*use1.mozilla.com*)
-        bucket=mozilla-releng-s3-cache-us-east-1-try
+    case "${branch}" in
+    try)
+        case "${master}" in
+        *scl1.mozilla.com*|*.scl3.mozilla.com*)
+            bucket=mozilla-releng-ceph-cache-scl3-try
+            mk_add_options "export SCCACHE_NO_HTTPS=1"
+            ;;
+        *use1.mozilla.com*)
+            bucket=mozilla-releng-s3-cache-us-east-1-try
+            ;;
+        *usw2.mozilla.com*)
+            bucket=mozilla-releng-s3-cache-us-west-2-try
+            ;;
+        esac
         ;;
-    try_*usw2.mozilla.com*)
-        bucket=mozilla-releng-s3-cache-us-west-2-try
-        ;;
-    b2g-inbound_*use1.mozilla.com*)
-        if test -z "$MOZ_PGO"; then
-            bucket=mozilla-releng-s3-cache-us-east-1-prod
-        fi
-        ;;
-    b2g-inbound_*usw2.mozilla.com*)
-        if test -z "$MOZ_PGO"; then
-            bucket=mozilla-releng-s3-cache-us-west-2-prod
-        fi
+    b2g-inbound|mozilla-inbound|fx-team)
+        case "${master}" in
+        *use1.mozilla.com*)
+            if test -z "$MOZ_PGO"; then
+                bucket=mozilla-releng-s3-cache-us-east-1-prod
+            fi
+            ;;
+        *usw2.mozilla.com*)
+            if test -z "$MOZ_PGO"; then
+                bucket=mozilla-releng-s3-cache-us-west-2-prod
+            fi
+            ;;
+        esac
         ;;
     esac
 fi
 
 if test -z "$bucket"; then
     case "$platform" in
     win*) : ;;
     *)