Modified: users/jmr/master.cfg (79893 => 79894)

--- users/jmr/master.cfg	2011-06-29 05:18:26 UTC (rev 79893)
+++ users/jmr/master.cfg	2011-06-29 05:19:11 UTC (rev 79894)
@@ -122,55 +122,13 @@
                       env={'PREFIX': WithProperties("%(workdir)s/opt/local"),
                            'SRC_PREFIX': WithProperties("%(workdir)s/opt/mports")}))
 # sign generated binaries and sync to download server (if distributable)
-opensslcmd = '/usr/bin/openssl'
-# FIXME: configure these
-prefix='../opt/local'
-# private key to use for signing
-privkey=''
-# download server hostname and path where it keeps archives
-dlhost='mparchives.local'
-dlpath='/archives'
-ports_factory.addStep(ShellCommand(command=[
-"""for port in `cat portlist`; do
-    if [[ -f logs-*/success/${port}.log ]]; then
-        if ./mpexport/base/portmgr/jobs/port_binary_distributable.tcl ${port}; then
-            echo $port is distributable
-            portversion=$("""+prefix+"""/bin/port info --version --line ${portName})
-            portrevision=$("""+prefix+"""/bin/port info --revision --line ${portName})
-            for archive in """+prefix+"""/var/macports/software/${portname}/${portname}-${portversion}_${portrevision}[+.]*; do
-                aname=$(basename $archive)
-                echo deploying archive: $aname
-                openssl dgst -ripemd160 -sign """+privkey+""" -out ./${aname}.rmd160 ${archive}
-                ssh """+dlhost+""" mkdir -p """+dlpath+"""/${portname}
-                rsync -av --ignore-existing ./${aname}.rmd160 ${archive} """+dlhost+""":"""+dlpath+"""/${portname}
-                rm ./${aname}.rmd160
-            done
-        fi
-    fi
-done
-"""]))
+ports_factory.addStep(ShellCommand(command=["./deploy_archives.sh"]))
 
 # make a logfile summarising the success/failure status for each port
-ports_factory.addStep(ShellCommand(command=[
-"""rm -f portstatus.log
-for port in `cat portlist`; do
-    if [[ -f logs-*/success/${port}.log ]]; then
-        echo "[OK] ${port}" >> portstatus.log
-    elif [[ -f logs-*/failure/${port}.log ]]; then
-        echo "[FAIL] ${port}" >> portstatus.log
-        # send email to appropriate places
-        portmaintainers=$("""+prefix+"""/bin/port info --maintainers --line ${port} | tr ',' ' ')
-        for maint in $portmaintainers; do
-            if [[ "$maint" != "nomaintainer@macports.org" && "$maint" != "openmaintainer@macports.org" ]]; then
-                # email maintainer
-                echo "not emailing $maint (not set up yet)"
-            fi
-            # also send to some new mailing list?
-        done
-    fi
-done
-"""], logfiles={"portstatus": "portstatus.log"}))
-ports_factory.addStep(ShellCommand(command=["rm -r ./logs-*"]))
+ports_factory.addStep(ShellCommand(command=["./do_status.sh"],
+                        logfiles={"portstatus": "portstatus.log"}))
+# do we want to upload the individual logs so maintainers can review them?
+ports_factory.addStep(ShellCommand(command=['rm -rf ./logs-*']))
 
 from buildbot.config import BuilderConfig