From b1276f6839e4ec25d7964cf14599df0567e0fae2 Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Fri, 23 Oct 2015 17:52:40 -0400 Subject: [PATCH] Bug 1178286 - switch release automation source builder to taskcluster. r=jlund DONTBUILD --- .../configs/builds/releng_sub_linux_configs/64_source.py | 4 ++++ testing/mozharness/mozharness/mozilla/building/buildbase.py | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py index f2f98b4ced6e..da46a5b43927 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py @@ -16,4 +16,8 @@ config = { 'TINDERBOX_OUTPUT': '1', 'LC_ALL': 'C', }, + 'tooltool_script': ["/builds/tooltool.py"], + 'tooltool_bootstrap': "setup.sh", + 'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/releng.manifest", + 'src_mozconfig': 'browser/config/mozconfigs/linux64/nightly', } diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index f979337621fe..a3bb45bb542e 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -1807,10 +1807,8 @@ or run without that action (ie: --no-{action})" self._ccache_s() def preflight_package_source(self): - # Make sure to have an empty .mozconfig. Removing it is not enough, - # because MOZ_OBJDIR is not used in this case - self._touch_file(os.path.join(self.query_abs_dirs()['abs_src_dir'], - '.mozconfig')) + self._get_mozconfig() + self._run_tooltool() def package_source(self): """generates source archives and uploads them"""