Changeset 80457

Timestamp:

07/13/11 07:18:39 (4 years ago)

Author:

wsiegrist@…

Message:

Switch deploy_archives to a master command and add privkey path to config file.

File:

• contrib/buildbot/master.cfg (modified) (3 diffs)

contrib/buildbot/master.cfg

@@ -21 +21 @@
 
 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
@@ -150 +153 @@
     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'
@@ -174 +176 @@
                       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}))