From fdfd9ace4b909ce1e0198798a071c3f1a4dfb353 Mon Sep 17 00:00:00 2001
From: kglazko <katglazko@gmail.com>
Date: Wed, 27 Nov 2019 09:04:11 -0800
Subject: [PATCH] Nimbledroid Fenix add beta and release jobs (#6828)

---
 taskcluster/ci/nimbledroid/kind.yml | 66 +++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/taskcluster/ci/nimbledroid/kind.yml b/taskcluster/ci/nimbledroid/kind.yml
index 9300ccffd..dc7592763 100644
--- a/taskcluster/ci/nimbledroid/kind.yml
+++ b/taskcluster/ci/nimbledroid/kind.yml
@@ -12,30 +12,60 @@ kind-dependencies:
     - signing
 
 
+job-defaults:
+    description: Upload APKs to Nimbledroid for performance measurement and tracking
+    run:
+        using: run-commands
+        use-caches: false
+        secrets:
+            - name: project/mobile/fenix/nimbledroid
+              key: api_key
+              path: .nimbledroid_token
+    run-on-tasks-for: []
+    treeherder:
+        kind: test
+        platform: android-all/opt
+        tier: 2
+    worker:
+        docker-image: {in-tree: nimbledroid}
+        max-run-time: 600
+    worker-type: b-android
+
 jobs:
     nightly:
         attributes:
             nightly: true
         dependencies:
             signing: signing-nightly
-        description: Upload APKs to Nimbledroid for performance measurement and tracking
         run:
             commands:
-                - [wget, {artifact-reference: '<signing/public/build/armeabi-v7a/geckoNightly/target.apk>'}, '-O', target.apk]
-                - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token]
-            secrets:
-                - name: project/mobile/fenix/nimbledroid
-                  key: api_key
-                  path: .nimbledroid_token
-            using: run-commands
-            use-caches: false
-        run-on-tasks-for: []
+            - [wget, {artifact-reference: '<signing/public/build/armeabi-v7a/geckoNightly/target.apk>'}, '-O', target.apk]
+            - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token]
+
         treeherder:
-            kind: test
-            platform: android-all/opt
-            symbol: nimbledroid
-            tier: 2
-        worker:
-            docker-image: {in-tree: nimbledroid}
-            max-run-time: 600
-        worker-type: b-android
+            symbol: nightly(nimbledroid)
+    
+    production:
+        attributes:
+            release-type: production
+        dependencies: 
+            signing: signing-production
+        run:
+            commands:
+                - [wget, {artifact-reference: '<signing/public/build/armeabi-v7a/geckoBeta/target.apk>'}, '-O', target.apk]
+                - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token]
+        treeherder:
+            symbol: production(nimbledroid)
+
+    beta:
+        attributes:
+            release-type: beta
+        dependencies: 
+            signing: signing-beta
+        run:
+            commands:
+                - [wget, {artifact-reference: '<signing/public/build/armeabi-v7a/geckoBeta/target.apk>'}, '-O', target.apk]
+                - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token]
+        treeherder:
+            symbol: beta(nimbledroid)
+            
\ No newline at end of file