From e0f41ae6f1007085c6488a44a675d4bd1f13f638 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Sun, 4 Dec 2016 17:00:23 -1000 Subject: [PATCH] Bug 1322041 - Add changes necessary for tc-nightly to m-c files. r=jlund This patch takes the differences between the m-c config files and date, and applies them to m-c, in a way which shouldn't break Buildbot nightlies. MozReview-Commit-ID: Is5B3KxWNSo --HG-- extra : rebase_source : 4513e8bacd8b32f5039c6206027ce7a44a736bde extra : intermediate-source : eb425bda9f3f04734a3d2880bb52174ed344b418 extra : source : 1b4f4248cda6efda8150231d6a963c6b3d4249bc --- .../configs/single_locale/mozilla-central.py | 4 ++-- .../mozilla-central_android-api-15.py | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/testing/mozharness/configs/single_locale/mozilla-central.py b/testing/mozharness/configs/single_locale/mozilla-central.py index 4b16801a91b3..96f7f132fe9e 100644 --- a/testing/mozharness/configs/single_locale/mozilla-central.py +++ b/testing/mozharness/configs/single_locale/mozilla-central.py @@ -1,9 +1,9 @@ config = { "nightly_build": True, "branch": "mozilla-central", - "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/", + "en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central", "update_channel": "nightly", - "latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n', + "latest_mar_dir": '/pub/firefox/nightly/latest-mozilla-central-l10n', # l10n "hg_l10n_base": "https://hg.mozilla.org/l10n-central", diff --git a/testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py b/testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py index d2b6623c3305..7f9d17d37976 100644 --- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py +++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py @@ -1,3 +1,5 @@ +import os + BRANCH = "mozilla-central" MOZ_UPDATE_CHANNEL = "nightly" MOZILLA_DIR = BRANCH @@ -27,17 +29,19 @@ config = { 'tooltool.py': '/builds/tooltool.py', }, "repos": [{ - "repo": "https://hg.mozilla.org/mozilla-central", + "vcs": "hg", + "repo": "https://hg.mozilla.org/build/tools", "branch": "default", + "dest": "tools", + }, { + "vcs": "hg", + "repo": "https://hg.mozilla.org/mozilla-central", + "revision": "%(revision)s", "dest": MOZILLA_DIR, }, { "repo": "https://hg.mozilla.org/build/buildbot-configs", "branch": "default", "dest": "buildbot-configs" - }, { - "repo": "https://hg.mozilla.org/build/tools", - "branch": "default", - "dest": "tools" }], "hg_l10n_base": "https://hg.mozilla.org/l10n-central", "hg_l10n_tag": "default", @@ -48,7 +52,7 @@ config = { # so ugly, bug 951238 "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64", "MOZ_OBJDIR": OBJDIR, - "EN_US_BINARY_URL": EN_US_BINARY_URL, + "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL), "LOCALE_MERGEDIR": "%(abs_merge_dir)s/", "MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL, },