Backed out changeset 3cc789ec2bf0 (bug 1204800)

--HG-- extra : commitid : DGLBcIgjfBC
2024-11-24 21:31:04 +00:00 · 2015-10-27 21:02:32 -07:00 · 2015-10-27 21:02:32 -07:00 · 706c4b1fa2
commit 706c4b1fa2
parent d17a7f412b
37 changed files with 12 additions and 170 deletions
--- a/b2g/config/aries-dogfood/releng-aries-dogfood.tt
+++ b/b2g/config/aries-dogfood/releng-aries-dogfood.tt
@ -1,16 +0,0 @@
-[
-{
-"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
@ -1,16 +0,0 @@
-[
-{
-"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": [],
+    "additional_source_tarballs": ["backup-aries.tar.xz"],
    "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"
-},
-{
-"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
@ -1,16 +0,0 @@
-[
-{
-"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
@ -5,12 +5,5 @@
 "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-ota/releng-flame-kk-ota.tt
+++ b/b2g/config/flame-kk-ota/releng-flame-kk-ota.tt
@ -1,16 +0,0 @@
-[
-{
-"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/releng-flame-kk.tt
+++ b/b2g/config/flame-kk/releng-flame-kk.tt
@ -12,12 +12,5 @@
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
 "unpack": "True"
-},
-{
-"size": 12057960,
-"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"unpack": true
 }
 ]
--- a/b2g/config/flame/releng-flame.tt
+++ b/b2g/config/flame/releng-flame.tt
@ -10,12 +10,5 @@
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
 "unpack": "True"
-},
-{
-"size": 12057960,
-"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"unpack": true
 }
 ]
--- a/b2g/config/nexus-4-kk/releng-mako.tt
+++ b/b2g/config/nexus-4-kk/releng-mako.tt
@ -23,13 +23,6 @@
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
 "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
@ -23,13 +23,6 @@
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
 "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
@ -4,12 +4,4 @@
 "algorithm": "sha512",
 "filename": "gcc.tar.xz",
 "unpack": "True"
-},
-{
-"size": 12057960,
-"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"unpack": true
-}
-]
+}]
--- a/testing/docker/phone-builder/bin/pre-build.sh
+++ b/testing/docker/phone-builder/bin/pre-build.sh
@ -29,9 +29,6 @@ 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,7 +22,6 @@ task:
      GAIA_OPTIMIZE: '1'
      B2G_SYSTEM_APPS: '1'
      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
-      TOOLTOOL_MANIFEST: 'b2g/config/aries/releng-aries.tt'
    command:
      - phone
  extra:
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
@ -18,7 +18,6 @@ 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,7 +17,6 @@ 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,7 +22,6 @@ task:
      GAIA_OPTIMIZE: '1'
      B2G_SYSTEM_APPS: '1'
      MOZHARNESS_CONFIG: b2g/taskcluster-spark.py
-      TOOLTOOL_MANIFEST: 'b2g/config/aries/releng-aries.tt'
    command:
      - phone
  extra:
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml
@ -16,5 +16,4 @@ 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,4 +18,3 @@ 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,4 +20,3 @@ 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
@ -8,7 +8,6 @@ task:
  scopes:
    - 'docker-worker:cache:build-flame-kk-debug'
    - 'docker-worker:cache:build-flame-kk-debug-objdir-gecko-{{project}}'
-    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
  metadata:
    name: '[TC] B2G Flame KK Debug'

@ -20,7 +19,6 @@ task:
      TARGET: 'flame-kk'
      DEBUG: 0
      VARIANT: userdebug
-      TOOLTOOL_MANIFEST: 'b2g/config/flame-kk/releng-flame-kk.tt'
    command:
      - phone
  extra:
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
@ -7,7 +7,6 @@ task:
  scopes:
    - 'docker-worker:cache:build-flame-kk-eng'
    - 'docker-worker:cache:build-flame-kk-eng-objdir-gecko-{{project}}'
-    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
  metadata:
    name: '[TC] B2G Flame KK Eng'

@ -17,7 +16,6 @@ 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
@ -8,7 +8,6 @@ task:
  scopes:
    - 'docker-worker:cache:build-flame-kk-opt'
    - 'docker-worker:cache:build-flame-kk-opt-objdir-gecko-{{project}}'
-    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
  metadata:
    name: '[TC] B2G Flame KK Opt'

@ -19,7 +18,6 @@ task:
    env:
      TARGET: 'flame-kk'
      DEBUG: 0
-      TOOLTOOL_MANIFEST: 'b2g/config/flame-kk/releng-flame-kk.tt'
    command:
      - phone
  extra:
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_debug.yml
@ -17,4 +17,3 @@ 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,4 +16,3 @@ 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
@ -16,8 +16,6 @@ task:
      build-flame-kk-spark-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
    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
@ -7,7 +7,6 @@ task:
  workerType: flame-kk
  scopes:
    - 'docker-worker:cache:build-nexus-4-eng'
-    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
  metadata:
    name: '[TC] B2G Nexus 4 Eng'
  payload:
@ -16,12 +15,6 @@ task:
    env:
      TARGET: 'nexus-4'
      DEBUG: 0
-      TOOLTOOL_MANIFEST: 'b2g/config/nexus-4/releng-mako.tt'
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone.sh $HOME/workspace
  extra:
    treeherderEnv:
      - production
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_eng.yml
@ -8,7 +8,6 @@ task:
  scopes:
    - 'docker-worker:cache:build-nexus-4-kk-eng'
    - 'docker-worker:cache:build-nexus-4-kk-eng-objdir-gecko-{{project}}'
-    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
  metadata:
    name: '[TC] B2G Nexus 4 KK Eng'
  payload:
@ -18,12 +17,6 @@ task:
    env:
      TARGET: 'nexus-4-kk'
      DEBUG: 0
-      TOOLTOOL_MANIFEST: 'b2g/config/nexus-4-kk/releng-mako.tt'
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone.sh $HOME/workspace
  extra:
    treeherderEnv:
      - production
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_user.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_user.yml
@ -8,7 +8,6 @@ task:
  scopes:
    - 'docker-worker:cache:build-nexus-4-kk-user'
    - 'docker-worker:cache:build-nexus-4-kk-user-objdir-gecko-{{project}}'
-    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
  metadata:
    name: '[TC] B2G Nexus 4 KK User'
  payload:
@ -18,7 +17,6 @@ task:
    env:
      TARGET: 'nexus-4-kk'
      DEBUG: 0
-      TOOLTOOL_MANIFEST: 'b2g/config/nexus-4-kk/releng-mako.tt'
    command:
      - phone
  extra:
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_user.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_4_user.yml
@ -7,7 +7,6 @@ task:
  workerType: flame-kk
  scopes:
    - 'docker-worker:cache:build-nexus-4-user'
-    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
  metadata:
    name: '[TC] B2G Nexus 4 User'

@ -17,7 +16,6 @@ task:
    env:
      TARGET: 'nexus-4'
      DEBUG: 0
-      TOOLTOOL_MANIFEST: 'b2g/config/nexus-4/releng-mako.tt'
    command:
      - phone
  extra:
--- a/testing/taskcluster/tasks/builds/b2g_nexus_5l_eng.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_5l_eng.yml
@ -15,12 +15,6 @@ task:
    env:
      TARGET: 'nexus-5-l'
      DEBUG: 0
-      TOOLTOOL_MANIFEST: 'b2g/config/nexus-5-l/releng-nexus5.tt'
-    command:
-      - >
-        checkout-gecko workspace &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
-        buildbot_step 'Build' ./build-phone.sh $HOME/workspace
  extra:
    treeherderEnv:
      - production
--- a/testing/taskcluster/tasks/builds/b2g_nexus_5l_user.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_5l_user.yml
@ -16,7 +16,6 @@ task:
    env:
      TARGET: 'nexus-5-l'
      DEBUG: 0
-      TOOLTOOL_MANIFEST: 'b2g/config/nexus-5-l/releng-nexus5.tt'
    command:
      - phone
  extra:
--- a/testing/taskcluster/tasks/builds/b2g_phone_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_phone_base.yml
@ -1,14 +1,10 @@
 $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,8 +54,6 @@ 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'