Backed out 4 changesets (bug 1424651) as requested by tomprice r=backout on a CLOSED TREE
authorDorel Luca <dluca@mozilla.com>
Tue, 12 Dec 2017 06:33:18 +0200
changeset 396061 4a6655fb34175c4bbbe95a4362e111d234813767
parent 396060 6d4f22dea065d7c5a346a156196372a64c5e4782
child 396062 2288b9c225bb8ffc4db6956368de5c373ba7f7ba
push id98237
push useraciure@mozilla.com
push dateTue, 12 Dec 2017 09:57:07 +0000
treeherdermozilla-inbound@53026224f47d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1424651
milestone59.0a1
backs out10ebf78f32bbbe5a5f2c6bf3be8fd6cb70c612cd
746d96792d18a6cd945c650624dd12f40bae4115
6038fb7b458cad07fcae96cec1c478c189acfde6
189fd4f1df41483d931fed0a5813801f45b5f759
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 4 changesets (bug 1424651) as requested by tomprice r=backout on a CLOSED TREE Backed out changeset 10ebf78f32bb (bug 1424651) Backed out changeset 746d96792d18 (bug 1424651) Backed out changeset 6038fb7b458c (bug 1424651) Backed out changeset 189fd4f1df41 (bug 1424651)
Makefile.in
build/macosx/cross-mozconfig.common
build/macosx/local-mozconfig.common
build/mozconfig.win-common
build/unix/mozconfig.linux
mobile/android/config/mozconfigs/common
old-configure.in
toolkit/crashreporter/tools/upload_symbols.py
--- a/Makefile.in
+++ b/Makefile.in
@@ -298,18 +298,20 @@ symbolsarchive: prepsymbolsarchive
 ifdef MOZ_CRASHREPORTER
 buildsymbols: symbolsfullarchive symbolsarchive
 else
 buildsymbols:
 endif
 
 uploadsymbols:
 ifdef MOZ_CRASHREPORTER
+ifdef SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
 	$(PYTHON) -u $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.py '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
 endif
+endif
 
 .PHONY: update-packaging
 update-packaging:
 	$(MAKE) -C tools/update-packaging
 
 .PHONY: package-generated-sources
 package-generated-sources:
 	$(call py_action,package_generated_sources,'$(DIST)/$(PKG_PATH)$(GENERATED_SOURCE_FILE_PACKAGE)')
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -47,8 +47,10 @@ ac_add_options --target=x86_64-apple-dar
 ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
 
 if [ "x$MOZ_PKG_SPECIAL" != "xasan" -a -z "$MOZ_AUTOMATION_ARTIFACT_BUILDS" ]; then
   # Enable static analysis checks by default on OSX cross builds.
   # Exception is ASan, where this breaks.
   # The option is not valid on artifact builds, so don't add it there either.
   ac_add_options --enable-clang-plugin
 fi
+
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
--- a/build/macosx/local-mozconfig.common
+++ b/build/macosx/local-mozconfig.common
@@ -39,8 +39,10 @@ export LDFLAGS="$ldflags"
 if [ -z "$CC" ]; then
     export CC=clang
 fi
 
 # If not set use the system default clang++
 if [ -z "$CXX" ]; then
     export CXX=clang++
 fi
+
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
--- a/build/mozconfig.win-common
+++ b/build/mozconfig.win-common
@@ -6,10 +6,12 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
   # Some nightlies (eg: Mulet) don't want these set.
   MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
 fi
 
 # Some builds (eg: Mulet) don't want the installer, so only set this if it
 # hasn't already been set.
 MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}
 
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token
+
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 export MAKECAB=$TOOLTOOL_DIR/makecab.exe
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -24,9 +24,11 @@ else
   CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
 fi
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
 
 # PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
 export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
 
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
+
 . "$topsrcdir/build/unix/mozconfig.gtk"
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -96,16 +96,18 @@ if test "$MOZ_UPDATE_CHANNEL" = "release
 elif test "$MOZ_UPDATE_CHANNEL" = "beta" ; then
     ac_add_options --with-pocket-api-keyfile=/builds/pocket-api-beta.token
 elif test "$MOZ_UPDATE_CHANNEL" = "nightly" ; then
     ac_add_options --with-pocket-api-keyfile=/builds/pocket-api-nightly.token
 else
     ac_add_options --with-pocket-api-keyfile="$topsrcdir/mobile/android/base/pocket-api-sandbox.token"
 fi
 
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
+
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
 
 JS_BINARY="$topsrcdir/mobile/android/config/js_wrapper.sh"
 
 export PROGUARD_JAR="$topsrcdir/proguard/lib/proguard.jar"
--- a/old-configure.in
+++ b/old-configure.in
@@ -4761,16 +4761,17 @@ AC_SUBST(LIBJPEG_TURBO_USE_YASM)
 AC_SUBST_LIST(LIBJPEG_TURBO_ASFLAGS)
 AC_SUBST(MOZ_LIBAV_FFT)
 AC_SUBST_LIST(LIBAV_FFT_ASFLAGS)
 AC_SUBST(MOZ_DEVTOOLS)
 
 AC_SUBST(MOZ_PACKAGE_JSSHELL)
 AC_SUBST(MOZ_FOLD_LIBS)
 AC_SUBST_LIST(MOZ_FOLD_LIBS_FLAGS)
+AC_SUBST(SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE)
 
 AC_SUBST(DMG_TOOL)
 
 dnl Host JavaScript runtime, if any, to use during cross compiles.
 AC_SUBST(JS_BINARY)
 
 AC_SUBST(NSS_EXTRA_SYMBOLS_FILE)
 
--- a/toolkit/crashreporter/tools/upload_symbols.py
+++ b/toolkit/crashreporter/tools/upload_symbols.py
@@ -2,22 +2,19 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 # This script uploads a symbol zip file passed on the commandline
 # to the Tecken symbol upload API at https://symbols.mozilla.org/ .
 #
-# Using this script requires you to have generated an authentication
 # token in the Tecken web interface. You must store the token in a Taskcluster
 # secret as the JSON blob `{"token": "<token>"}` and set the `SYMBOL_SECRET`
-# environment variable to the name of the Taskcluster secret. Alternatively,
-# you can pu the token in a file and set SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
-# environment variable to the path to the file.
+# environment variable to the name of the Taskcluster secret.
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 import argparse
 import logging
 import os
 import sys
 from mozbuild.base import MozbuildObject
@@ -37,64 +34,48 @@ def print_error(r):
                                                          r.reason),
                   file=sys.stderr)
 
     log.error('Response body:\n{sep}\n{body}\n{sep}\n'.format(
         sep='=' * 20,
         body=r.text
         ))
 
-def get_taskcluster_secret(secret_name):
-    import redo
-    import requests
-
-    secrets_url = 'http://taskcluster/secrets/v1/secret/{}'.format(secret_name)
-    log.info(
-        'Using symbol upload token from the secrets service: "{}"'.format(secrets_url))
-    res = requests.get(secrets_url)
-    res.raise_for_status()
-    secret = res.json()
-    auth_token = secret['secret']['token']
-
-    return auth_token
-
 def main():
     config = MozbuildObject.from_environment()
     config._activate_virtualenv()
 
+    import redo
+    import requests
+
     logging.basicConfig()
     parser = argparse.ArgumentParser(
         description='Upload symbols in ZIP using token from Taskcluster secrets service.')
     parser.add_argument('zip',
                         help='Symbols zip file')
     args = parser.parse_args()
 
     if not os.path.isfile(args.zip):
         log.error('Error: zip file "{0}" does not exist!'.format(args.zip),
                   file=sys.stderr)
         return 1
 
     secret_name = os.environ.get('SYMBOL_SECRET')
-    if secret_name is not None:
-        auth_token = get_taskcluster_secret(secret_name)
-    elif 'SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE' not in os.environ:
-        token_file = os.environ['SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE']
+    if secret_name is None:
+        log.error('You must set the SYMBOL_SECRET environment variable!')
+        return 1
+    secrets_url = 'http://taskcluster/secrets/v1/secret/{}'.format(secret_name)
+    log.info(
+        'Using symbol upload token from the secrets service: "{}"'.format(secrets_url))
+    res = requests.get(secrets_url)
+    res.raise_for_status()
+    secret = res.json()
+    auth_token = secret['secret']['token']
 
-        if not os.path.isfile(token_file):
-            log.error('SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE "{0}" does not exist!'.format(token_file), file=sys.stderr)
-            return 1
-        auth_token = open(token_file, 'r').read().strip()
-    else:
-        log.error('You must set the SYMBOL_SECRET or SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE environment variables!')
-        return 1
-
-    # Allow overwriting of the upload url with an environmental variable
-    if 'SOCORRO_SYMBOL_UPLOAD_URL' in os.environ:
-        url = os.environ['SOCORRO_SYMBOL_UPLOAD_URL']
-    elif os.environ.get('MOZ_SCM_LEVEL', '1') == '1':
+    if os.environ.get('MOZ_SCM_LEVEL', '1') == '1':
         # Use the Tecken staging server for try uploads for now.
         # This will eventually be changed in bug 1138617.
         url = 'https://symbols.stage.mozaws.net/upload/'
     else:
         url = DEFAULT_URL
 
     log.info('Uploading symbol file "{0}" to "{1}"'.format(args.zip, url))