[80457] contrib/buildbot/master.cfg

[wsiegrist at apple.com]

Revision: 80457
          http://trac.macports.org/changeset/80457
Author:   wsiegrist at apple.com
Date:     2011-07-13 07:18:39 -0700 (Wed, 13 Jul 2011)
Log Message:
-----------
Switch deploy_archives to a master command and add privkey path to config file.

Modified Paths:
--------------
    contrib/buildbot/master.cfg

Modified: contrib/buildbot/master.cfg
===================================================================
--- contrib/buildbot/master.cfg	2011-07-13 14:17:19 UTC (rev 80456)
+++ contrib/buildbot/master.cfg	2011-07-13 14:18:39 UTC (rev 80457)
@@ -20,9 +20,12 @@
 # it has to be)
 
 production = False
+privkey = ''
 if os.path.exists(_path('config.json')):
     with open(_path('config.json')) as f:
-        production = json.load(f)['production']
+        configdata = json.load(f)
+        production = configdata['production']
+        privkey = configdata['privkey']
 
 ####### BUILDSLAVES
 
@@ -149,9 +152,8 @@
 if production:
     prefix='/opt/local'
     src_prefix='/opt/mports'
-    # FIXME
-    dlhost='mparchives.local'
-    dlpath='/archives'
+    dlhost=''
+    dlpath='/www/hosts/packages.macports.org'
 else:
     prefix='%(workdir)s/opt/local'
     src_prefix='%(workdir)s/opt/mports'
@@ -173,11 +175,13 @@
 ports_factory.addStep(Compile(command=["./mpab", "buildports", "portlist"],
                       env={'PREFIX': WithProperties(prefix),
                            'SRC_PREFIX': WithProperties(src_prefix)}))
+
 # sign generated binaries and sync to download server (if distributable)
-ports_factory.addStep(ShellCommand(command=["./deploy_archives.sh"],
+ports_factory.addStep(MasterShellCommand(command=["mpab/deploy_archives.sh"],
                                    name="deploy archives",
                                    description="deploy archives",
                       env={'PREFIX': WithProperties(prefix),
+                           'PRIVKEY': privkey,
                            'DLHOST': dlhost,
                            'DLPATH': dlpath}))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110713/7dd8e6cf/attachment.html>