Backed out 1 changesets (bug 1201179) for bustage on a CLOSED TREE

Backed out changeset aa3cbda42b11 (bug 1201179)
dothq · Sep 10, 2015 · 1f920ab · 1f920ab
1 parent a039da5
commit 1f920ab
Show file tree

Hide file tree

Showing 29 changed files with 15 additions and 79 deletions.
diff --git a/testing/mozharness/scripts/b2g_build.py b/testing/mozharness/scripts/b2g_build.py
@@ -114,10 +114,6 @@ class B2GBuild(LocalesMixin, PurgeMixin,
             "dest": "platform",
             "help": "the platform used by balrog submmiter.",
         }],
-        [["--gecko-objdir"], {
-            "dest": "gecko_objdir",
-            "help": "Specifies the gecko object directory.",
-        }],
     ]
 
     def __init__(self, require_config_file=False, config={},
@@ -161,8 +157,7 @@ def __init__(self, require_config_file=False, config={},
         )
 
         dirs = self.query_abs_dirs()
-        self.objdir = self.config.get("gecko_objdir",
-                os.path.join(dirs['work_dir'], 'objdir-gecko'))
+        self.objdir = os.path.join(dirs['work_dir'], 'objdir-gecko')
         self.abs_dirs['abs_obj_dir'] = self.objdir
         if self.config.get("update_type", "ota") == "fota":
             self.make_updates_cmd = ['./build.sh', 'gecko-update-fota']
@@ -562,9 +557,6 @@ def build(self):
             env['PYTHONPATH'] = os.environ.get('PYTHONPATH', '')
             env['PYTHONPATH'] += ':%s' % os.path.join(dirs['compare_locales_dir'], 'lib')
 
-        with open(os.path.join(dirs['work_dir'], '.userconfig'), 'w') as cfg:
-            cfg.write('GECKO_OBJDIR={}'.format(self.objdir))
-
         self.enable_mock()
         if self.config['ccache']:
             self.run_command('ccache -z', cwd=dirs['work_dir'], env=env)

diff --git a/testing/taskcluster/scripts/builder/build-emulator-x86.sh b/testing/taskcluster/scripts/builder/build-emulator-x86.sh
@@ -35,8 +35,6 @@ fi
 
 rm -rf $WORKSPACE/B2G/out/target/product/generic_x86/tests/
 
-gecko_objdir=/home/worker/objdir-gecko/objdir
-
 $WORKSPACE/gecko/testing/mozharness/scripts/b2g_build.py \
   --config b2g/taskcluster-emulator.py \
   "$debug_flag" \
@@ -46,22 +44,21 @@ $WORKSPACE/gecko/testing/mozharness/scripts/b2g_build.py \
   --target=$TARGET \
   --b2g-config-dir=$TARGET \
   --checkout-revision=$GECKO_HEAD_REV \
-  --repo=$WORKSPACE/gecko \
-  --gecko-objdir=$gecko_objdir
+  --repo=$WORKSPACE/gecko
 
 # Move files into artifact locations!
 mkdir -p $HOME/artifacts
 
 ls -lah $WORKSPACE/B2G/out
-ls -lah $gecko_objdir/dist/
+ls -lah $WORKSPACE/B2G/objdir-gecko/dist/
 
 mv $WORKSPACE/B2G/sources.xml $HOME/artifacts/sources.xml
 mv $WORKSPACE/B2G/out/target/product/generic_x86/tests/gaia-tests.zip $HOME/artifacts/gaia-tests.zip
 for name in common cppunittest reftest mochitest xpcshell web-platform; do
-    mv $gecko_objdir/dist/*.$name.tests.zip $HOME/artifacts/target.$name.tests.zip ;
+    mv $WORKSPACE/B2G/objdir-gecko/dist/*.$name.tests.zip $HOME/artifacts/target.$name.tests.zip ;
 done
-mv $gecko_objdir/dist/test_packages_tc.json $HOME/artifacts/test_packages.json
+mv $WORKSPACE/B2G/objdir-gecko/dist/test_packages_tc.json $HOME/artifacts/test_packages.json
 mv $WORKSPACE/B2G/out/emulator.tar.gz $HOME/artifacts/emulator.tar.gz
-mv $gecko_objdir/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
+mv $WORKSPACE/B2G/objdir-gecko/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 
 ccache -s
diff --git a/testing/taskcluster/scripts/builder/build-emulator.sh b/testing/taskcluster/scripts/builder/build-emulator.sh
@@ -37,8 +37,6 @@ fi
 
 rm -rf $WORKSPACE/B2G/out/target/product/generic/tests/
 
-gecko_objdir=/home/worker/objdir-gecko/objdir
-
 $WORKSPACE/gecko/testing/mozharness/scripts/b2g_build.py \
   --config b2g/taskcluster-emulator.py \
   "$debug_flag" \
@@ -48,22 +46,21 @@ $WORKSPACE/gecko/testing/mozharness/scripts/b2g_build.py \
   --target=$TARGET \
   --b2g-config-dir=$TARGET \
   --checkout-revision=$GECKO_HEAD_REV \
-  --repo=$WORKSPACE/gecko \
-  --gecko-objdir=$gecko_objdir
+  --repo=$WORKSPACE/gecko
 
 # Move files into artifact locations!
 mkdir -p $HOME/artifacts
 
 ls -lah $WORKSPACE/B2G/out
-ls -lah $gecko_objdir/dist/
+ls -lah $WORKSPACE/B2G/objdir-gecko/dist/
 
 mv $WORKSPACE/B2G/sources.xml $HOME/artifacts/sources.xml
 mv $WORKSPACE/B2G/out/target/product/generic/tests/gaia-tests.zip $HOME/artifacts/gaia-tests.zip
 for name in common cppunittest reftest mochitest xpcshell web-platform; do
-    mv $gecko_objdir/dist/*.$name.tests.zip  $HOME/artifacts/target.$name.tests.zip ;
+    mv $WORKSPACE/B2G/objdir-gecko/dist/*.$name.tests.zip  $HOME/artifacts/target.$name.tests.zip ;
 done
-mv $gecko_objdir/dist/test_packages_tc.json $HOME/artifacts/test_packages.json
+mv $WORKSPACE/B2G/objdir-gecko/dist/test_packages_tc.json $HOME/artifacts/test_packages.json
 mv $WORKSPACE/B2G/out/emulator.tar.gz $HOME/artifacts/emulator.tar.gz
-mv $gecko_objdir/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
+mv $WORKSPACE/B2G/objdir-gecko/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 
 ccache -s
diff --git a/testing/taskcluster/scripts/phone-builder/build-phone-ota.sh b/testing/taskcluster/scripts/phone-builder/build-phone-ota.sh
@@ -4,7 +4,7 @@
 
 if [ $TARGET == "aries" -o $TARGET == "shinano" ]; then
   # caching objects might be dangerous for some devices (aka aries)
-  rm -rf $gecko_objdir
+  rm -rf $WORKSPACE/B2G/objdir*
   rm -rf $WORKSPACE/B2G/out
 fi
 
@@ -40,7 +40,6 @@ $WORKSPACE/gecko/testing/mozharness/scripts/b2g_build.py \
   --checkout-revision=$GECKO_HEAD_REV \
   --repo=$WORKSPACE/gecko \
   --platform $PLATFORM \
-  --gecko-objdir=$gecko_objdir \
   --complete-mar-url https://queue.taskcluster.net/v1/task/$TASK_ID/runs/$RUN_ID/artifacts/public/build/$mar_file
 
 . post-build.sh
diff --git a/testing/taskcluster/scripts/phone-builder/build-phone.sh b/testing/taskcluster/scripts/phone-builder/build-phone.sh
@@ -4,7 +4,7 @@
 
 if [ $TARGET == "aries" -o $TARGET == "shinano" ]; then
   # caching objects might be dangerous for some devices (aka aries)
-  rm -rf $gecko_objdir
+  rm -rf $WORKSPACE/B2G/objdir*
   rm -rf $WORKSPACE/B2G/out
 fi
 
@@ -23,7 +23,6 @@ $WORKSPACE/gecko/testing/mozharness/scripts/b2g_build.py \
   --target=$TARGET \
   --b2g-config-dir=$TARGET \
   --checkout-revision=$GECKO_HEAD_REV \
-  --repo=$WORKSPACE/gecko \
-  --gecko-objdir=$gecko_objdir
+  --repo=$WORKSPACE/gecko
 
 . post-build.sh
diff --git a/testing/taskcluster/scripts/phone-builder/pre-build.sh b/testing/taskcluster/scripts/phone-builder/pre-build.sh
@@ -6,8 +6,6 @@ PATH=$DIRNAME:$PATH
 
 WORKSPACE=$1
 
-gecko_objdir=/home/worker/objdir-gecko/objdir
-
 ### Check that require variables are defined
 test -d $WORKSPACE
 test $GECKO_HEAD_REPOSITORY # Should be an hg repository url to pull from

diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_debug.yml
@@ -7,14 +7,12 @@ task:
   workerType: flame-kk
   scopes:
     - 'docker-worker:cache:build-aries-debug'
-    - 'docker-worker:cache:build-aries-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Aries Debug'
 
   payload:
     cache:
       build-aries-debug: /home/worker/workspace
-      build-aries-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'aries'
       DEBUG: 0

diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_dogfood.yml
@@ -8,11 +8,9 @@ task:
     name: '[TC] B2G Aries Dogfood'
   scopes:
     - 'docker-worker:cache:build-aries-spark-dogfood'
-    - '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

diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_eng.yml
@@ -6,14 +6,12 @@ $inherits:
 task:
   scopes:
     - 'docker-worker:cache:build-aries-eng'
-    - 'docker-worker:cache:build-aries-eng-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Aries Eng'
 
   payload:
     cache:
       build-aries-eng: /home/worker/workspace
-      build-aries-eng-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'aries'
       MOZHARNESS_CONFIG: b2g/taskcluster-spark.py

diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_opt.yml
@@ -7,14 +7,12 @@ task:
   workerType: flame-kk
   scopes:
     - 'docker-worker:cache:build-aries-opt'
-    - 'docker-worker:cache:build-aries-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Aries Opt'
 
   payload:
     cache:
       build-aries-opt: /home/worker/workspace
-      build-aries-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'aries'
       DEBUG: 0

diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_debug.yml
@@ -8,11 +8,9 @@ task:
     name: '[TC] B2G Aries OTA (userdebug)'
   scopes:
     - 'docker-worker:cache:build-aries-spark-ota-debug'
-    - 'docker-worker:cache:build-aries-spark-ota-debug-objdir-gecko-{{project}}'
   payload:
     cache:
       build-aries-spark-ota-debug: /home/worker/workspace
-      build-aries-spark-ota-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: userdebug
       B2G_DEBUG: 0

diff --git a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_opt.yml
@@ -8,11 +8,9 @@ task:
     name: '[TC] B2G Aries OTA (user)'
   scopes:
     - 'docker-worker:cache:build-aries-spark-ota-user'
-    - 'docker-worker:cache:build-aries-spark-ota-user-objdir-gecko-{{project}}'
   payload:
     cache:
       build-aries-spark-ota-user: /home/worker/workspace
-      build-aries-spark-ota-user-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       VARIANT: user
 
diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
@@ -7,7 +7,6 @@ task:
   workerType: emulator-ics-debug
   scopes:
     - 'docker-worker:cache:workspace-emulator-ics-debug'
-    - 'docker-worker:cache:workspace-emulator-ics-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator ICS Debug'
   extra:
@@ -21,7 +20,6 @@ task:
   payload:
     cache:
       workspace-emulator-ics-debug: /home/worker/workspace
-      workspace-emulator-ics-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator'
       B2G_DEBUG: 1

diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
@@ -10,7 +10,6 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.emulator-ics'
   scopes:
     - 'docker-worker:cache:workspace-emulator-ics-opt'
-    - 'docker-worker:cache:workspace-emulator-ics-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator ICS Opt'
 
@@ -22,7 +21,6 @@ task:
   payload:
     cache:
       workspace-emulator-ics-opt: /home/worker/workspace
-      workspace-emulator-ics-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
 
     env:
       TARGET: 'emulator'

diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
@@ -7,7 +7,6 @@ task:
   workerType: emulator-jb-debug
   scopes:
     - 'docker-worker:cache:workspace-emulator-jb-debug'
-    - 'docker-worker:cache:workspace-emulator-jb-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator JB (Debug)'
 
@@ -26,7 +25,6 @@ task:
   payload:
     cache:
       workspace-emulator-jb-debug: /home/worker/workspace
-      workspace-emulator-jb-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-jb'
       B2G_DEBUG: 1

diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
@@ -7,7 +7,6 @@ task:
   workerType: emulator-jb
   scopes:
     - 'docker-worker:cache:workspace-emulator-jb-opt'
-    - 'docker-worker:cache:workspace-emulator-jb-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G JB Emulator: (Opt)'
 
@@ -24,7 +23,6 @@ task:
   payload:
     cache:
       workspace-emulator-jb-opt: /home/worker/workspace
-      workspace-emulator-jb-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-jb'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-jb/releng-emulator-jb.tt'
diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml
@@ -7,7 +7,6 @@ task:
   workerType: emulator-kk-debug
   scopes:
     - 'docker-worker:cache:workspace-emulator-kk-debug'
-    - 'docker-worker:cache:workspace-emulator-kk-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator KK (Debug)'
 
@@ -26,7 +25,6 @@ task:
   payload:
     cache:
       workspace-emulator-kk-debug: /home/worker/workspace
-      workspace-emulator-kk-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-kk'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.tt'

diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml
@@ -10,7 +10,6 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.emulator-kk'
   scopes:
     - 'docker-worker:cache:workspace-emulator-kk-opt'
-    - 'docker-worker:cache:workspace-emulator-kk-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G KK Emulator (Opt)'
 
@@ -27,7 +26,6 @@ task:
   payload:
     cache:
       workspace-emulator-kk-opt: /home/worker/workspace
-      workspace-emulator-kk-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-kk'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.tt'
diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml
@@ -7,7 +7,6 @@ task:
   workerType: emulator-l-debug
   scopes:
     - 'docker-worker:cache:workspace-emulator-l-debug'
-    - 'docker-worker:cache:workspace-emulator-l-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G Emulator L (Debug)'
 
@@ -26,7 +25,6 @@ task:
   payload:
     cache:
       workspace-emulator-l-debug: /home/worker/workspace
-      workspace-emulator-l-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-l'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.tt'

diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml
@@ -7,7 +7,6 @@ task:
   workerType: emulator-l
   scopes:
     - 'docker-worker:cache:workspace-emulator-l-opt'
-    - 'docker-worker:cache:workspace-emulator-l-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G L Emulator (Opt)'
 
@@ -24,7 +23,6 @@ task:
   payload:
     cache:
       workspace-emulator-l-opt: /home/worker/workspace
-      workspace-emulator-l-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-l'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.tt'
diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_debug.yml b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_debug.yml
@@ -7,7 +7,6 @@ task:
   workerType: emulator-x86-kk
   scopes:
     - 'docker-worker:cache:workspace-emulator-kk-x86-debug'
-    - 'docker-worker:cache:workspace-emulator-kk-x86-debug-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G KK X86 Emulator (Debug)'
 
@@ -26,7 +25,6 @@ task:
   payload:
     cache:
       workspace-emulator-kk-x86-debug: /home/worker/workspace
-      workspace-emulator-kk-x86-debug-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-x86-kk'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.tt'

diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml
@@ -7,7 +7,6 @@ task:
   workerType: emulator-x86-kk
   scopes:
     - 'docker-worker:cache:workspace-emulator-kk-x86-opt'
-    - 'docker-worker:cache:workspace-emulator-kk-x86-opt-objdir-gecko-{{project}}'
   metadata:
     name: '[TC] B2G KK X86 Emulator (Opt)'
 
@@ -24,7 +23,6 @@ task:
   payload:
     cache:
       workspace-emulator-kk-x86-opt: /home/worker/workspace
-      workspace-emulator-kk-x86-opt-objdir-gecko-{{project}}: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-x86-kk'
       TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.tt'