blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fix usage of sentry token in staging

master
Mitchell Hentges 2019-02-01 16:39:30 -08:00 committed by Jeff Boek
parent 88a54b7b30
commit d46e435461
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.taskcluster.yml
View File

@ -43,7 +43,6 @@ tasks:
- queue:scheduler-id:${scheduler_id} - queue:scheduler-id:${scheduler_id}
- queue:create-task:highest:aws-provisioner-v1/${build_worker_type} - queue:create-task:highest:aws-provisioner-v1/${build_worker_type}
- project:mobile:fenix:releng:signing:format:autograph_apk - project:mobile:fenix:releng:signing:format:autograph_apk
- secrets:get:project/mobile/fenix/sentry
- $if: is_mozilla_mobile_repo - $if: is_mozilla_mobile_repo
then: then:
- queue:create-task:highest:scriptworker-prov-v1/mobile-signing-v1 - queue:create-task:highest:scriptworker-prov-v1/mobile-signing-v1
@ -51,12 +50,14 @@ tasks:
- project:mobile:fenix:releng:signing:cert:release-signing - project:mobile:fenix:releng:signing:cert:release-signing
- project:mobile:fenix:releng:googleplay:product:fenix - project:mobile:fenix:releng:googleplay:product:fenix
- queue:route:index.project.mobile.fenix.signed-nightly.* - queue:route:index.project.mobile.fenix.signed-nightly.*
- secrets:get:project/mobile/fenix/sentry
else: else:
- queue:create-task:highest:scriptworker-prov-v1/mobile-signing-dep-v1 - queue:create-task:highest:scriptworker-prov-v1/mobile-signing-dep-v1
- queue:create-task:highest:scriptworker-prov-v1/mobile-pushapk-dep-v1 - queue:create-task:highest:scriptworker-prov-v1/mobile-pushapk-dep-v1
- project:mobile:fenix:releng:signing:cert:dep-signing - project:mobile:fenix:releng:signing:cert:dep-signing
- project:mobile:fenix:releng:googleplay:product:fenix:dep - project:mobile:fenix:releng:googleplay:product:fenix:dep
- queue:route:index.project.mobile.fenix.staging-signed-nightly.* - queue:route:index.project.mobile.fenix.staging-signed-nightly.*
- secrets:get:garbage/staging/project/mobile/fenix/sentry
payload: payload:
maxRunTime: 600 # Decision should remain fast enough to schedule a handful of tasks maxRunTime: 600 # Decision should remain fast enough to schedule a handful of tasks
image: mozillamobile/fenix:1.3 image: mozillamobile/fenix:1.3

5
automation/taskcluster/decision_task_nightly.py
View File

@ -36,13 +36,14 @@ def generate_build_task(apks, is_staging):
} for apk in apks} } for apk in apks}
checkout = 'git clone {} repository && cd repository'.format(GITHUB_HTTP_REPOSITORY) checkout = 'git clone {} repository && cd repository'.format(GITHUB_HTTP_REPOSITORY)
sentry_secret = '{}project/mobile/fenix/sentry'.format('garbage/staging/' if is_staging else '')
return taskcluster.slugId(), BUILDER.build_task( return taskcluster.slugId(), BUILDER.build_task(
name="(Fenix) Build task", name="(Fenix) Build task",
description="Build Fenix from source code.", description="Build Fenix from source code.",
command=('cd .. && ' + checkout + command=('cd .. && ' + checkout +
' && python automation/taskcluster/helper/get-secret.py' ' && python automation/taskcluster/helper/get-secret.py'
' -s project/mobile/fenix/sentry -k dsn -f .sentry_token' ' -s {} -k dsn -f .sentry_token'.format(sentry_secret) +
' && ./gradlew --no-daemon -PcrashReports=true clean test assembleRelease'), ' && ./gradlew --no-daemon -PcrashReports=true clean test assembleRelease'),
features={ features={
"chainOfTrust": True, "chainOfTrust": True,
@ -51,7 +52,7 @@ def generate_build_task(apks, is_staging):
artifacts=artifacts, artifacts=artifacts,
worker_type='android-components-g' if is_staging else 'gecko-focus', worker_type='android-components-g' if is_staging else 'gecko-focus',
scopes=[ scopes=[
"secrets:get:project/mobile/fenix/sentry" "secrets:get:{}".format(sentry_secret)
] ]
) )