Revision

96025

Author

jmr@macports.org

Date

2012-07-29 01:49:44 -0700 (Sun, 29 Jul 2012)

Log Message

buildbot: second try at uploading archives from different slaves to unique paths on the master, cf. r95987, r96019

Modified Paths

• contrib/buildbot/deploy_archives.sh
• contrib/buildbot/master.cfg

Diff

--- contrib/buildbot/deploy_archives.sh	2012-07-29 08:24:58 UTC (rev 96024)
+++ contrib/buildbot/deploy_archives.sh	2012-07-29 08:49:44 UTC (rev 96025)
@@ -12,7 +12,12 @@
 
 # path where archives get uploaded to buildmaster
 if [[ -z "$ULPATH" ]]; then
-    ULPATH="./archive_staging"
+    # workaround for buildbot not accepting WithProperties in env
+    if [[ -n "$1" ]]; then
+        ULPATH="$1"
+    else
+        ULPATH="./archive_staging"
+    fi
 fi
 
 # private key to use for signing

--- contrib/buildbot/master.cfg	2012-07-29 08:24:58 UTC (rev 96024)
+++ contrib/buildbot/master.cfg	2012-07-29 08:49:44 UTC (rev 96025)
@@ -237,14 +237,13 @@
                            'ULPATH': ulpath}))
 # upload archives from build slave to master
 from buildbot.steps.transfer import DirectoryUpload
-ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=ulpath))
+ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=WithProperties(ulpath_unique)))
 # sign generated binaries and sync to download server (if distributable)
 from buildbot.steps.master import MasterShellCommand
-ports_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh"],
+ports_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh", WithProperties(ulpath_unique)],
                                    name="deploy archives",
                                    description="deploy archives",
                       env={'PRIVKEY': privkey,
-                           'ULPATH': ulpath, 
                            'DLHOST': dlhost,
                            'DLPATH': dlpath}))