From 7f7d61e246aa32dc0ec3214b51624dacaa9ff493 Mon Sep 17 00:00:00 2001
From: Johan Lorenzo <jlorenzo@mozilla.com>
Date: Thu, 28 Nov 2019 16:25:17 +0100
Subject: [PATCH] Bug 1600104 - Enable Fennec{Nightly,Beta} builds on CI

---
 taskcluster/ci/build/kind.yml   | 48 +++++++++++++++++++++++++--------
 taskcluster/ci/config.yml       |  4 ++-
 taskcluster/ci/signing/kind.yml | 11 +++++---
 3 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index 28bcbd63f..5cc328eed 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -95,17 +95,6 @@ jobs:
         treeherder:
             symbol: nightly(B)
 
-    fennec-production:
-        attributes:
-            nightly: true
-        include-nightly-version: true
-        include-shippable-secrets: true
-        run:
-            geckoview-engine: geckoBeta
-            gradle-build-type: fennecProduction
-        treeherder:
-            symbol: nightlyFennec(B)
-
     beta:
         attributes:
             release-type: beta
@@ -129,3 +118,40 @@ jobs:
         run-on-tasks-for: [github-release]
         treeherder:
             symbol: production(B)
+
+    fennec-nightly:
+        attributes:
+            nightly: true
+        include-nightly-version: true
+        include-shippable-secrets: true
+        run:
+            geckoview-engine: geckoNightly
+            gradle-build-type: fennecNightly
+        treeherder:
+            symbol: nightlyFennec(B)
+
+    fennec-beta:
+        attributes:
+            # TODO replace `nightly: true` by `release-type: beta` once the data migration
+            # testing is over
+            nightly: true
+        include-release-version: true
+        include-shippable-secrets: true
+        run:
+            geckoview-engine: geckoBeta
+            gradle-build-type: fennecBeta
+        treeherder:
+            symbol: betaFennec(B)
+
+    fennec-production:
+        attributes:
+            # TODO replace `nightly: true` by `release-type: production` once the data migration
+            # testing is over
+            nightly: true
+        include-release-version: true
+        include-shippable-secrets: true
+        run:
+            geckoview-engine: geckoBeta
+            gradle-build-type: fennecProduction
+        treeherder:
+            symbol: productionFennec(B)
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 3a9ebdeac..7917a733d 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -2,13 +2,15 @@
 trust-domain: mobile
 treeherder:
     group-names:
-        'beta': 'Nightly-related tasks'
+        'beta': 'Beta-related tasks'
+        'betaFennec': 'Beta-related tasks with same APK configuration as Fennec'
         'debug': 'Builds made for testing'
         'forPerformanceTest': 'Builds made for Raptor and other performance tests'
         'I': 'Docker Image Builds'
         'nightly': 'Nightly-related tasks'
         'nightlyFennec': 'Nightly-related tasks with same APK configuration as Fennec'
         'production': 'Release-related tasks'
+        'productionFennec': 'Production-related tasks with same APK configuration as Fennec'
         'Rap': 'Raptor tests'
         'Rap-P': 'Raptor power tests'
 
diff --git a/taskcluster/ci/signing/kind.yml b/taskcluster/ci/signing/kind.yml
index 2af0bdd40..d3d0b01aa 100644
--- a/taskcluster/ci/signing/kind.yml
+++ b/taskcluster/ci/signing/kind.yml
@@ -12,11 +12,12 @@ transforms:
 kind-dependencies:
     - build
 
+
 job-template:
     description: Sign Fenix
     worker-type:
         by-build-type:
-            (fennec-production|nightly|beta|production|android-test-nightly):
+            (fennec-.+|nightly|beta|production|android-test-nightly):
                 by-level:
                     '3': signing
                     default: dep-signing
@@ -24,10 +25,14 @@ job-template:
     worker:
         signing-type:
             by-build-type:
-                fennec-production:
+                fennec-(beta|production):
                     by-level:
                         '3': fennec-production-signing
                         default: dep-signing
+                fennec-nightly:
+                    by-level:
+                        '3': fennec-nightly-signing
+                        default: dep-signing
                 nightly:
                     by-level:
                         '3': nightly-signing
@@ -48,7 +53,7 @@ job-template:
                 default: dep-signing
     index:
         by-build-type:
-            (fennec-production|nightly|performance-test|beta|production):
+            (fennec-.+|nightly|performance-test|beta|production):
                 type: signing
             default: {}
     run-on-tasks-for: []