Bug 1257127 - Fix b2g device docker images to build in taskcluster r=wcosta
authorJuan Gomez <jgomez@mozilla.com>
Wed, 30 Mar 2016 02:44:00 +0200
changeset 290898 6e3cc6cb10cb3933cd95a0decbc15370cef3fc18
parent 290897 9f60a89fb3407e9ba100c34ebe90ccaf16cdd67f
child 290899 9aeae5b1f4a4dd97f0c4a3bab6a86e2517acfaed
push id74419
push usercbook@mozilla.com
push dateWed, 30 Mar 2016 15:01:20 +0000
treeherdermozilla-inbound@6e3cc6cb10cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta
bugs1257127
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1257127 - Fix b2g device docker images to build in taskcluster r=wcosta
b2g/config/aries/config.json
b2g/config/aries/releng-aries.tt
testing/docker/builder/VERSION
testing/docker/phone-builder/Dockerfile
testing/mozharness/configs/b2g/taskcluster-phone-eng.py
testing/mozharness/configs/b2g/taskcluster-phone-fota.py
testing/mozharness/configs/b2g/taskcluster-phone-ota.py
testing/mozharness/configs/b2g/taskcluster-phone.py
testing/mozharness/scripts/b2g_build.py
--- a/b2g/config/aries/config.json
+++ b/b2g/config/aries/config.json
@@ -37,17 +37,16 @@
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
         "MOZ_TELEMETRY_REPORTING": "1",
         "GAIA_KEYBOARD_LAYOUTS": "en,pt-BR,es,de,fr,pl,zh-Hans-Pinyin,zh-Hant-Zhuyin,en-Dvorak"
     },
     "b2g_manifest": "aries.xml",
     "b2g_manifest_intree": true,
-    "additional_source_tarballs": ["backup-aries.tar.xz"],
     "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
             "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/aries/releng-aries.tt
+++ b/b2g/config/aries/releng-aries.tt
@@ -1,17 +1,10 @@
 [
 {
-"size": 135359412,
-"digest": "45e677c9606cc4eec44ef4761df47ff431df1ffad17a5c6d21ce700a1c47f79e87a4aa9f30ae47ff060bd64f5b775d995780d88211f9a759ffa0d076beb4816b",
-"algorithm": "sha512",
-"filename": "backup-aries.tar.xz",
-"comment": "v18D"
-},
-{
 "version": "gcc 4.8.5",
 "size": 81065660,
 "digest": "db26f498ab56a3b5c65d7cda290cbb74174af9f2d021ca9c158f53b0382924ccf5ed9638d41eef449434aa9383a9113994d9729d9dd910321d1f35f9411eae38",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
 "unpack": "True"
 }
 ]
--- a/testing/docker/builder/VERSION
+++ b/testing/docker/builder/VERSION
@@ -1,1 +1,1 @@
-0.5.11
+0.5.12
--- a/testing/docker/phone-builder/Dockerfile
+++ b/testing/docker/phone-builder/Dockerfile
@@ -1,9 +1,9 @@
-FROM          taskcluster/builder:0.5.11
+FROM          taskcluster/builder:0.5.12
 MAINTAINER    Wander Lairson Costa <wcosta@mozilla.com>
 
 ENV           SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE /home/worker/socorro.token
 
 # Add utilities and configuration
 ADD           bin                   /home/worker/bin
 ADD           config                /home/worker/.aws/config
 ADD           socorro.token         /home/worker/socorro.token
--- a/testing/mozharness/configs/b2g/taskcluster-phone-eng.py
+++ b/testing/mozharness/configs/b2g/taskcluster-phone-eng.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 config = {
     "default_vcs": "tc-vcs",
     "default_actions": [
         'checkout-sources',
+        'get-blobs',
         'build',
         'build-symbols',
         'prep-upload'
     ],
     "upload": {
         "default": {
             "upload_dep_target_exclusions": []
         }
@@ -25,9 +26,10 @@ config = {
         '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',
         'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
         'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
     },
+    "download_tooltool": True,
 }
--- a/testing/mozharness/configs/b2g/taskcluster-phone-fota.py
+++ b/testing/mozharness/configs/b2g/taskcluster-phone-fota.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
 import os.path
 config = {
     "default_vcs": "tc-vcs",
     "default_actions": [
         'checkout-sources',
+        'get-blobs',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         #'submit-to-balrog'
     ],
     "balrog_credentials_file": "balrog_credentials",
     "nightly_build": True,
@@ -45,9 +46,10 @@ config = {
         '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',
         'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
         'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
     },
+    "download_tooltool": True,
 }
--- a/testing/mozharness/configs/b2g/taskcluster-phone-ota.py
+++ b/testing/mozharness/configs/b2g/taskcluster-phone-ota.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
 import os.path
 config = {
     "default_vcs": "tc-vcs",
     "default_actions": [
         'checkout-sources',
+        'get-blobs',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         #'submit-to-balrog'
     ],
     "balrog_credentials_file": "balrog_credentials",
     "nightly_build": True,
@@ -45,9 +46,10 @@ config = {
         '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',
         'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
         'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
     },
+    "download_tooltool": True,
 }
--- a/testing/mozharness/configs/b2g/taskcluster-phone.py
+++ b/testing/mozharness/configs/b2g/taskcluster-phone.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 config = {
     "default_vcs": "tc-vcs",
     "default_actions": [
         'checkout-sources',
+        'get-blobs',
         'build',
         'build-symbols',
         'prep-upload'
     ],
     "upload": {
         "default": {
             "upload_dep_target_exclusions": []
         }
@@ -22,9 +23,10 @@ config = {
         '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',
         'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
         'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
     },
+    "download_tooltool": True,
 }
--- a/testing/mozharness/scripts/b2g_build.py
+++ b/testing/mozharness/scripts/b2g_build.py
@@ -386,28 +386,28 @@ class B2GBuild(LocalesMixin, PurgeMixin,
     def download_blobs(self):
         dirs = self.query_abs_dirs()
         gecko_config = self.load_gecko_config()
         if 'tooltool_manifest' in gecko_config:
             # The manifest is relative to the gecko config
             config_dir = os.path.join(dirs['gecko_src'], 'b2g', 'config',
                                       self.config.get('b2g_config_dir', self.config['target']))
             manifest = os.path.abspath(os.path.join(config_dir, gecko_config['tooltool_manifest']))
-            self.tooltool_fetch(manifest=manifest, output_dir=dirs['work_dir'])
+            self.tooltool_fetch(manifest=manifest, output_dir=dirs['gecko_src'])
 
     def unpack_blobs(self):
         dirs = self.query_abs_dirs()
         tar = self.query_exe('tar', return_type="list")
         gecko_config = self.load_gecko_config()
         extra_tarballs = self.config.get('additional_source_tarballs', [])
         if 'additional_source_tarballs' in gecko_config:
             extra_tarballs.extend(gecko_config['additional_source_tarballs'])
 
         for tarball in extra_tarballs:
-            self.run_command(tar + ["xf", tarball], cwd=dirs['work_dir'],
+            self.run_command(tar + ["xf", tarball], cwd=dirs['gecko_src'],
                              halt_on_failure=True, fatal_exit_code=3)
 
     def checkout_gaia_l10n(self):
         if not self.config.get('gaia_languages_file'):
             self.info('Skipping checkout_gaia_l10n because no gaia language file was specified.')
             return
 
         l10n_config = self.load_gecko_config().get('gaia', {}).get('l10n')