From e3029d658a9e1b4115d4702d14019d5072629692 Mon Sep 17 00:00:00 2001
From: Johan Lorenzo <jlorenzo@mozilla.com>
Date: Thu, 4 Jun 2020 14:54:11 +0200
Subject: [PATCH] Bug 1608874 - part 1: Move Fennec Beta to a dedicated hook
 (#11048)

---
 taskcluster/ci/build/kind.yml                      | 7 ++-----
 taskcluster/ci/push-apk/kind.yml                   | 7 ++++++-
 taskcluster/fenix_taskgraph/target_tasks.py        | 6 +++---
 taskcluster/fenix_taskgraph/transforms/push_apk.py | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index 7ca74b129..b50a88b94 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -155,13 +155,10 @@ jobs:
 
     fennec-production:
         attributes:
-            # TODO replace `nightly: true` by `release-type: production` once the data migration
-            # testing is over
-            # TODO when making the above change, uncomment `filter-incomplete-translations: true`
-            nightly: true
+            release-type: production
         include-release-version: true
         include-shippable-secrets: true
-#        filter-incomplete-translations: true
+        filter-incomplete-translations: true
         run:
             geckoview-engine: geckoBeta
             gradle-build-type: fennecProduction
diff --git a/taskcluster/ci/push-apk/kind.yml b/taskcluster/ci/push-apk/kind.yml
index 0a91d03e7..24336484a 100644
--- a/taskcluster/ci/push-apk/kind.yml
+++ b/taskcluster/ci/push-apk/kind.yml
@@ -19,6 +19,7 @@ group-by: build-type
 only-for-build-types:
     - fennec-nightly
     - fennec-beta
+    - fennec-production
     - nightly
     - beta
     - production
@@ -27,11 +28,15 @@ job-template:
     description: Publish Fenix
     worker-type: push-apk
     worker:
-        commit: true
+        commit:
+            by-build-type:
+                fennec-production: false
+                default: true
         channel:
             by-build-type:
                 fennec-nightly: fennec-nightly
                 fennec-beta: fennec-beta
+                fennec-production: fennec-production
                 nightly: nightly
                 beta: beta
                 production: production
diff --git a/taskcluster/fenix_taskgraph/target_tasks.py b/taskcluster/fenix_taskgraph/target_tasks.py
index f33c3fc19..9694d1b38 100644
--- a/taskcluster/fenix_taskgraph/target_tasks.py
+++ b/taskcluster/fenix_taskgraph/target_tasks.py
@@ -58,11 +58,11 @@ def _filter_fennec(fennec_type, task, parameters):
     return task.attributes.get("build-type", "") == "fennec-{}".format(fennec_type)
 
 
-@_target_task("fennec-beta")
+@_target_task("fennec-production")
 def target_tasks_fennec_nightly(full_task_graph, parameters, graph_config):
-    """Select the set of tasks required for a beta build signed with the fennec key."""
+    """Select the set of tasks required for a production build signed with the fennec key."""
 
-    return [l for l, t in full_task_graph.tasks.iteritems() if _filter_fennec("beta", t, parameters)]
+    return [l for l, t in full_task_graph.tasks.iteritems() if _filter_fennec("production", t, parameters)]
 
 
 @_target_task("bump_android_components")
diff --git a/taskcluster/fenix_taskgraph/transforms/push_apk.py b/taskcluster/fenix_taskgraph/transforms/push_apk.py
index 1de559aad..4f087a7a4 100644
--- a/taskcluster/fenix_taskgraph/transforms/push_apk.py
+++ b/taskcluster/fenix_taskgraph/transforms/push_apk.py
@@ -18,7 +18,7 @@ transforms = TransformSequence()
 @transforms.add
 def resolve_keys(config, tasks):
     for task in tasks:
-        for key in ("worker.channel", "worker.dep"):
+        for key in ("worker.channel", "worker.commit", "worker.dep"):
             resolve_keyed_by(
                 task,
                 key,