Add support for feature branch builds on taskcluster (#1889)

.taskcluster.yml

@@ -11,7 +11,10 @@ tasks:
       $if: 'tasks_for == "github-pull-request"'
       then: ${event.pull_request.head.repo.clone_url}
       else: ${event.repository.clone_url}
-
+    isFeatureBranch:
+      $if: 'tasks_for == "github-push"'
+      then: {$eval: 'event.ref[0:19] == "refs/heads/feature/"'}
+      else: false
   in:
 ###############################################################################
 # Task: Pull requests
@@ -53,50 +56,56 @@ tasks:
 # testing only and should not be uploaded to App Stores.
 #
 ###############################################################################
-    - $if: 'tasks_for == "github-push" && event["ref"] == "refs/heads/master"'
+    - $if: 'tasks_for == "github-push" && (event["ref"] == "refs/heads/master" || isFeatureBranch == true)'
       then:
-        provisionerId: 'aws-provisioner-v1'
-        workerType: 'github-worker'
-        deadline: {$fromNow: 1 day}
-        expires: {$fromNow: 1 year}
-        scopes:
-          - "secrets:get:project/firefoxreality/github-deploy-key"
-          - "secrets:get:project/firefoxreality/staging-signing-token"
-          - "secrets:get:project/firefoxreality/symbols-token"
-        routes:
-          - [email protected]
-        payload:
-          maxRunTime: 14400
-          image: 'mozillamixedreality/firefoxreality:190312'
-          features:
-            taskclusterProxy: true
-          command:
-            - /bin/bash
-            - '--login'
-            - '-cx'
-            - >-
-              git fetch origin
-              && git config advice.detachedHead false
-              && git rebase origin/master
-              && rm -rf gvr-android-sdk && git clone https://github.com/MozillaReality/FirefoxReality-gvr-android-sdk.git gvr-android-sdk
-              && git submodule update
-              && . tools/taskcluster/get_third_party.sh
-              && cp tools/gradle/taskcluster.properties ./user.properties
-              && ./gradlew --no-daemon --console=plain clean `python tools/taskcluster/build_targets.py =all`
-              && python tools/taskcluster/fetch_secret.py -s project/firefoxreality/staging-signing-token -o token -n token
-              && python tools/taskcluster/sign_apk.py -t token
-              && python tools/taskcluster/archive_debug_apk.py
-              && . tools/taskcluster/upload_symbols.sh
-          artifacts:
-            'public':
-              type: 'directory'
-              path: '/opt/FirefoxReality/builds/'
-              expires: {$fromNow: '1 month'}
-        metadata:
-          name: Firefox Reality for Android - Build - Master update
-          description: Building Firefox Reality for Android (via Gradle) - triggered by update to master
-          owner: [email protected]
-          source: ${repository}
+        $let:
+          featureName:
+            $if: 'isFeatureBranch == true'
+            then: "-f ${event.ref[19:]}"
+            else: "-f master"
+        in:
+          provisionerId: 'aws-provisioner-v1'
+          workerType: 'github-worker'
+          deadline: {$fromNow: 1 day}
+          expires: {$fromNow: 1 year}
+          scopes:
+            - "secrets:get:project/firefoxreality/github-deploy-key"
+            - "secrets:get:project/firefoxreality/staging-signing-token"
+            - "secrets:get:project/firefoxreality/symbols-token"
+          routes:
+            - [email protected]
+          payload:
+            maxRunTime: 14400
+            image: 'mozillamixedreality/firefoxreality:190312'
+            features:
+              taskclusterProxy: true
+            command:
+              - /bin/bash
+              - '--login'
+              - '-cx'
+              - >-
+                git fetch origin
+                && git config advice.detachedHead false
+                && git checkout ${event.ref}
+                && rm -rf gvr-android-sdk && git clone https://github.com/MozillaReality/FirefoxReality-gvr-android-sdk.git gvr-android-sdk
+                && git submodule update
+                && . tools/taskcluster/get_third_party.sh
+                && cp tools/gradle/taskcluster.properties ./user.properties
+                && ./gradlew --no-daemon --console=plain clean `python tools/taskcluster/build_targets.py =all`
+                && python tools/taskcluster/fetch_secret.py -s project/firefoxreality/staging-signing-token -o token -n token
+                && python tools/taskcluster/sign_apk.py -t token ${featureName}
+                && python tools/taskcluster/archive_debug_apk.py
+                && . tools/taskcluster/upload_symbols.sh
+            artifacts:
+              'public':
+                type: 'directory'
+                path: '/opt/FirefoxReality/builds/'
+                expires: {$fromNow: '1 month'}
+          metadata:
+            name: Firefox Reality for Android - Build - Master update
+            description: Building Firefox Reality for Android (via Gradle) - triggered by update to master or feature branch
+            owner: [email protected]
+            source: ${repository}
 ###############################################################################
 # Task: Release builds
 #

tools/taskcluster/sign_apk.py

@@ -15,29 +15,33 @@ def main(name, argv):
    token = ''
    sign_url = 'https://edge.stage.autograph.services.mozaws.net/sign'
    release = False
+   feature_name = ""
    try:
-      opts, args = getopt.getopt(argv,"ht:r")
+      opts, args = getopt.getopt(argv,"hrt:f:")
    except getopt.GetoptError:
-      print name + '-t <token file name> -r'
+      print name + ' -t <token file name> -r -f <feature name>'
       sys.exit(2)
    for opt, arg in opts:
       if opt == '-h':
-         print name + '-t <token file name> -r'
+         print name + ' -t <token file name> -r -f <feature name>'
          sys.exit()
       elif opt in ("-t"):
          with open(arg, 'r') as tokenfile:
             token = tokenfile.read().rstrip()
       elif opt in ('-r'):
          sign_url = 'https://edge.prod.autograph.services.mozaws.net/sign'
          release = True
+      elif opt in ('-f'):
+         feature_name = arg.replace('/','-') + '-'
+
 
    build_output_path = './app/build/outputs/apk'
 
    # Sign APKs
    for apk in glob.glob(build_output_path + "/*/*/*-unsigned.apk"):
       target = apk.replace('-unsigned', '-signed')
       if not release:
-         target = target.replace('-release-', '-staging-')
+         target = target.replace('-release-', '-staging-' + feature_name)
       print "Signing", apk
       print "Target ", target
       print subprocess.check_output([