From b1ca43198ccbe40e2b2507593e39091f69443a2e Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Fri, 8 Jul 2016 13:01:00 -0400 Subject: [PATCH] Bug 1223385 - Make sure nothing in mozharness uses (or clones) compare-locales manually. r=jlund MozReview-Commit-ID: A4iEIq9weYl --HG-- extra : rebase_source : 2ad21a26d24d6e6c62abd964dd2cf001b484bd1b --- .../mozharness/mozilla/building/buildbase.py | 10 ---------- testing/mozharness/scripts/b2g_build.py | 17 ----------------- testing/mozharness/scripts/fx_desktop_build.py | 4 ---- 3 files changed, 31 deletions(-) diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 20d9dbee8abf..cb8cd13a91a4 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -1631,22 +1631,12 @@ or run without that action (ie: --no-{action})" self.fatal("'mach build' did not run successfully. Please check " "log for errors.") - def _checkout_compare_locales(self): - dirs = self.query_abs_dirs() - dest = dirs['compare_locales_dir'] - repo = self.config['compare_locales_repo'] - rev = self.config['compare_locales_rev'] - vcs = self.config['compare_locales_vcs'] - abs_rev = self.vcs_checkout(repo=repo, dest=dest, revision=rev, vcs=vcs) - self.set_buildbot_property('compare_locales_revision', abs_rev, write_to_file=True) - def multi_l10n(self): if not self.query_is_nightly(): self.info("Not a nightly build, skipping multi l10n.") return self._initialize_taskcluster() - self._checkout_compare_locales() dirs = self.query_abs_dirs() base_work_dir = dirs['base_work_dir'] objdir = dirs['abs_obj_dir'] diff --git a/testing/mozharness/scripts/b2g_build.py b/testing/mozharness/scripts/b2g_build.py index fcd3364d6f30..95923eb1d403 100755 --- a/testing/mozharness/scripts/b2g_build.py +++ b/testing/mozharness/scripts/b2g_build.py @@ -54,7 +54,6 @@ class B2GBuild(LocalesMixin, PurgeMixin, 'checkout-gaia', 'checkout-gaia-l10n', 'checkout-gecko-l10n', - 'checkout-compare-locales', # End deprecated 'get-blobs', 'update-source-manifest', @@ -139,9 +138,6 @@ class B2GBuild(LocalesMixin, PurgeMixin, 'mozilla_dir': 'build/gecko', 'objdir': 'build/objdir-gecko', 'merge_locales': True, - 'compare_locales_repo': 'https://hg.mozilla.org/build/compare-locales', - 'compare_locales_rev': 'RELEASE_AUTOMATION', - 'compare_locales_vcs': 'hg', 'repo_remote_mappings': {}, 'influx_credentials_file': 'oauth.txt', 'balrog_credentials_file': 'oauth.txt', @@ -193,7 +189,6 @@ class B2GBuild(LocalesMixin, PurgeMixin, dirs = { 'gaia_l10n_base_dir': os.path.join(abs_dirs['abs_work_dir'], 'gaia-l10n'), - 'compare_locales_dir': os.path.join(abs_dirs['abs_work_dir'], 'compare-locales'), 'abs_public_upload_dir': os.path.join(abs_dirs['abs_work_dir'], 'upload-public'), } @@ -377,7 +372,6 @@ class B2GBuild(LocalesMixin, PurgeMixin, super(B2GBuild, self).checkout_sources() self.checkout_gecko_l10n() self.checkout_gaia_l10n() - self.checkout_compare_locales() def get_blobs(self): self.download_blobs() @@ -432,15 +426,6 @@ class B2GBuild(LocalesMixin, PurgeMixin, os.path.join(dirs['abs_l10n_dir'], locale, 'b2g', 'chrome', 'overrides'), error_level=FATAL) - def checkout_compare_locales(self): - dirs = self.query_abs_dirs() - dest = dirs['compare_locales_dir'] - repo = self.config['compare_locales_repo'] - rev = self.config['compare_locales_rev'] - vcs = self.config['compare_locales_vcs'] - abs_rev = self.vcs_checkout(repo=repo, dest=dest, branch=rev, vcs=vcs) - self.set_buildbot_property('compare_locales_revision', abs_rev, write_to_file=True) - def query_do_translate_hg_to_git(self, gecko_config_key=None): manifest_config = self.config.get('manifest', {}) branch = self.query_branch() @@ -590,9 +575,7 @@ class B2GBuild(LocalesMixin, PurgeMixin, env['MOZ_CHROME_MULTILOCALE'] = " ".join(self.query_locales()) if 'PATH' not in env: env['PATH'] = os.environ.get('PATH') - env['PATH'] += ':%s' % os.path.join(dirs['compare_locales_dir'], 'scripts') 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={0}'.format(self.objdir)) diff --git a/testing/mozharness/scripts/fx_desktop_build.py b/testing/mozharness/scripts/fx_desktop_build.py index 78b8aa178a6d..6fa326b23ecc 100755 --- a/testing/mozharness/scripts/fx_desktop_build.py +++ b/testing/mozharness/scripts/fx_desktop_build.py @@ -72,9 +72,6 @@ class FxDesktopBuild(BuildScript, object): 'stage_product': 'firefox', 'platform_supports_post_upload_to_latest': True, 'latest_mar_dir': '/pub/mozilla.org/firefox/nightly/latest-%(branch)s', - 'compare_locales_repo': 'https://hg.mozilla.org/build/compare-locales', - 'compare_locales_rev': 'RELEASE_AUTOMATION', - 'compare_locales_vcs': 'hgtool', 'influx_credentials_file': 'oauth.txt', 'build_resources_path': '%(abs_src_dir)s/obj-firefox/.mozbuild/build_resources.json', 'nightly_promotion_branches': ['mozilla-central', 'mozilla-aurora'], @@ -154,7 +151,6 @@ class FxDesktopBuild(BuildScript, object): 'src', self._query_objdir()) }, - 'compare_locales_dir': os.path.join(abs_dirs['abs_work_dir'], 'compare-locales'), } abs_dirs.update(dirs) self.abs_dirs = abs_dirs