From 3f6c68ccedde25a2615c2aa4f5c37f840c493199 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 4 Mar 2019 16:30:16 -0800
Subject: [PATCH] Attempts to fix nightly builds

---
 app/src/release/java/org/mozilla/fenix/AdjustHelper.kt | 1 +
 automation/taskcluster/decision_task_nightly.py        | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/release/java/org/mozilla/fenix/AdjustHelper.kt b/app/src/release/java/org/mozilla/fenix/AdjustHelper.kt
index 5a6b46d9f..fe180dbb1 100644
--- a/app/src/release/java/org/mozilla/fenix/AdjustHelper.kt
+++ b/app/src/release/java/org/mozilla/fenix/AdjustHelper.kt
@@ -17,6 +17,7 @@ import mozilla.components.service.glean.Glean
 object AdjustHelper {
     fun setupAdjustIfNeeded(application: FenixApplication) {
         // RELEASE: Enable Adjust - This class has different implementations for all build types.
+        return
 
         if (TextUtils.isEmpty(BuildConfig.ADJUST_TOKEN)) {
             throw IllegalStateException("No adjust token defined for release build")
diff --git a/automation/taskcluster/decision_task_nightly.py b/automation/taskcluster/decision_task_nightly.py
index d1bf0ca45..17b9c16f1 100644
--- a/automation/taskcluster/decision_task_nightly.py
+++ b/automation/taskcluster/decision_task_nightly.py
@@ -45,7 +45,6 @@ def generate_build_task(apks, is_staging):
         )
     )
     sentry_secret = '{}project/mobile/fenix/sentry'.format('garbage/staging/' if is_staging else '')
-    adjust_secret = '{}project/mobile/fenix/adjust'.format('garbage/staging/' if is_staging else '')
 
     return taskcluster.slugId(), BUILDER.build_task(
         name="(Fenix) Build task",
@@ -54,8 +53,6 @@ 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 Greenfield -f .adjust_token'.format(adjust_secret) +
             ' && ./gradlew --no-daemon -PcrashReports=true clean test assembleGreenfieldRelease'),
         features={
             "chainOfTrust": True,
@@ -63,8 +60,7 @@ def generate_build_task(apks, is_staging):
         },
         artifacts=artifacts,
         scopes=[
-            "secrets:get:{}".format(sentry_secret),
-            "secrets:get:{}".format(adjust_secret)
+            "secrets:get:{}".format(sentry_secret)
         ]
     )