From 4d7d6ff2110fbeaa11725be4fff6f67b768b18ef Mon Sep 17 00:00:00 2001
From: Mitchell Hentges <mhentges@mozilla.com>
Date: Mon, 21 Oct 2019 10:03:03 -0700
Subject: [PATCH] Enables the Fenix beta (#5936)

---
 taskcluster/ci/build/kind.yml    | 1 -
 taskcluster/ci/push-apk/kind.yml | 2 ++
 taskcluster/ci/signing/kind.yml  | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index 8193e8677..ae6c6bee1 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -76,7 +76,6 @@ jobs:
 
     beta:
         attributes:
-            build-type: production
             release-type: beta
         include-release-version: true
         include-shippable-secrets: true
diff --git a/taskcluster/ci/push-apk/kind.yml b/taskcluster/ci/push-apk/kind.yml
index 37b245ec4..1476721b1 100644
--- a/taskcluster/ci/push-apk/kind.yml
+++ b/taskcluster/ci/push-apk/kind.yml
@@ -14,6 +14,7 @@ kind-dependencies:
 
 only-for-build-types:
     - nightly
+    - beta
     - production
 
 job-template:
@@ -24,6 +25,7 @@ job-template:
         channel:
             by-build-type:
                 nightly: nightly
+                beta: beta
                 production: production
         dep:
             by-level:
diff --git a/taskcluster/ci/signing/kind.yml b/taskcluster/ci/signing/kind.yml
index dd34c4a2b..240f115a5 100644
--- a/taskcluster/ci/signing/kind.yml
+++ b/taskcluster/ci/signing/kind.yml
@@ -16,7 +16,7 @@ job-template:
     description: Sign Fenix
     worker-type:
         by-build-type:
-            (fennec-production|nightly|production):
+            (fennec-production|nightly|beta|production):
                 by-level:
                     '3': signing
                     default: dep-signing
@@ -33,6 +33,10 @@ job-template:
                         '3': nightly-signing
                         default: dep-signing
                 performance-test: dep-signing
+                beta:
+                    by-level:
+                        '3': beta-signing
+                        default: dep-signing
                 production:
                     by-level:
                         '3': production-signing
@@ -40,7 +44,7 @@ job-template:
                 default: dep-signing
     index:
         by-build-type:
-            (fennec-production|nightly|performance-test|production):
+            (fennec-production|nightly|performance-test|beta|production):
                 type: signing
             default: {}
     run-on-tasks-for: []