Bug 1819153 - Add nightly-firebase build type in nightly tasks + cleanup

Author: AaronMT

taskcluster/android_taskgraph/target_tasks.py

@@ -30,7 +30,7 @@ def index_exists(index_path, reason=""):
 def target_tasks_nightly(full_task_graph, parameters, graph_config):
     def filter(task, parameters):
         build_type = task.attributes.get("build-type", "")
-        return build_type in ("nightly", "focus-nightly", "fenix-nightly")
+        return build_type in ("nightly", "focus-nightly", "fenix-nightly", "fenix-nightly-firebase", "focus-nightly-firebase")
 
     index_path = (
         f"{graph_config['trust-domain']}.v2.{parameters['project']}.branch."

taskcluster/ci/startup-test/kind.yml

@@ -35,7 +35,7 @@ task-defaults:
               json: true
     run-on-tasks-for: []
     attributes:
-        build-type: nightly-firebase
+        build-type: fenix-nightly-firebase
         shipping-product: fenix
         # cannot safely run this in Firebase
         # turning off til we can safely run test in taskcluster

taskcluster/ci/ui-test-apk/kind.yml

@@ -103,6 +103,7 @@ tasks:
             shipping-product: focus
         description: 'Focus UI tests with firebase'
         run-on-tasks-for: [github-pull-request, github-push]
+        run-on-git-branches: ["^((?!releases[_/]).+)$"]
         run:
             secrets:
                 - name: project/mobile/firefox-android/focus-android/firebase
@@ -128,7 +129,7 @@ tasks:
                 GOOGLE_PROJECT: 'moz-focus-android'
     focus-arm-nightly:
         attributes:
-            build-type: nightly-firebase
+            build-type: focus-nightly-firebase
             shipping-product: focus
         description: 'UI tests on Nightly with firebase'
         run-on-tasks-for: [github-push]
@@ -157,11 +158,11 @@ tasks:
                 GOOGLE_PROJECT: 'moz-focus-android'
     focus-arm-beta:
         attributes:
-            build-type: nightly-firebase
+            build-type: focus-beta-firebase
             shipping-product: focus
         description: 'UI tests on Beta with firebase'
         run-on-tasks-for: [github-push]
-        run-on-git-branches: [main, releases_v]
+        run-on-git-branches: [releases_v]
         dependencies:
             signed-apk-debug-apk: signing-apk-focus-beta-firebase
             signed-apk-android-test: signing-apk-focus-android-test-beta
@@ -242,11 +243,11 @@ tasks:
                 GOOGLE_PROJECT: moz-fenix
     fenix-arm-beta:
         attributes:
-            build-type: beta-firebase
+            build-type: fenix-beta-firebase
             shipping-product: fenix
         description: Test Fenix
         run-on-tasks-for: [github-push]
-        run-on-git-branches: ["^releases[/_].+$"]
+        run-on-git-branches: [releases_v]
         dependencies:
             signed-apk-debug-apk: signing-apk-fenix-beta-firebase
             signed-apk-android-test: signing-apk-fenix-android-test-beta
@@ -270,10 +271,11 @@ tasks:
                 GOOGLE_PROJECT: moz-fenix
     fenix-arm-nightly:
         attributes:
-            build-type: nightly-firebase
+            build-type: fenix-nightly-firebase
             shipping-product: fenix
         description: Test Fenix
         run-on-tasks-for: [github-push]
+        run-on-git-branches: [main]
         dependencies:
             signed-apk-debug-apk: signing-apk-fenix-nightly-firebase
             signed-apk-android-test: signing-apk-fenix-android-test-nightly