Bug 1164939: Provide flame-kk user, userdebug and eng builds.

--HG--
extra : rebase_source : d535e7baa99b0302b5faec9cf97ec5e5a37f08e8

testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh

@@ -11,6 +11,16 @@ if [ ! -d $HOME/.ssh ]; then
 fi
 
 aws s3 cp s3://b2g-nightly-credentials/balrog_credentials .
+mar_file=b2g-${TARGET%%-*}-gecko-update.mar
+
+# We need different platform names for each variant (user, userdebug and
+# eng). We do not append variant suffix for "user" to keep compability with
+# verions already installed in the phones.
+if [ $VARIANT == "user" ]; then
+  PLATFORM=$TARGET
+else
+  PLATFORM=$TARGET-$VARIANT
+fi
 
 ./mozharness/scripts/b2g_build.py \
   --config b2g/taskcluster-phone-nightly.py \
@@ -26,8 +36,8 @@ aws s3 cp s3://b2g-nightly-credentials/balrog_credentials .
   --checkout-revision=$GECKO_HEAD_REV \
   --base-repo=$GECKO_BASE_REPOSITORY \
   --repo=$GECKO_HEAD_REPOSITORY \
-  --platform $TARGET \
-  --complete-mar-url https://queue.taskcluster.net/v1/task/$TASK_ID/runs/$RUN_ID/artifacts/public/build/b2g-${TARGET%%-*}-gecko-update.mar \
+  --platform $PLATFORM \
+  --complete-mar-url https://queue.taskcluster.net/v1/task/$TASK_ID/runs/$RUN_ID/artifacts/public/build/$mar_file
 
 # Don't cache backups
 rm -rf $WORKSPACE/B2G/backup-*
@@ -36,7 +46,7 @@ rm -f balrog_credentials
 mkdir -p $HOME/artifacts
 mkdir -p $HOME/artifacts-public
 
-mv $WORKSPACE/B2G/upload-public/b2g-flame-gecko-update.mar $HOME/artifacts-public/b2g-flame-gecko-update.mar
+mv $WORKSPACE/B2G/upload-public/$mar_file $HOME/artifacts-public/
 mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
 #mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz

testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml

@@ -12,12 +12,6 @@ builds:
     types:
       opt:
         task: tasks/builds/b2g_flame_kk_opt.yml
-  flame-kk-eng:
-    platforms:
-      - b2g
-    types:
-      opt:
-        task: tasks/builds/b2g_flame_kk_eng.yml
 
 tests:
   gaia-ui-test-sanity:

testing/taskcluster/tasks/branches/base_job_flags.yml

@@ -16,6 +16,7 @@ flags:
     - linux64-mulet  # Firefox desktop - b2g gecko linux 64 bit
     - macosx64_gecko # b2g desktop osx 64 bit
     - win32_gecko    # b2g desktop win 32 bit
+    - flame-kk-nightly
     - flame-kk       # b2g flame kitkat
     - flame-kk-eng   # b2g flame eng build
     - dolphin

testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml

@@ -66,6 +66,20 @@ builds:
     types:
       opt:
         task: tasks/builds/b2g_aries_lightsaber_eng.yml
+  flame-kk-nightly:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_nightly_opt.yml
+      debug:
+        task: tasks/builds/b2g_flame_kk_nightly_debug.yml
+  flame-kk-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_eng.yml
 
 tests:
   cppunit:

testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml

@@ -19,7 +19,6 @@ task:
       VARIANT: eng
       GAIA_OPTIMIZE: '1'
       B2G_SYSTEM_APPS: '1'
-      B2G_UPDATER: '1'
     command:
       - >
         checkout-gecko workspace &&

testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_base.yml

@@ -1,21 +1,13 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'flame-kk-nightly'
-    build_type: 'opt'
 task:
   workerType: balrog
   scopes:
-    - 'docker-worker:cache:build-flame-kk-nightly'
     - 'docker-worker:feature:balrogVPNProxy'
-  metadata:
-    name: '[TC] B2G Flame KK Nightly'
 
   payload:
     features:
       balrogVPNProxy: true
-    cache:
-      build-flame-kk-nightly: /home/worker/object-folder
     env:
       TARGET: 'flame-kk'
       DEBUG: 0
@@ -35,3 +27,4 @@ task:
     locations:
       img: 'private/build/flame-kk.zip'
       mar: 'public/build/b2g-flame-gecko-update.mar'
+

testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_debug.yml

@@ -0,0 +1,18 @@
+$inherits:
+  from: 'tasks/builds/b2g_flame_kk_nightly_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'debug'
+task:
+  metadata:
+    name: '[TC] B2G Flame KK Nightly (userdebug)'
+  workerType: balrog
+  scopes:
+    - 'docker-worker:cache:build-flame-kk-nightly-debug'
+
+  payload:
+    cache:
+        build-flame-kk-nightly-debug: /home/worker/workspace
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 1

testing/taskcluster/tasks/builds/b2g_flame_kk_nightly_opt.yml

@@ -0,0 +1,17 @@
+$inherits:
+  from: 'tasks/builds/b2g_flame_kk_nightly_base.yml'
+  variables:
+    build_name: 'flame-kk'
+    build_type: 'opt'
+task:
+  metadata:
+    name: '[TC] B2G Flame KK Nightly (user)'
+  workerType: balrog
+  scopes:
+    - 'docker-worker:cache:build-flame-kk-nightly-user'
+
+  payload:
+    cache:
+        build-flame-kk-nightly-user: /home/worker/workspace
+    env:
+      VARIANT: user