From ddb2747bf1c2771e9d796da0fdbfc6ae48f66625 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Mon, 11 Jul 2016 17:31:26 +0000 Subject: [PATCH] Bug 1278445: do not try to upload symbols from beta; r=mshal MozReview-Commit-ID: 9YZvV2cIA1s --HG-- extra : rebase_source : 477332ec9e1cf36ba1dfefa052287e5cac79f6c7 --- browser/config/mozconfigs/linux32/beta | 2 +- browser/config/mozconfigs/linux64/beta | 2 +- taskcluster/scripts/builder/build-linux.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/browser/config/mozconfigs/linux32/beta b/browser/config/mozconfigs/linux32/beta index c5633a10bbfa..315c32b843ac 100644 --- a/browser/config/mozconfigs/linux32/beta +++ b/browser/config/mozconfigs/linux32/beta @@ -1,6 +1,6 @@ MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1} if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then - MOZ_AUTOMATION_UPLOAD_SYMBOLS=1 + MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1} MOZ_AUTOMATION_UPDATE_PACKAGING=1 fi diff --git a/browser/config/mozconfigs/linux64/beta b/browser/config/mozconfigs/linux64/beta index 01c4421bcfd0..f349ee9f8355 100644 --- a/browser/config/mozconfigs/linux64/beta +++ b/browser/config/mozconfigs/linux64/beta @@ -1,6 +1,6 @@ MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1} if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then - MOZ_AUTOMATION_UPLOAD_SYMBOLS=1 + MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1} MOZ_AUTOMATION_UPDATE_PACKAGING=1 fi diff --git a/taskcluster/scripts/builder/build-linux.sh b/taskcluster/scripts/builder/build-linux.sh index 9ebc954fbf0e..b2ac0147342f 100644 --- a/taskcluster/scripts/builder/build-linux.sh +++ b/taskcluster/scripts/builder/build-linux.sh @@ -42,6 +42,9 @@ export TINDERBOX_OUTPUT=1 # extras.locations export MOZ_SIMPLE_PACKAGE_NAME=target +# Do not try to upload symbols (see https://bugzilla.mozilla.org/show_bug.cgi?id=1164615) +MOZ_AUTOMATION_UPLOAD_SYMBOLS=0 + # Ensure that in tree libraries can be found export LIBRARY_PATH=$LIBRARY_PATH:$WORKSPACE/src/obj-firefox:$WORKSPACE/src/gcc/lib64