merged from default

changeset:   1292:6f01e94c6de1
tag:         tip
parent:      1290:735d97a6938f
user:        Chris AtLee <catlee@mozilla.com>
date:        Tue Feb 05 15:48:16 2013 -0500
summary:     Bug 821765: Upload otoro builds to new location. r=aki

--HG--
branch : production

configs/b2g/releng-eng.py

@@ -25,7 +25,7 @@
     "upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
     "upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
-    "gittool_share_base": "/builds/git-shared",
+    "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",
     "hgtool_base_mirror_urls": ["http://hg-internal.dmz.scl3.mozilla.com"],

configs/b2g/releng-otoro.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+import os
+config = {
+    "default_actions": [
+        'clobber',
+        'checkout-gecko',
+        'download-gonk',
+        'unpack-gonk',
+        'checkout-gaia',
+        'checkout-gaia-l10n',
+        'checkout-gecko-l10n',
+        'checkout-compare-locales',
+        'update-source-manifest',
+        'build',
+        'build-symbols',
+        'make-updates',
+        'make-socorro-json',
+        'prep-upload',
+        'upload',
+        'upload-source-manifest',
+    ],
+    "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+    "ssh_user": "b2gbld",
+    "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
+    "upload_remote_basepath": "/pvt/mozilla.org/b2gotoro/tinderbox-builds",
+    "upload_remote_nightly_basepath": "/pvt/mozilla.org/b2gotoro/nightly",
+    "upload_dep_target_exclusions": ["unagi", "otoro"],
+    "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
+    "gittool_share_base": "/builds/git-shared/git",
+    "gittool_base_mirror_urls": [],
+    "hgtool_share_base": "/builds/hg-shared",
+    "hgtool_base_mirror_urls": ["http://hg-internal.dmz.scl3.mozilla.com"],
+    "hgtool_base_bundle_urls": ["http://ftp.mozilla.org/pub/mozilla.org/firefox/bundles"],
+    "exes": {
+        "tooltool.py": "/tools/tooltool.py",
+    },
+    "manifest": {
+        "upload_remote_host": "stage.mozilla.org",
+        "upload_remote_basepath": "/pub/mozilla.org/b2g/manifests/%(version)s",
+        "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+        "ssh_user": "b2gbld",
+        "branches": {
+            'mozilla-b2g18_v1_0_0': '1.0.0',
+            'mozilla-b2g18': '1.0.1',
+        },
+        "translate_hg_to_git": True,
+        "translate_base_url": "http://cruncher.build.mozilla.org/mapper",
+        "update_channel": "nightly",
+    },
+    "env": {
+        "CCACHE_DIR": "/builds/ccache",
+        "CCACHE_COMPRESS": "1",
+        "CCACHE_UMASK": "002",
+        "SYMBOL_SERVER_HOST": "symbols1.dmz.phx1.mozilla.com",
+        "SYMBOL_SERVER_USER": "b2gbld",
+        "SYMBOL_SERVER_SSH_KEY": "/home/mock_mozilla/.ssh/b2gbld_dsa",
+        "SYMBOL_SERVER_PATH": "/mnt/netapp/breakpad/symbols_b2g/",
+        "POST_SYMBOL_UPLOAD_CMD": "/usr/local/bin/post-symbol-upload.py",
+    },
+    "purge_minsize": 15,
+    "clobberer_url": "http://clobberer.pvt.build.mozilla.org/index.php",
+    "is_automation": True,
+}

configs/b2g/releng.py

@@ -26,7 +26,7 @@
     "upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
     "upload_dep_target_exclusions": ["unagi", "otoro"],
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
-    "gittool_share_base": "/builds/git-shared",
+    "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",
     "hgtool_base_mirror_urls": ["http://hg-internal.dmz.scl3.mozilla.com"],