rework the configs. todo: rework the script to follow

escapewindow · Jan 15, 2014 · 78e9847 · 78e9847
1 parent 5bc8e11
commit 78e9847
Show file tree

Hide file tree

Showing 8 changed files with 163 additions and 85 deletions.
diff --git a/configs/b2g/releng-beta.py b/configs/b2g/releng-beta.py
@@ -16,17 +16,27 @@
         'make-socorro-json',
         'upload-source-manifest',
     ],
-    "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "ssh_user": "b2gbld",
-    "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
-    "upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "upload_dep_target_exclusions": [],
-    "upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
-    "public_ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "public_ssh_user": "b2gbld",
-    "public_upload_remote_host": "stage.mozilla.org",
-    "public_upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "public_upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
+    "upload": {
+        "default": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
+            "upload_remote_path": "/pub/mozilla.org/b2g/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
+            "upload_remote_symlink": "/pub/mozilla.org/b2g/tinderbox-builds/%(basepath)s/%(branch)s-%(target)s/latest",
+            "upload_remote_nightly_path": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
+            "upload_remote_nightly_symlink": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/latest",
+            "filelist_key": "upload_files",
+            "upload_dep_target_exclusions": [],
+        },
+        "public": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "stage.mozilla.org",
+            "post_upload_cmd": "post_upload.py --tinderbox-builds-dir ${branch}s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
+            "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
+            "filelist_key": "public_upload_files",
+        },
+    },
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],

diff --git a/configs/b2g/releng-emulator.py b/configs/b2g/releng-emulator.py
@@ -14,17 +14,26 @@
         'make-socorro-json',
         'upload-source-manifest',
     ],
-    "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "ssh_user": "b2gbld",
-    "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
-    "upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
-    "upload_dep_target_exclusions": [],
-    "public_ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "public_ssh_user": "b2gbld",
-    "public_upload_remote_host": "stage.mozilla.org",
-    "public_upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "public_upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
+    "upload": {
+        "default": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
+            "upload_remote_path": "/pub/mozilla.org/b2g/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
+            "upload_remote_symlink": "/pub/mozilla.org/b2g/tinderbox-builds/%(branch)s-%(target)s/latest",
+            "upload_remote_nightly_path": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
+            "upload_remote_nightly_path": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/latest",
+            "filelist_key": "upload_files",
+            "upload_dep_target_exclusions": [],
+        },
+        "public": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "stage.mozilla.org",
+            "post_upload_cmd": "post_upload.py --tinderbox-builds-dir ${branch}s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",            "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
+            "filelist_key": "public_upload_files",
+        },
+    },
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],

diff --git a/configs/b2g/releng-eng.py b/configs/b2g/releng-eng.py
@@ -15,16 +15,27 @@
         'make-socorro-json',
         'upload-source-manifest',
     ],
-    "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "ssh_user": "b2gbld",
-    "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
-    "upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
-    "public_ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "public_ssh_user": "b2gbld",
-    "public_upload_remote_host": "stage.mozilla.org",
-    "public_upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "public_upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
+    "upload": {
+        "default": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
+            "upload_remote_path": "/pub/mozilla.org/b2g/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
+            "upload_remote_symlink": "/pub/mozilla.org/b2g/tinderbox-builds/%(basepath)s/%(branch)s-%(target)s/latest",
+            "upload_remote_nightly_path": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
+            "upload_remote_nightly_symlink": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/latest",
+            "filelist_key": "upload_files",
+            "upload_dep_target_exclusions": [],
+        },
+        "public": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "stage.mozilla.org",
+            "post_upload_cmd": "post_upload.py --tinderbox-builds-dir ${branch}s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
+            "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
+            "filelist_key": "public_upload_files",
+        },
+    },
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],

diff --git a/configs/b2g/releng-otoro-eng.py b/configs/b2g/releng-otoro-eng.py
@@ -15,16 +15,27 @@
         'make-socorro-json',
         '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",
-    "public_ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "public_ssh_user": "b2gbld",
-    "public_upload_remote_host": "stage.mozilla.org",
-    "public_upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "public_upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
+    "upload": {
+        "default": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
+            "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
+            "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(basepath)s/%(branch)s-%(target)s/latest",
+            "upload_remote_nightly_path": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
+            "upload_remote_nightly_symlink": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/latest",
+            "filelist_key": "upload_files",
+            "upload_dep_target_exclusions": [],
+        },
+        "public": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "stage.mozilla.org",
+            "post_upload_cmd": "post_upload.py --tinderbox-builds-dir ${branch}s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
+            "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
+            "filelist_key": "public_upload_files",
+        },
+    },
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],

diff --git a/configs/b2g/releng-otoro.py b/configs/b2g/releng-otoro.py
@@ -14,17 +14,27 @@
         'make-socorro-json',
         '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": ["inari", "leo", "hamachi"],
-    "public_ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "public_ssh_user": "b2gbld",
-    "public_upload_remote_host": "stage.mozilla.org",
-    "public_upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "public_upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
+    "upload": {
+        "default": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
+            "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
+            "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(basepath)s/%(branch)s-%(target)s/latest",
+            "upload_remote_nightly_path": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
+            "upload_remote_nightly_symlink": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/latest",
+            "filelist_key": "upload_files",
+            "upload_dep_target_exclusions": ["inari", "leo", "hamachi"],
+        },
+        "public": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "stage.mozilla.org",
+            "post_upload_cmd": "post_upload.py --tinderbox-builds-dir ${branch}s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
+            "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
+            "filelist_key": "public_upload_files",
+        },
+    },
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],

diff --git a/configs/b2g/releng-private-updates.py b/configs/b2g/releng-private-updates.py
@@ -16,17 +16,27 @@
         'make-socorro-json',
         '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": ["inari", "leo", "hamachi", "helix"],
-    "public_ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "public_ssh_user": "b2gbld",
-    "public_upload_remote_host": "stage.mozilla.org",
-    "public_upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "public_upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
+    "upload": {
+        "default": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
+            "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
+            "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(basepath)s/%(branch)s-%(target)s/latest",
+            "upload_remote_nightly_path": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
+            "upload_remote_nightly_symlink": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/latest",
+            "filelist_key": "upload_files",
+            "upload_dep_target_exclusions": ["inari", "leo", "hamachi", "helix"],
+        },
+        "public": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "stage.mozilla.org",
+            "post_upload_cmd": "post_upload.py --tinderbox-builds-dir ${branch}s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
+            "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
+            "filelist_key": "public_upload_files",
+        },
+    },
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],

diff --git a/configs/b2g/releng-try.py b/configs/b2g/releng-try.py
@@ -11,16 +11,23 @@
         'prep-upload',
         'upload',
     ],
-    "ssh_key": os.path.expanduser("~/.ssh/b2gtry_dsa"),
-    "ssh_user": "b2gtry",
-    "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
-    "upload_remote_basepath": "/pub/mozilla.org/b2g/try-builds",
-    "upload_dep_target_exclusions": [],
-    "public_ssh_key": os.path.expanduser("~/.ssh/b2gtry_dsa"),
-    "public_ssh_user": "b2gtry",
-    "public_upload_remote_host": "stage.mozilla.org",
-    "public_upload_remote_basepath": "/pub/mozilla.org/b2g/try-builds",
-    "enable_try_uploads": True,
+    "upload": {
+        "default": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gtry_dsa"),
+            "ssh_user": "b2gtry",
+            "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
+            "upload_remote_path": "/pub/mozilla.org/b2g/try-builds/%(user)s-%(rev)s/%(branch)s-%(target)s",
+            "filelist_key": "upload_files",
+            "upload_dep_target_exclusions": [],
+        },
+        "public": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gtry_dsa"),
+            "ssh_user": "b2gtry",
+            "upload_remote_host": "stage.mozilla.org",
+            "post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(user)s-%(revision)s -p b2g -i %(buildid)s --revision %(revision)s --who %(user)s --builddir try-%(target)s --release-to-try-builds",
+            "filelist_key": "public_upload_files",
+        },
+    },
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],

diff --git a/configs/b2g/releng.py b/configs/b2g/releng.py
@@ -14,17 +14,27 @@
         'make-socorro-json',
         'upload-source-manifest',
     ],
-    "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "ssh_user": "b2gbld",
-    "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
-    "upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
-    "upload_dep_target_exclusions": [],
-    "public_ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
-    "public_ssh_user": "b2gbld",
-    "public_upload_remote_host": "stage.mozilla.org",
-    "public_upload_remote_basepath": "/pub/mozilla.org/b2g/tinderbox-builds",
-    "public_upload_remote_nightly_basepath": "/pub/mozilla.org/b2g/nightly",
+    "upload": {
+        "default": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
+            "upload_remote_path": "/pub/mozilla.org/b2g/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
+            "upload_remote_symlink": "/pub/mozilla.org/b2g/tinderbox-builds/%(basepath)s/%(branch)s-%(target)s/latest",
+            "upload_remote_nightly_path": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
+            "upload_remote_nightly_symlink": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/latest",
+            "filelist_key": "upload_files",
+            "upload_dep_target_exclusions": [],
+        },
+        "public": {
+            "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
+            "ssh_user": "b2gbld",
+            "upload_remote_host": "stage.mozilla.org",
+            "post_upload_cmd": "post_upload.py --tinderbox-builds-dir ${branch}s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
+            "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
+            "filelist_key": "public_upload_files",
+        },
+    },
     "tooltool_servers": ["http://runtime-binaries.pvt.build.mozilla.org/tooltool/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],