From 7bd49a05c91382b667d8ca72c4b7b5d5f1fbddf1 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Thu, 7 Mar 2019 22:15:01 -0800 Subject: [PATCH] Fixes #896 - Fetch leanplum secret from taskcluster --- .taskcluster.yml | 2 ++ automation/taskcluster/decision_task_nightly.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.taskcluster.yml b/.taskcluster.yml index 527d7d066..611cb52ca 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -56,6 +56,7 @@ tasks: - project:mobile:fenix:releng:googleplay:product:fenix - queue:route:index.project.mobile.fenix.signed-nightly.* - secrets:get:project/mobile/fenix/sentry + - secrets:get:project/mobile/fenix/leanplum else: - queue:create-task:highest:scriptworker-prov-v1/mobile-signing-dep-v1 - queue:create-task:highest:scriptworker-prov-v1/mobile-pushapk-dep-v1 @@ -63,6 +64,7 @@ tasks: - project:mobile:fenix:releng:googleplay:product:fenix:dep - queue:route:index.project.mobile.fenix.staging-signed-nightly.* - secrets:get:garbage/staging/project/mobile/fenix/sentry + - secrets:get:garbage/staging/project/mobile/fenix/leanplum payload: maxRunTime: 600 # Decision should remain fast enough to schedule a handful of tasks image: mozillamobile/fenix:1.3 diff --git a/automation/taskcluster/decision_task_nightly.py b/automation/taskcluster/decision_task_nightly.py index a573e0ba9..b5122fb61 100644 --- a/automation/taskcluster/decision_task_nightly.py +++ b/automation/taskcluster/decision_task_nightly.py @@ -45,6 +45,7 @@ def generate_build_task(apks, is_staging): ) ) sentry_secret = '{}project/mobile/fenix/sentry'.format('garbage/staging/' if is_staging else '') + leanplum_secret = '{}project/mobile/fenix/leanplum'.format('garbage/staging/' if is_staging else '') return taskcluster.slugId(), BUILDER.build_task( name="(Fenix) Build task", @@ -53,6 +54,8 @@ def generate_build_task(apks, is_staging): checkout + ' && python automation/taskcluster/helper/get-secret.py' ' -s {} -k dsn -f .sentry_token'.format(sentry_secret) + + ' && python automation/taskcluster/helper/get-secret.py' + ' -s {} -k production -f .leanplum_token'.format(leanplum_token) + ' && ./gradlew --no-daemon -PcrashReports=true clean test assembleRelease'), features={ "chainOfTrust": True, @@ -61,6 +64,7 @@ def generate_build_task(apks, is_staging): artifacts=artifacts, scopes=[ "secrets:get:{}".format(sentry_secret) + "secrets:get:{}".format(leanplum_secret) ] )