bug 1422740 - change upload-symbols tasks to use in-tree lint image. r=gps

This change makes upload-symbols tasks use run-task and the in-tree lint
image instead of the private upload-symbols image. A prior change changed
the script to get the token it needs from a Taskcluster secret, so it's no
longer necessary to use the private docker image containing the token.

MozReview-Commit-ID: 6QugVB4chE0

--HG--
extra : rebase_source : e13d29c2a88e055247da374cffa9ea153548749d
This commit is contained in:
Ted Mielczarek 2017-12-06 06:39:46 -05:00
parent 2ac06b8c4f
commit df253cc5c7
2 changed files with 16 additions and 17 deletions

View File

@ -6,6 +6,7 @@ loader: taskgraph.loader.single_dep:loader
transforms:
- taskgraph.transforms.upload_symbols:transforms
- taskgraph.transforms.job:transforms
- taskgraph.transforms.task:transforms
kind-dependencies:
@ -32,27 +33,22 @@ only-for-build-platforms:
- win64-devedition-nightly/opt
job-template:
label: # see transforms
description: Upload Symbols
dependencies: # see transforms
expires-after: 7 days
deadline-after: 24 hours
worker-type: aws-provisioner-v1/gecko-symbol-upload
worker:
implementation: docker-worker
os: linux
max-run-time: 600
command: ["/bin/bash", "bin/upload.sh"]
docker-image: taskclusterprivate/upload_symbols:0.0.4
taskcluster-proxy: true
docker-image: {in-tree: "lint"}
max-run-time: 900
env:
GECKO_HEAD_REPOSITORY: # see transforms
GECKO_HEAD_REV: # see transforms
ARTIFACT_TASKID: {"task-reference": "<build>"}
# {level} gets replaced in the upload_symbols transform
SYMBOL_SECRET: "project/releng/gecko/build/level-{level}/gecko-symbol-upload"
run:
using: run-task
command: >
cd /builds/worker/checkouts/gecko &&
wget https://queue.taskcluster.net/v1/task/${ARTIFACT_TASKID}/artifacts/public/build/target.crashreporter-symbols-full.zip &&
./mach python toolkit/crashreporter/tools/upload_symbols.py target.crashreporter-symbols-full.zip
optimization:
only-if-dependencies-run: null
scopes:
- docker-worker:image:taskclusterprivate/upload_symbols:0.0.4
- secrets:get:project/releng/gecko/build/level-{level}/gecko-symbol-upload

View File

@ -7,7 +7,6 @@
# 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.
@ -17,10 +16,8 @@ from __future__ import absolute_import, print_function, unicode_literals
import argparse
import logging
import os
import redo
import requests
import sys
from mozbuild.base import MozbuildObject
log = logging.getLogger('upload-symbols')
log.setLevel(logging.INFO)
@ -43,6 +40,12 @@ def print_error(r):
))
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.')