bug 753629 - fix uploads for release Android single locale repacks wi…

…th build > 1. r=nthomas
mozilla · May 10, 2012 · 35a9aa7 · 35a9aa7
1 parent 177ff44
commit 35a9aa7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/configs/single_locale/release_mozilla-aurora_android.py b/configs/single_locale/release_mozilla-aurora_android.py
@@ -59,7 +59,7 @@
         "UPLOAD_TO_TEMP": "1",
         "MOZ_PKG_VERSION": "%(version)s",
     },
-    "base_post_upload_cmd": "post_upload.py -p mobile -n 1 -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
+    "base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
     "merge_locales": True,
     "make_dirs": ['config'],
     "mozilla_dir": MOZILLA_DIR,

diff --git a/configs/single_locale/release_mozilla-beta_android.py b/configs/single_locale/release_mozilla-beta_android.py
@@ -59,7 +59,7 @@
         "UPLOAD_TO_TEMP": "1",
         "MOZ_PKG_VERSION": "%(version)s",
     },
-    "base_post_upload_cmd": "post_upload.py -p mobile -n 1 -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
+    "base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
     "merge_locales": True,
     "make_dirs": ['config'],
     "mozilla_dir": MOZILLA_DIR,

diff --git a/configs/single_locale/release_mozilla-release_android.py b/configs/single_locale/release_mozilla-release_android.py
@@ -59,7 +59,7 @@
         "UPLOAD_TO_TEMP": "1",
         "MOZ_PKG_VERSION": "%(version)s",
     },
-    "base_post_upload_cmd": "post_upload.py -p mobile -n 1 -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
+    "base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
     "merge_locales": True,
     "make_dirs": ['config'],
     "mozilla_dir": MOZILLA_DIR,

diff --git a/configs/single_locale/staging_release_mozilla-aurora_android.py b/configs/single_locale/staging_release_mozilla-aurora_android.py
@@ -58,7 +58,7 @@
         "UPLOAD_TO_TEMP": "1",
         "MOZ_PKG_VERSION": "%(version)s",
     },
-    "base_post_upload_cmd": "post_upload.py -p mobile -n 1 -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
+    "base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
     "merge_locales": True,
     "make_dirs": ['config'],
     "mozilla_dir": MOZILLA_DIR,

diff --git a/configs/single_locale/staging_release_mozilla-beta_android.py b/configs/single_locale/staging_release_mozilla-beta_android.py
@@ -58,7 +58,7 @@
         "UPLOAD_TO_TEMP": "1",
         "MOZ_PKG_VERSION": "%(version)s",
     },
-    "base_post_upload_cmd": "post_upload.py -p mobile -n 1 -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
+    "base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
     "merge_locales": True,
     "make_dirs": ['config'],
     "mozilla_dir": MOZILLA_DIR,

diff --git a/configs/single_locale/staging_release_mozilla-release_android.py b/configs/single_locale/staging_release_mozilla-release_android.py
@@ -58,7 +58,7 @@
         "UPLOAD_TO_TEMP": "1",
         "MOZ_PKG_VERSION": "%(version)s",
     },
-    "base_post_upload_cmd": "post_upload.py -p mobile -n 1 -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
+    "base_post_upload_cmd": "post_upload.py -p mobile -n %(buildnum)s -v %(version)s --builddir android/%(locale)s --release-to-mobile-candidates-dir --nightly-dir=candidates",
     "merge_locales": True,
     "make_dirs": ['config'],
     "mozilla_dir": MOZILLA_DIR,

diff --git a/scripts/mobile_l10n.py b/scripts/mobile_l10n.py
@@ -387,13 +387,17 @@ def upload_repacks(self):
         version = self.query_version()
         upload_env = self.query_upload_env()
         success_count = total_count = 0
+        buildnum = None
+        if c.get('release_config_file'):
+            rc = self.query_release_config()
+            buildnum = rc['buildnum']
         for locale in locales:
             if self.query_failure(locale):
                 self.warning("Skipping previously failed locale %s." % locale)
                 continue
             total_count += 1
             if c.get('base_post_upload_cmd'):
-                upload_env['POST_UPLOAD_CMD'] = c['base_post_upload_cmd'] % {'version': version, 'locale': locale}
+                upload_env['POST_UPLOAD_CMD'] = c['base_post_upload_cmd'] % {'version': version, 'locale': locale, 'buildnum': str(buildnum)}
             output = self.get_output_from_command(
                 # Ugly hack to avoid |make upload| stderr from showing up
                 # as get_output_from_command errors