Bug 1201540 - Producing FOTA packages for foxfood. r=wcosta
authorAlexandre Lissy <lissyx@lissyx.dyndns.org>
Wed, 04 Nov 2015 07:47:00 +0100
changeset 306846 ec3b6ca358f6c22e9b6239c00648c4c79afaf9b3
parent 306845 6b39a6ec3f92a56f1a1a77f00c699fe28c84443a
child 306847 5a3d69c1b2ad78f2b86237bdeecfe077d8da56ef
push id7204
push usercku@mozilla.com
push dateThu, 05 Nov 2015 15:38:26 +0000
reviewerswcosta
bugs1201540
milestone45.0a1
Bug 1201540 - Producing FOTA packages for foxfood. r=wcosta Foxfood devices are Sony Xperia Z3c devices. We need to be able to push updates of the Gonk layer to fix some bugs. Those requires changes to the kernel, to boot partition and to some other assets. Hence we add support for producing all kind of updates packages we might need on that device: - ota, to update just Gecko/Gaia - fota, to update Gecko/Gaia in recovery mode - fota:fullimg, to be able to update gonk also
b2g/config/aries/config.json
testing/mozharness/configs/b2g/taskcluster-spark-dogfood.py
testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
--- a/b2g/config/aries/config.json
+++ b/b2g/config/aries/config.json
@@ -6,23 +6,25 @@
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["", "blobfree"],
     "upload_files": [
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
-        "{workdir}/sources.xml"
+        "{workdir}/sources.xml",
+        "{workdir}/out/target/product/aries/fota-*-update-*.mar"
     ],
     "public_upload_files": [
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml",
-        "{objdir}/dist/b2g-update/*.mar"
+        "{objdir}/dist/b2g-update/*.mar",
+        "{workdir}/out/target/product/aries/fota-*-update.mar"
     ],
     "zip_files": [
         ["{workdir}/out/target/product/aries/*.img", "out/target/product/aries/"],
         "{workdir}/flash.sh",
         "{workdir}/load-config.sh",
         "{workdir}/.config",
         "{workdir}/sources.xml",
         "{workdir}/profile.sh",
--- a/testing/mozharness/configs/b2g/taskcluster-spark-dogfood.py
+++ b/testing/mozharness/configs/b2g/taskcluster-spark-dogfood.py
@@ -2,32 +2,32 @@
 import os.path
 config = {
     "default_vcs": "tc-vcs",
     "default_actions": [
         'checkout-sources',
         'build',
         'build-symbols',
         'make-updates',
-        'prep-upload',
-        'submit-to-balrog'
+        'prep-upload'
     ],
-    "balrog_credentials_file": "balrog_credentials",
     "nightly_build": True,
     "env": {
         "GAIA_OPTIMIZE": "1",
         "B2G_UPDATER": "1",
         "LIGHTSABER": "1",
         "DOGFOOD": "1",
         "B2G_UPDATE_CHANNEL": "dogfood",
         "BOWER_FLAGS": "--allow-root",
         "B2G_PATH": "%(work_dir)s",
         "GAIA_DISTRIBUTION_DIR": "%(work_dir)s/gaia/distros/spark",
-        "WGET_OPTS": "-c -q"
+        "WGET_OPTS": "-c -q",
+        "B2G_FOTA_FULLIMG_PARTS": "/boot:boot.img /system:system.img /recovery:recovery.img"
     },
+    "update_types": [ "ota", "fota", "fota:fullimg" ],
     "is_automation": True,
     "repo_remote_mappings": {
         'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
         'git://codeaurora.org/': 'https://git.mozilla.org/external/caf',
         'https://git.mozilla.org/b2g': 'https://git.mozilla.org/b2g',
         'git://github.com/mozilla-b2g/': 'https://git.mozilla.org/b2g',
         'git://github.com/mozilla/': 'https://git.mozilla.org/b2g',
         'https://git.mozilla.org/releases': 'https://git.mozilla.org/releases',
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
@@ -11,17 +11,16 @@ task:
     - 'docker-worker:cache:build-aries-spark-dogfood-objdir-gecko-{{project}}'
   payload:
     cache:
       build-aries-spark-dogfood: /home/worker/workspace
       build-aries-spark-dogfood-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: userdebug
       DOGFOOD: 1
-      HARDWARE_COMPOSER: 0
       MOZHARNESS_CONFIG: b2g/taskcluster-spark-dogfood.py
   extra:
     treeherderEnv:
       - production
       - staging
     treeherder:
       symbol: B
       groupSymbol: Aries-DogFood