Permalink
Browse files

Bug 457753: Print out URLs to candidate builds. r=bhearsum

  • Loading branch information...
catlee committed Nov 14, 2009
1 parent 06131d6 commit 1a77697171a703fd6df1184e371b030c006fef87
Showing with 20 additions and 3 deletions.
  1. +1 −1 buildfarm/utils/installdmg.sh
  2. +19 −2 stage/post_upload.py
@@ -15,7 +15,7 @@ trap "{ if [ -d mnt ]; then hdiutil detach mnt -force; rm -rdfv mnt; fi; }" EXIT
mkdir -p mnt
-hdiutil attach -verbose -noautoopen -mountpoint ./mnt $1
+hdiutil attach -verbose -noautoopen -mountpoint ./mnt "$1"
# Wait for files to show up
# hdiutil uses a helper process, diskimages-helper, which isn't always done its
# work by the time hdiutil exits. So we wait until something shows up in the
View
@@ -17,6 +17,10 @@
LONG_DATED_DIR = "%(year)s/%(month)s/%(year)s-%(month)s-%(day)s-%(hour)s-%(branch)s"
SHORT_DATED_DIR = "%(year)s-%(month)s-%(day)s-%(hour)s-%(branch)s"
CANDIDATES_DIR = "%(version)s-candidates/build%(buildnumber)s"
+# For staging
+#CANDIDATES_URL_PATH = "http://staging-stage.build.mozilla.org/pub/mozilla.org/%(product)s/nightly/%(version)s-candidates/build%(buildnumber)s"
+# For production
+CANDIDATES_URL_PATH = "http://stage.mozilla.org/pub/mozilla.org/%(product)s/nightly/%(version)s-candidates/build%(buildnumber)s"
def CopyFileToDir(original_file, source_dir, dest_dir, preserve_dirs=False):
if not original_file.startswith(source_dir):
@@ -119,14 +123,27 @@ def ReleaseToCandidatesDir(options, upload_dir, files):
candidatesDir = CANDIDATES_DIR % {'version': options.version,
'buildnumber': options.build_number}
candidatesPath = os.path.join(NIGHTLY_PATH, candidatesDir)
+ candidatesUrl = CANDIDATES_URL_PATH % {
+ 'version': options.version,
+ 'buildnumber': options.build_number,
+ 'product': options.product,
+ }
for f in files:
- if f.endswith('crashreporter-symbols.zip'):
- continue
realCandidatesPath = candidatesPath
if 'win32' in f:
realCandidatesPath = os.path.join(realCandidatesPath, 'unsigned')
+ url = os.path.join(candidatesUrl, 'unsigned')
+ else:
+ url = candidatesUrl
CopyFileToDir(f, upload_dir, realCandidatesPath, preserve_dirs=True)
+ # Output the URL to the candidate build
+ if f.startswith(upload_dir):
+ relpath = f[len(upload_dir):].lstrip("/")
+ else:
+ relpath = f.lstrip("/")
+
+ sys.stderr.write("%s\n" % os.path.join(url, relpath))
# We always want release files chmod'ed this way so other users in
# the group cannot overwrite them.
os.chmod(f, 0644)

0 comments on commit 1a77697

Please sign in to comment.