From 4fa014cd9a61cfdba0cffdfadbe3282be3294fb2 Mon Sep 17 00:00:00 2001
From: Ryan Schmidt <ryandesign@macports.org>
Date: Sun, 7 Aug 2016 15:55:33 +0000
Subject: [PATCH] buildbot-test: update descriptions and move cleanup step last

git-svn-id: https://svn.macports.org/repository/macports/contrib/buildbot-test@151107 d073be05-634f-4543-b044-5fe20cf6d1d6
---
 buildbot/master.cfg | 52 ++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 96e05a5..a8318e1 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -88,7 +88,6 @@ else:
     from buildbot.changes.svnpoller import SVNPoller
     c['change_source'] = (SVNPoller(
         svnurl='https://svn.macports.org/repository/macports/trunk',
-        #'https://svn.macports.org/repository/macports/trunk',
         #svnbin='/opt/local/bin/svn',
         pollinterval=300,
         category='macports',
@@ -198,21 +197,21 @@ base_factory.addStep(Compile(command="make -j`sysctl -n hw.activecpu`"))
 base_factory.addStep(ShellCommand(
     command="make install",
     name="install",
-    description="install"))
+    description=["installing"],
+    descriptionDone=["install"]))
 base_factory.addStep(ShellCommand(
     command="make test",
     name="test",
-    description="test"))
+    description=["testing"],
+    descriptionDone=["test"]))
 base_factory.addStep(ShellCommand(
     command=WithProperties("make distclean; rm -rf %(workdir)s/opt/local"),
     name="clean",
-    description="clean"))
+    description=["cleaning"],
+    descriptionDone=["clean"]))
 
 # custom class to make the file list available on the slave...
 class SetPropertyFromCommandWithPortlist(SetPropertyFromCommand):
-    name = 'generate portlist'
-    description = 'generate portlist'
-
     def setBuild(self, build):
         SetPropertyFromCommand.setBuild(self, build)
 
@@ -298,14 +297,16 @@ def make_portwatcher_factory(triggerable):
     portwatcher_factory.addStep(ShellCommand(
         command=['./mpbb/mpbb', 'selfupdate', '--prefix', WithProperties(prefix)],
         name="selfupdate",
-        description="selfupdate",
+        description=["updating", "MacPorts"],
+        descriptionDone=["update", "MacPorts"],
         haltOnFailure=True))
 
     portwatcher_factory.addStep(ShellCommand(
         command=['./mpbb/mpbb', 'checkout', '--prefix', WithProperties(prefix), '--svn-url', svnurl],
         timeout=3600,
         name="checkout",
-        description="checkout",
+        description=["syncing", "ports"],
+        descriptionDone=["sync", "ports"],
         haltOnFailure=True))
 
     def extract_subportlist(rc, stdout, stderr):
@@ -329,7 +330,7 @@ def make_portwatcher_factory(triggerable):
         command=WithProperties('./mpbb/mpbb list-subports %(fullportlist)s'),
         extract_fn=extract_subportlist,
         name="subports",
-        description="subports"))
+        description=["listing", "subports"]))
 
     portwatcher_factory.addStep(TriggerWithPortlist(
         schedulerNames=[triggerable],
@@ -371,22 +372,22 @@ portbuilder_factory.addStep(ShellCommand(
 portbuilder_factory.addStep(Compile(
     command=['./mpbb/mpbb', 'install-dependencies', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
     name="install-dependencies",
-    description="installing deps",
-    descriptionDone="install deps",
+    description=["installing", "dependencies"],
+    descriptionDone=["install", "dependencies"],
     haltOnFailure=True))
 
 portbuilder_factory.addStep(Compile(
     command=['./mpbb/mpbb', 'install-port', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
     name="install-port",
-    description="installing port",
-    descriptionDone="install port",
+    description=["installing", "port"],
+    descriptionDone=["install", "port"],
     haltOnFailure=True))
 
 portbuilder_factory.addStep(ShellCommand(
     command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s'), '--archive-site', archivesite, '--staging-dir', ulpath],
     name="gather-archives",
-    description="gathering archives",
-    descriptionDone="gather archives",
+    description=["gathering", "archives"],
+    descriptionDone=["gather", "archives"],
     haltOnFailure=True))
 
 # upload archives from build slave to master
@@ -394,14 +395,6 @@ portbuilder_factory.addStep(DirectoryUpload(
     slavesrc=ulpath,
     masterdest=WithProperties(ulpath_unique)))
 
-portbuilder_factory.addStep(ShellCommand(
-    command=['./mpbb/mpbb', 'cleanup', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
-    name="cleanup",
-    description="cleaning up",
-    descriptionDone="clean up",
-    alwaysRun=True))
-
-
 # XXX: move deploy_archives.sh functionality to mp-buildbot
 # sign generated binaries and sync to download server (if distributable)
 if production:
@@ -414,11 +407,12 @@ if production:
                                'DLPATH': dlpath}))
 
 # TODO: do we want to upload the individual logs so maintainers can review them?
-#ports_factory.addStep(ShellCommand(command="./cleanup_old.sh",
-#                                   name="cleanup",
-#                                   description="cleanup",
-#                                   env={'PREFIX': WithProperties(prefix),
-#                                        'ULPATH': ulpath}))
+portbuilder_factory.addStep(ShellCommand(
+    command=['./mpbb/mpbb', 'cleanup', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
+    name="cleanup",
+    description=["cleaning"],
+    descriptionDone=["clean"],
+    alwaysRun=True))
 
 # === BUILDER CONFIGURATION ===