Bug 1144463 - Add dolphin-512 and update docker. r=jlal,wcosta

--HG--
extra : rebase_source : 7fb1450e53953c7325fea1a37b1cf34a0d5585a4

testing/docker/b2g-build/Dockerfile

@@ -11,6 +11,7 @@ RUN yum install -y epel-release && \
   GConf2-devel \
   alsa-lib-devel \
   autoconf213 \
+  bc \
   bison \
   bzip2 \
   ccache \

testing/docker/b2g-build/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

testing/docker/builder/Dockerfile

@@ -1,4 +1,4 @@
-FROM          quay.io/mozilla/b2g-build:0.2.6
+FROM          quay.io/mozilla/b2g-build:0.2.7
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ENV PYTHONPATH /tools/tools/lib/python:$PYTHONPATH

testing/docker/builder/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

testing/docker/phone-builder/Dockerfile

@@ -1,4 +1,4 @@
-FROM          quay.io/mozilla/builder:0.5.3
+FROM          quay.io/mozilla/builder:0.5.4
 MAINTAINER    Wander Lairson Costa <wcosta@mozilla.com>
 
 # Add utilities and configuration

testing/docker/phone-builder/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

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

@@ -0,0 +1,66 @@
+#! /bin/bash -vex
+
+# Ensure all the scripts in this dir are on the path....
+DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+PATH=$DIRNAME:$PATH
+
+WORKSPACE=$1
+
+### Check that require variables are defined
+test -d $WORKSPACE
+test $GECKO_HEAD_REPOSITORY # Should be an hg repository url to pull from
+test $GECKO_BASE_REPOSITORY # Should be an hg repository url to clone from
+test $GECKO_HEAD_REV # Should be an hg revision to pull down
+test $MOZHARNESS_REPOSITORY # mozharness repository
+test $MOZHARNESS_REV # mozharness revision
+test $TARGET
+test $VARIANT
+
+. ../builder/setup-ccache.sh
+
+# First check if the mozharness directory is available. This is intended to be
+# used locally in development to test mozharness changes:
+#
+#   $ docker -v your_mozharness:/home/worker/mozharness ...
+#
+if [ ! -d mozharness ]; then
+  tc-vcs checkout mozharness $MOZHARNESS_REPOSITORY $MOZHARNESS_REPOSITORY $MOZHARNESS_REV
+fi
+
+# Figure out where the remote manifest is so we can use caches for it.
+MANIFEST=$(repository-url.py $GECKO_HEAD_REPOSITORY $GECKO_HEAD_REV b2g/config/$TARGET/sources.xml)
+tc-vcs repo-checkout $WORKSPACE/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
+
+# Ensure symlink has been created to gecko...
+rm -f $WORKSPACE/B2G/gecko
+ln -s $WORKSPACE/gecko $WORKSPACE/B2G/gecko
+
+debug_flag=""
+if [ 0$B2G_DEBUG -ne 0 ]; then
+  debug_flag='--debug'
+fi
+
+./mozharness/scripts/b2g_build.py \
+  --config b2g/taskcluster-phone.py \
+  "$debug_flag" \
+  --disable-mock \
+  --variant=$VARIANT \
+  --work-dir=$WORKSPACE/B2G \
+  --gaia-languages-file $WORKSPACE/B2G/device/sprd/scx15/languages.json \
+  --log-level=debug \
+  --target=$TARGET \
+  --b2g-config-dir=$TARGET \
+  --checkout-revision=$GECKO_HEAD_REV \
+  --base-repo=$GECKO_BASE_REPOSITORY \
+  --repo=$GECKO_HEAD_REPOSITORY
+
+# Move files into artifact locations!
+mkdir -p $HOME/artifacts
+
+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
+mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
+mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
+
+ccache -s

testing/taskcluster/tasks/branches/base_job_flags.yml

@@ -18,6 +18,10 @@ flags:
     - win32_gecko    # b2g desktop win 32 bit
     - flame-kk       # b2g flame kitkat
     - flame-kk-eng   # b2g flame eng build
+    - dolphin
+    - dolphin-eng
+    - dolphin-512
+    - dolphin-512-eng
 
   tests:
     - cppunit

testing/taskcluster/tasks/branches/try/job_flags.yml

@@ -76,6 +76,30 @@ builds:
     types:
       opt:
         task: tasks/builds/b2g_flame_kk_eng.yml
+  dolphin:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_dolphin_opt.yml
+  dolphin-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_dolphin_eng.yml
+  dolphin-512:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_dolphin_512_opt.yml
+  dolphin-512-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_dolphin_512_eng.yml
 
 tests:
   cppunit:

testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml

@@ -0,0 +1,23 @@
+$inherits:
+  from: 'tasks/builds/b2g_dolphin_base.yml'
+task:
+  scopes:
+    - 'docker-worker:cache:build-dolphin-512-eng'
+  metadata:
+    name: '[TC] B2G Dolphin 512 Eng'
+
+  extra:
+    treeherder:
+      symbol: Be
+      groupSymbol: Dolphin-512
+      groupName: Dolphin 512 Device Image
+      machine:
+        platform: b2g-device-image
+
+  payload:
+    cache:
+      build-dolphin-512-eng: /home/worker/object-folder
+    env:
+      TARGET: 'dolphin-512'
+      VARIANT: eng
+

testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml

@@ -0,0 +1,20 @@
+$inherits:
+  from: 'tasks/builds/b2g_dolphin_base.yml'
+task:
+  scopes:
+    - 'docker-worker:cache:build-dolphin-512-opt'
+  metadata:
+    name: '[TC] B2G Dolphin 512 Opt'
+
+  extra:
+    treeherder:
+      groupSymbol: Dolphin-512
+      groupName: Dolphin 512 Device Image
+      machine:
+        platform: b2g-device-image
+
+  payload:
+    cache:
+      build-dolphin-512-opt: /home/worker/object-folder
+    env:
+      TARGET: 'dolphin-512'

testing/taskcluster/tasks/builds/b2g_dolphin_base.yml

@@ -0,0 +1,31 @@
+$inherits:
+  from: 'tasks/phone_build.yml'
+task:
+  workerType: dolphin
+  metadata:
+    description: |
+      Dolphin phones + b2g environment used in full stack testing.
+  payload:
+    env:
+      REPO_TRACE: 1
+      VARIANT: user
+      DEBUG: 0
+
+    # Dolphin could take more than one hours to build!
+    maxRunTime: 7200
+
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-dolphin.sh $HOME/workspace
+
+  extra:
+    # Rather then enforcing particular conventions we require that all build
+    # tasks provide the "build" extra field to specify where the build and tests
+    # files are located.
+    locations:
+      build: 'private/build/b2g-android-arm.tar.gz'
+      tests: 'private/build/gaia.zip'
+      symbols: 'private/build/b2g-crashreporter-symbols.zip'
+      sources: 'private/build/sources.xml'

testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml

@@ -1,17 +1,22 @@
 $inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
+  from: 'tasks/builds/b2g_dolphin_base.yml'
 task:
   scopes:
     - 'docker-worker:cache:build-dolphin-eng'
   metadata:
-    name: B2G Dolphin Eng
+    name: '[TC] B2G Dolphin Eng'
+
+  extra:
+    treeherder:
+      symbol: Be
+      groupSymbol: Dolphin
+      groupName: Dolphin Device Image
+      machine:
+        platform: b2g-device-image
+
   payload:
     cache:
-      build-hamachi-eng: /home/worker/object-folder
+      build-dolphin-eng: /home/worker/object-folder
     env:
       TARGET: 'dolphin'
-      DEBUG: 0
       VARIANT: eng
-  extra:
-    locations:
-      img: 'private/build/dolphin.zip'

testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml

@@ -0,0 +1,21 @@
+$inherits:
+  from: 'tasks/builds/b2g_dolphin_base.yml'
+task:
+  scopes:
+    - 'docker-worker:cache:build-dolphin-opt'
+  metadata:
+    name: '[TC] B2G Dolphin Opt'
+
+  extra:
+    treeherder:
+      groupSymbol: Dolphin
+      groupName: Dolphin Device Image
+      machine:
+        platform: b2g-device-image
+
+  payload:
+    cache:
+      build-dolphin-opt: /home/worker/object-folder
+    env:
+      TARGET: 'dolphin'
+

testing/taskcluster/tasks/builds/b2g_dolphin_user.yml

@@ -1,17 +0,0 @@
-$inherits:
-  from: 'tasks/builds/b2g_phone_base.yml'
-task:
-  scopes:
-    - 'docker-worker:cache:build-dolphin-user'
-  metadata:
-    name: B2G Dolphin User
-  payload:
-    cache:
-      build-hamachi-user: /home/worker/object-folder
-    env:
-      TARGET: 'dolphin'
-      DEBUG: 0
-  extra:
-    locations:
-      img: 'private/build/dolphin.zip'
-