Bug 1204800 - Add tooltool dependencies to phone builds. r=wcosta

2015-09-30 05:02:00 +02:00 · 2015-09-30 05:02:00 +02:00 · e8f4cf7032
--- a/b2g/config/aries-dogfood/releng-aries-dogfood.tt
+++ b/b2g/config/aries-dogfood/releng-aries-dogfood.tt
@ -0,0 +1,16 @@
+[
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512",
+"filename": "gcc.tar.xz",
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
+}
+]
--- a/b2g/config/aries-spark-ota/releng-aries-spark-ota.tt
+++ b/b2g/config/aries-spark-ota/releng-aries-spark-ota.tt
@ -0,0 +1,16 @@
+[
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512",
+"filename": "gcc.tar.xz",
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
+}
+]
--- a/b2g/config/aries/config.json
+++ b/b2g/config/aries/config.json
@ -39,7 +39,7 @@
    },
    "b2g_manifest": "aries.xml",
    "b2g_manifest_intree": true,
-    "additional_source_tarballs": ["backup-aries.tar.xz"],
+    "additional_source_tarballs": [],
    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
    "gaia": {
        "l10n": {
--- a/b2g/config/aries/releng-aries.tt
+++ b/b2g/config/aries/releng-aries.tt
@ -1,16 +1,16 @@
 [
 {
-"size": 135359412,
-"digest": "45e677c9606cc4eec44ef4761df47ff431df1ffad17a5c6d21ce700a1c47f79e87a4aa9f30ae47ff060bd64f5b775d995780d88211f9a759ffa0d076beb4816b",
-"algorithm": "sha512",
-"filename": "backup-aries.tar.xz",
-"comment": "v18D"
-},
-{
 "size": 80458572,
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
-"unpack": "True"
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
 }
 ]
--- a/b2g/config/dolphin-512/releng-dolphin-512.tt
+++ b/b2g/config/dolphin-512/releng-dolphin-512.tt
@ -0,0 +1,16 @@
+[
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512",
+"filename": "gcc.tar.xz",
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
+}
+]
--- a/b2g/config/dolphin/releng-dolphin.tt
+++ b/b2g/config/dolphin/releng-dolphin.tt
@ -4,6 +4,13 @@
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
-"unpack": "True"
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
 }
 ]
--- a/b2g/config/flame-kk-ota/releng-flame-kk-ota.tt
+++ b/b2g/config/flame-kk-ota/releng-flame-kk-ota.tt
@ -0,0 +1,16 @@
+[
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512",
+"filename": "gcc.tar.xz",
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
+}
+]
--- a/b2g/config/flame-kk/config.json
+++ b/b2g/config/flame-kk/config.json
@ -41,7 +41,7 @@
    },
    "b2g_manifest": "flame-kk.xml",
    "b2g_manifest_intree": true,
-    "additional_source_tarballs": ["backup-flame.tar.xz"],
+    "additional_source_tarballs": [],
    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
    "gaia": {
        "l10n": {
--- a/b2g/config/flame-kk/releng-flame-kk.tt
+++ b/b2g/config/flame-kk/releng-flame-kk.tt
@ -1,16 +1,16 @@
 [
 {
-"size": 135359412,
-"digest": "45e677c9606cc4eec44ef4761df47ff431df1ffad17a5c6d21ce700a1c47f79e87a4aa9f30ae47ff060bd64f5b775d995780d88211f9a759ffa0d076beb4816b",
-"algorithm": "sha512",
-"filename": "backup-flame.tar.xz",
-"comment": "v18D"
-},
-{
 "size": 80458572,
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
-"unpack": "True"
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
 }
 ]
--- a/b2g/config/flame/config.json
+++ b/b2g/config/flame/config.json
@ -40,7 +40,7 @@
    },
    "b2g_manifest": "flame.xml",
    "b2g_manifest_intree": true,
-    "additional_source_tarballs": ["backup-flame.tar.xz"],
+    "additional_source_tarballs": [],
    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
    "gaia": {
        "l10n": {
--- a/b2g/config/flame/releng-flame.tt
+++ b/b2g/config/flame/releng-flame.tt
@ -1,14 +1,16 @@
 [
-{"size": 149922032,
-"digest": "8d1a71552ffee561e93b5b3f1bb47866592ab958f908007c75561156430eb1b85a265bfc4dc2038e58dda0264daa9854877a84ef3b591c9ac2f1ab97c098e61e",
-"filename": "backup-flame.tar.xz",
-"algorithm": "sha512"
-},
 {
 "size": 80458572,
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
-"unpack": "True"
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
 }
 ]
--- a/b2g/config/nexus-4/releng-mako.tt
+++ b/b2g/config/nexus-4/releng-mako.tt
@ -1,28 +1,17 @@
 [
 {
-"size": 13111,
-"digest": "09373556ddb4325897b9e008184228f9088b4c8c22bacf4fa2d39793ecfd264316ad69c2bc8082229ad7fdb80f89154c7b995a60f9b18beb1847e7111e7e69b2",
-"algorithm": "sha512",
-"filename": "broadcom-mako-jwr66v-cbde0d61.tgz"
-},
-{
-"size": 12658359,
-"digest": "2483df1a949df53d02ca33a87731cedd8f7cd07114d723bde1addf63fd71154c23b6f11f64f390b9849121725fb53a402db8df2f96a3673ec52416f45260f79d",
-"algorithm": "sha512",
-"filename": "qcom-mako-jwr66v-30ef957c.tgz"
-},
-{
-"size": 378532,
-"digest": "27aced8feb0e757d61df37839e62410ff30a059cfa8f04897d29ab74b787c765313acf904b1f9cf311c3e682883514df7da54197665251ef9b8bdad6bd0f62c5",
-"algorithm": "sha512",
-"filename": "lge-mako-jwr66v-985845e4.tgz"
-},
-{
 "size": 80458572,
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
-"unpack": "True"
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
 }
 ]

--- a/b2g/config/nexus-5-l/releng-nexus5.tt
+++ b/b2g/config/nexus-5-l/releng-nexus5.tt
@ -3,5 +3,13 @@
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
-"unpack": "True"
-}]
+"unpack": true
+},
+{
+"size": 12057960,
+"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
+"algorithm": "sha512",
+"filename": "gtk3.tar.xz",
+"unpack": true
+}
+]
--- a/testing/taskcluster/scripts/phone-builder/pre-build.sh
+++ b/testing/taskcluster/scripts/phone-builder/pre-build.sh
@ -26,6 +26,9 @@ tc-vcs repo-checkout $WORKSPACE/B2G https://git.mozilla.org/b2g/B2G.git $MANIFES
 rm -f $WORKSPACE/B2G/gecko
 ln -s $WORKSPACE/gecko $WORKSPACE/B2G/gecko

+### Install package dependencies
+. ../builder/install-packages.sh $WORKSPACE/gecko
+
 debug_flag=""
 if [ 0$B2G_DEBUG -ne 0 ]; then
  debug_flag='--debug'
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml
@ -22,6 +22,7 @@ task:
      GAIA_OPTIMIZE: '1'
      B2G_SYSTEM_APPS: '1'
      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
+      TOOLTOOL_MANIFEST: 'b2g/config/aries/releng-aries.tt'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
@ -18,6 +18,7 @@ task:
      DOGFOOD: 1
      HARDWARE_COMPOSER: 0
      MOZHARNESS_CONFIG: b2g/taskcluster-spark-dogfood.py
+      TOOLTOOL_MANIFEST: 'b2g/config/aries-dogfood/releng-aries-dogfood.tt'
  extra:
    treeherderEnv:
      - production
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml
@ -17,6 +17,7 @@ task:
    env:
      TARGET: 'aries'
      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
+      TOOLTOOL_MANIFEST: 'b2g/config/aries/releng-aries.tt'
  extra:
    treeherderEnv:
      - production
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml
@ -22,6 +22,7 @@ task:
      GAIA_OPTIMIZE: '1'
      B2G_SYSTEM_APPS: '1'
      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
+      TOOLTOOL_MANIFEST: 'b2g/config/aries/releng-aries.tt'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml
@ -16,4 +16,5 @@ task:
    env:
      VARIANT: userdebug
      B2G_DEBUG: 0
+      TOOLTOOL_MANIFEST: 'b2g/config/aries-spark-ota/releng-aries-spark-ota.tt'

--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml
@ -15,4 +15,4 @@ task:
      build-aries-spark-ota-user-objdir-gecko-{{project}}: /home/worker/objdir-gecko
    env:
      VARIANT: user
-
+      TOOLTOOL_MANIFEST: 'b2g/config/aries-spark-ota/releng-aries-spark-ota.tt'
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_dolphin_512_eng.yml
@ -20,4 +20,4 @@ task:
    env:
      TARGET: 'dolphin-512'
      VARIANT: eng
-
+      TOOLTOOL_MANIFEST: 'b2g/config/dolphin-512/releng-dolphin-512.tt'
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_dolphin_512_opt.yml
@ -18,3 +18,4 @@ task:
      build-dolphin-512-opt: /home/worker/workspace
    env:
      TARGET: 'dolphin-512'
+      TOOLTOOL_MANIFEST: 'b2g/config/dolphin-512/releng-dolphin-512.tt'
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_dolphin_eng.yml
@ -20,3 +20,4 @@ task:
    env:
      TARGET: 'dolphin'
      VARIANT: eng
+      TOOLTOOL_MANIFEST: 'b2g/config/dolphin/releng-dolphin.tt'
--- a/testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_dolphin_opt.yml
@ -18,4 +18,4 @@ task:
      build-dolphin-opt: /home/worker/workspace
    env:
      TARGET: 'dolphin'
-
+      TOOLTOOL_MANIFEST: 'b2g/config/dolphin/releng-dolphin.tt'
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_debug.yml
@ -19,6 +19,7 @@ task:
      TARGET: 'flame-kk'
      DEBUG: 0
      VARIANT: userdebug
+      TOOLTOOL_MANIFEST: 'b2g/config/flame-kk/releng-flame-kk.tt'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
@ -16,6 +16,7 @@ task:
      build-flame-kk-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
    env:
      TARGET: 'flame-kk'
+      TOOLTOOL_MANIFEST: 'b2g/config/flame-kk/releng-flame-kk.tt'
  extra:
    treeherderEnv:
      - production
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml
@ -18,6 +18,7 @@ task:
    env:
      TARGET: 'flame-kk'
      DEBUG: 0
+      TOOLTOOL_MANIFEST: 'b2g/config/flame-kk/releng-flame-kk.tt'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml
@ -17,3 +17,4 @@ task:
    env:
      VARIANT: userdebug
      B2G_DEBUG: 0
+      TOOLTOOL_MANIFEST: 'b2g/config/flame-kk-ota/releng-flame-kk-ota.tt'
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_opt.yml
@ -16,3 +16,4 @@ task:
      build-flame-kk-ota-user-objdir-gecko-{{project}}: /home/worker/objdir-gecko
    env:
      VARIANT: user
+      TOOLTOOL_MANIFEST: 'b2g/config/flame-kk-ota/releng-flame-kk-ota.tt'
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_spark_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_spark_eng.yml
@ -17,6 +17,7 @@ task:
    env:
      TARGET: 'flame-kk'
      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
+      TOOLTOOL_MANIFEST: 'b2g/config/flame-kk/releng-flame-kk.tt'
  extra:
    treeherderEnv:
      - staging
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_4_eng.yml
@ -15,6 +15,7 @@ task:
    env:
      TARGET: 'nexus-4'
      DEBUG: 0
+      TOOLTOOL_MANIFEST: 'b2g/config/nexus-4/releng-mako.tt'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_user.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_4_user.yml
@ -16,6 +16,7 @@ task:
    env:
      TARGET: 'nexus-4'
      DEBUG: 0
+      TOOLTOOL_MANIFEST: 'b2g/config/nexus-4/releng-mako.tt'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_nexus_5l_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_5l_eng.yml
@ -15,6 +15,7 @@ task:
    env:
      TARGET: 'nexus-5-l'
      DEBUG: 0
+      TOOLTOOL_MANIFEST: 'b2g/config/nexus-5-l/releng-nexus5.tt'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_nexus_5l_user.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_5l_user.yml
@ -16,6 +16,7 @@ task:
    env:
      TARGET: 'nexus-5-l'
      DEBUG: 0
+      TOOLTOOL_MANIFEST: 'b2g/config/nexus-5-l/releng-nexus5.tt'
    command:
      - >
        checkout-gecko workspace &&
--- a/testing/taskcluster/tasks/builds/b2g_phone_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_phone_base.yml
@ -1,10 +1,14 @@
 $inherits:
  from: 'tasks/phone_build.yml'
 task:
+  scopes:
+    - 'docker-worker:cache:tooltool-cache'
  metadata:
    description: |
      Android phones + b2g environment used in full stack testing.
  payload:
+    cache:
+      tooltool-cache: '/home/worker/tooltool-cache'
    env:
      MOZILLA_OFFICIAL: '1'
      ENABLE_DEFAULT_BOOTANIMATION: 'true'
--- a/testing/taskcluster/tasks/phone_build.yml
+++ b/testing/taskcluster/tasks/phone_build.yml
@ -54,6 +54,8 @@ task:
      GECKO_HEAD_REPOSITORY: '{{head_repository}}'
      GECKO_HEAD_REV: '{{head_rev}}'
      GECKO_HEAD_REF: '{{head_ref}}'
+      TOOLTOOL_REPO: 'https://git.mozilla.org/build/tooltool.git'
+      TOOLTOOL_REV: 'master'

  extra:
    build_product: 'b2g'