Bug 1333554 - Taskcluster based android l10n repacks failing on aurora. r=aki a=NPOTDB for CLOSED TREE
authorJustin Wood <Callek@gmail.com>
Tue, 24 Jan 2017 16:00:46 -0500
changeset 375633 48f7caa80dfc6cafc778269b12e9e69379111c56
parent 375632 c5a33bbf8cb46bf40fc4d9f2b619189e7f377230
child 375634 0405ffe4f6c33ff8c4f7f9172e9c63293f376c82
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki, NPOTDB
bugs1333554
milestone53.0a2
Bug 1333554 - Taskcluster based android l10n repacks failing on aurora. r=aki a=NPOTDB for CLOSED TREE MozReview-Commit-ID: 232CLYZ8Yu
testing/mozharness/configs/single_locale/mozilla-aurora_android-api-15.py
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-15.py
@@ -1,8 +1,10 @@
+import os
+
 BRANCH = "mozilla-aurora"
 MOZ_UPDATE_CHANNEL = "aurora"
 MOZILLA_DIR = BRANCH
 OBJDIR = "obj-l10n"
 EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-15/en-US" % BRANCH
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
@@ -22,38 +24,40 @@ config = {
     "tooltool_config": {
         "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
         "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
     },
     "exes": {
         'tooltool.py': '/builds/tooltool.py',
     },
     "repos": [{
+        "vcs": "hg",
+        "repo": "https://hg.mozilla.org/build/tools",
+        "branch": "default",
+        "dest": "tools",
+    }, {
+        "vcs": "hg",
         "repo": "https://hg.mozilla.org/releases/mozilla-aurora",
-        "branch": "default",
+        "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/releases/l10n/%s" % BRANCH,
     "hg_l10n_tag": "default",
     'vcs_share_base': HG_SHARE_BASE_DIR,
 
     "l10n_dir": MOZILLA_DIR,
     "repack_env": {
         # 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,
     },
     "upload_branch": "%s-android-api-15" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "merge_locales": True,
     "mozilla_dir": MOZILLA_DIR,
     "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,