script/autobuild.py: set the default for --log-base to the current gitroot
[sfrench/samba-autobuild/.git] / script / autobuild.py
index be8006c3245d80ae516bd5f91cf43f2c1dcaa5a4..efef2f4246bd2d3ba2e3d0ed4358ded01830cbe3 100755 (executable)
@@ -8,68 +8,179 @@ import os, tarfile, sys, time
 from optparse import OptionParser
 import smtplib
 from email.mime.text import MIMEText
+from distutils.sysconfig import get_python_lib
 
-samba_master = os.getenv('SAMBA_MASTER', 'git://git.samba.org/samba.git')
-samba_master_ssh = os.getenv('SAMBA_MASTER_SSH', 'git+ssh://git.samba.org/data/git/samba.git')
+# This speeds up testing remarkably.
+os.environ['TDB_NO_FSYNC'] = '1'
 
 cleanup_list = []
 
-os.putenv('CC', "ccache gcc")
+builddirs = {
+    "samba3"  : "source3",
+    "samba3-ctdb" : "source3",
+    "samba"  : ".",
+    "samba-ctdb" : ".",
+    "samba-libs"  : ".",
+    "ldb"     : "lib/ldb",
+    "tdb"     : "lib/tdb",
+    "ntdb"    : "lib/ntdb",
+    "talloc"  : "lib/talloc",
+    "replace" : "lib/replace",
+    "tevent"  : "lib/tevent",
+    "pidl"    : "pidl",
+    "pass"    : ".",
+    "fail"    : ".",
+    "retry"   : "."
+    }
+
+defaulttasks = [ "samba3", "samba3-ctdb", "samba", "samba-ctdb", "samba-libs", "ldb", "tdb", "ntdb", "talloc", "replace", "tevent", "pidl" ]
 
 tasks = {
-    "source3" : [ ("autogen", "./autogen.sh", "text/plain"),
-                  ("configure", "./configure.developer ${PREFIX}", "text/plain"),
-                  ("make basics", "make basics", "text/plain"),
-                  ("make", "make -j 4 everything", "text/plain"), # don't use too many processes
-                  ("install", "make install", "text/plain"),
-                  ("test", "TDB_NO_FSYNC=1 make subunit-test FAIL_IMMEDIATELY=1", "text/x-subunit") ],
-
-    "source4" : [ ("configure", "./configure.developer ${PREFIX}", "text/plain"),
-                  ("make", "make -j", "text/plain"),
-                  ("install", "make install", "text/plain"),
-                  ("test", "TDB_NO_FSYNC=1 make subunit-test FAIL_IMMEDIATELY=1", "text/x-subunit") ],
-
-    "source4/lib/ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
-                          ("make", "make -j", "text/plain"),
-                          ("install", "make install", "text/plain"),
-                          ("test", "make test", "text/plain") ],
-
-    "lib/tdb" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
+    "samba3" : [ ("autogen", "./autogen.sh", "text/plain"),
+                 ("configure", "./configure.developer ${PREFIX}", "text/plain"),
+                 ("make basics", "make basics", "text/plain"),
+                 # we split 'make -j 4', 'make bin/smbtorture4' and 'make -j 4 everything'
+                 # because it makes it much easier to find errors.
+                 ("make", "make -j 4", "text/plain"), # don't use too many processes
+                 ("make bin/smbtorture4", "make bin/smbtorture4", "text/plain"),
+                 ("make everything", "make -j 4 everything", "text/plain"),
+                 ("install", "make install", "text/plain"),
+                 ("test", "make test FAIL_IMMEDIATELY=1", "text/plain"),
+                 ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
+                 ("clean", "make clean", "text/plain") ],
+
+    "samba3-ctdb" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+                      ("autogen", "./autogen.sh", "text/plain"),
+                      ("configure", "./configure.developer ${PREFIX} --with-cluster-support --with-ctdb=../ctdb", "text/plain"),
+                      ("make basics", "make basics", "text/plain"),
+                      ("make", "make all", "text/plain"), # don't use too many processes
+                      ("check", "LD_LIBRARY_PATH=./bin ./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"),
+                      ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
+                      ("clean", "make clean", "text/plain") ],
+
+    # We have 'test' before 'install' because, 'test' should work without 'install'
+    "samba" : [ ("configure", "./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab", "text/plain"),
+                ("make", "make -j", "text/plain"),
+                ("test", "make test FAIL_IMMEDIATELY=1", "text/plain"),
+                ("install", "make install", "text/plain"),
+                ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+                ("clean", "make clean", "text/plain") ],
+
+    "samba-ctdb" : [ ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+
+                     # make sure we have tdb around:
+                     ("tdb-configure", "cd lib/tdb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
+                     ("tdb-make", "cd lib/tdb && make", "text/plain"),
+                     ("tdb-install", "cd lib/tdb && make install", "text/plain"),
+
+                     # install the ctdb headers under the prefix:
+                     ("ctdb-header-install", "cp ./ctdb/include/* ${PREFIX_DIR}/include", "text/plain"),
+                     ("ctdb-header-ls", "ls ${PREFIX_DIR}/include/ctdb.h", "text/plain"),
+
+                     ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --with-ctdb-dir=${PREFIX_DIR} --bundled-libraries=!tdb", "text/plain"),
+                     ("make", "make", "text/plain"),
+                     ("check", "./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"),
+                     ("install", "make install", "text/plain"),
+                     ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+                     ("clean", "make clean", "text/plain") ],
+
+    "samba-libs" : [
+                      ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+                      ("talloc-configure", "cd lib/talloc && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
+                      ("talloc-make", "cd lib/talloc && make", "text/plain"),
+                      ("talloc-install", "cd lib/talloc && make install", "text/plain"),
+
+                      ("tdb-configure", "cd lib/tdb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
+                      ("tdb-make", "cd lib/tdb && make", "text/plain"),
+                      ("tdb-install", "cd lib/tdb && make install", "text/plain"),
+
+                      ("tevent-configure", "cd lib/tevent && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
+                      ("tevent-make", "cd lib/tevent && make", "text/plain"),
+                      ("tevent-install", "cd lib/tevent && make install", "text/plain"),
+
+                      ("ldb-configure", "cd lib/ldb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
+                      ("ldb-make", "cd lib/ldb && make", "text/plain"),
+                      ("ldb-install", "cd lib/ldb && make install", "text/plain"),
+
+                      ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
+                      ("make", "make", "text/plain"),
+                      ("install", "make install", "text/plain")],
+
+    "ldb" : [
+              ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
+              ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+              ("make", "make", "text/plain"),
+              ("install", "make install", "text/plain"),
+              ("test", "make test", "text/plain"),
+              ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
+              ("distcheck", "make distcheck", "text/plain"),
+              ("clean", "make clean", "text/plain") ],
+
+    "tdb" : [
+              ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
+              ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+              ("make", "make", "text/plain"),
+              ("install", "make install", "text/plain"),
+              ("test", "make test", "text/plain"),
+              ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
+              ("distcheck", "make distcheck", "text/plain"),
+              ("clean", "make clean", "text/plain") ],
+
+    "ntdb" : [
+               ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
+               ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+               ("make", "make", "text/plain"),
+               ("install", "make install", "text/plain"),
+               ("test", "make test", "text/plain"),
+               ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
+               ("distcheck", "make distcheck", "text/plain"),
+               ("clean", "make clean", "text/plain") ],
+
+    "talloc" : [
+                 ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
+                 ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+                 ("make", "make", "text/plain"),
+                 ("install", "make install", "text/plain"),
+                 ("test", "make test", "text/plain"),
+                 ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
+                 ("distcheck", "make distcheck", "text/plain"),
+                 ("clean", "make clean", "text/plain") ],
+
+    "replace" : [
+                  ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
                   ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
-                  ("make", "make -j", "text/plain"),
+                  ("make", "make", "text/plain"),
                   ("install", "make install", "text/plain"),
-                  ("test", "make test", "text/plain") ],
-
-    "lib/talloc" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
-                     ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
-                     ("make", "make -j", "text/plain"),
-                     ("install", "make install", "text/plain"),
-                     ("test", "make test", "text/plain"), ],
-
-    "lib/replace" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
-                      ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
-                      ("make", "make -j", "text/plain"),
-                      ("install", "make install", "text/plain"),
-                      ("test", "make test", "text/plain"), ],
-
-    "lib/tevent" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
-                     ("make", "make -j", "text/plain"),
-                     ("install", "make install", "text/plain"),
-                     ("test", "make test", "text/plain"), ],
+                  ("test", "make test", "text/plain"),
+                  ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
+                  ("distcheck", "make distcheck", "text/plain"),
+                  ("clean", "make clean", "text/plain") ],
+
+    "tevent" : [
+                 ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
+                 ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+                 ("make", "make", "text/plain"),
+                 ("install", "make install", "text/plain"),
+                 ("test", "make test", "text/plain"),
+                 ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
+                 ("distcheck", "make distcheck", "text/plain"),
+                 ("clean", "make clean", "text/plain") ],
+
+    "pidl" : [
+               ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+               ("configure", "perl Makefile.PL PREFIX=${PREFIX_DIR}", "text/plain"),
+               ("touch", "touch *.yp", "text/plain"),
+               ("make", "make", "text/plain"),
+               ("test", "make test", "text/plain"),
+               ("install", "make install", "text/plain"),
+               ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
+               ("clean", "make clean", "text/plain") ],
+
+    # these are useful for debugging autobuild
+    'pass' : [ ("pass", 'echo passing && /bin/true', "text/plain") ],
+    'fail' : [ ("fail", 'echo failing && /bin/false', "text/plain") ]
 }
 
-retry_task = [ '''set -e
-                git remote add -t master master %s
-                git fetch master
-                while :; do
-                  sleep 60
-                  git describe master/master > old_master.desc
-                  git fetch master
-                  git describe master/master > master.desc
-                  diff old_master.desc master.desc
-                done
-               ''' % samba_master]
-
 def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
     if show is None:
         show = options.verbose
@@ -78,9 +189,9 @@ def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
     if output:
         return Popen([cmd], shell=True, stdout=PIPE, cwd=dir).communicate()[0]
     elif checkfail:
-        return check_call(cmd, shell=True)
+        return check_call(cmd, shell=True, cwd=dir)
     else:
-        return call(cmd, shell=True)
+        return call(cmd, shell=True, cwd=dir)
 
 
 class builder(object):
@@ -88,11 +199,7 @@ class builder(object):
 
     def __init__(self, name, sequence):
         self.name = name
-
-        if name in ['pass', 'fail', 'retry']:
-            self.dir = "."
-        else:
-            self.dir = self.name
+        self.dir = builddirs[name]
 
         self.tag = self.name.replace('/', '_')
         self.sequence = sequence
@@ -113,7 +220,7 @@ class builder(object):
         cleanup_list.append(self.prefix)
         os.makedirs(self.sdir)
         run_cmd("rm -rf %s" % self.sdir)
-        run_cmd("git clone --shared %s %s" % (gitroot, self.sdir))
+        run_cmd("git clone --shared %s %s" % (test_master, self.sdir), dir=test_master, show=True)
         self.start_next()
 
     def start_next(self):
@@ -122,9 +229,11 @@ class builder(object):
             self.done = True
             return
         (self.stage, self.cmd, self.output_mime_type) = self.sequence[self.next]
+        self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(standard_lib=1, prefix=self.prefix))
         self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix)
-        if self.output_mime_type == "text/x-subunit":
-            self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
+        self.cmd = self.cmd.replace("${PREFIX_DIR}", "%s" % self.prefix)
+#        if self.output_mime_type == "text/x-subunit":
+#            self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
         print '%s: [%s] Running %s' % (self.name, self.stage, self.cmd)
         cwd = os.getcwd()
         os.chdir("%s/%s" % (self.sdir, self.dir))
@@ -137,21 +246,38 @@ class builder(object):
 class buildlist(object):
     '''handle build of multiple directories'''
 
-    def __init__(self, tasklist, tasknames):
+    def __init__(self, tasklist, tasknames, rebase_url, rebase_branch="master"):
         global tasks
         self.tlist = []
         self.tail_proc = None
         self.retry = None
-        if tasknames == ['pass']:
-            tasks = { 'pass' : [ ("pass", '/bin/true', "text/plain") ]}
-        if tasknames == ['fail']:
-            tasks = { 'fail' : [ ("fail", '/bin/false', "text/plain") ]}
         if tasknames == []:
-            tasknames = tasklist
+            tasknames = defaulttasks
         for n in tasknames:
             b = builder(n, tasks[n])
             self.tlist.append(b)
         if options.retry:
+            rebase_remote = "rebaseon"
+            retry_task = [ ("retry",
+                            '''set -e
+                            git remote add -t %s %s %s
+                            git fetch %s
+                            while :; do
+                              sleep 60
+                              git describe %s/%s > old_remote_branch.desc
+                              git fetch %s
+                              git describe %s/%s > remote_branch.desc
+                              diff old_remote_branch.desc remote_branch.desc
+                            done
+                           ''' % (
+                               rebase_branch, rebase_remote, rebase_url,
+                               rebase_remote,
+                               rebase_remote, rebase_branch,
+                               rebase_remote,
+                               rebase_remote, rebase_branch
+                           ),
+                           "test/plain" ) ]
+
             self.retry = builder('retry', retry_task)
             self.need_retry = False
 
@@ -199,7 +325,7 @@ class buildlist(object):
             if options.retry and self.need_retry:
                 self.kill_kids()
                 print("retry needed")
-                return (0, "retry")
+                return (0, None, None, None, "retry")
             if b is None:
                 break
             if os.WIFSIGNALED(b.status) or os.WEXITSTATUS(b.status) != 0:
@@ -214,6 +340,8 @@ class buildlist(object):
         for b in self.tlist:
             tar.add(b.stdout_path, arcname="%s.stdout" % b.tag)
             tar.add(b.stderr_path, arcname="%s.stderr" % b.tag)
+        if os.path.exists("autobuild.log"):
+            tar.add("autobuild.log")
         tar.close()
 
     def remove_logs(self):
@@ -270,31 +398,65 @@ def daemonize(logfile):
     os.dup2(0, 1)
     os.dup2(0, 2)
 
-
-def rebase_tree(url):
-    print("Rebasing on %s" % url)
-    run_cmd("git remote add -t master master %s" % url, show=True, dir=test_master)
-    run_cmd("git fetch master", show=True, dir=test_master)
+def write_pidfile(fname):
+    '''write a pid file, cleanup on exit'''
+    f = open(fname, mode='w')
+    f.write("%u\n" % os.getpid())
+    f.close()
+
+
+def rebase_tree(rebase_url, rebase_branch = "master"):
+    rebase_remote = "rebaseon"
+    print("Rebasing on %s" % rebase_url)
+    run_cmd("git describe HEAD", show=True, dir=test_master)
+    run_cmd("git remote add -t %s %s %s" %
+            (rebase_branch, rebase_remote, rebase_url),
+            show=True, dir=test_master)
+    run_cmd("git fetch %s" % rebase_remote, show=True, dir=test_master)
     if options.fix_whitespace:
-        run_cmd("git rebase --whitespace=fix master/master", show=True, dir=test_master)
+        run_cmd("git rebase --whitespace=fix %s/%s" %
+                (rebase_remote, rebase_branch),
+                show=True, dir=test_master)
     else:
-        run_cmd("git rebase master/master", show=True, dir=test_master)
-    diff = run_cmd("git --no-pager diff HEAD master/master", dir=test_master, output=True)
+        run_cmd("git rebase %s/%s" %
+                (rebase_remote, rebase_branch),
+                show=True, dir=test_master)
+    diff = run_cmd("git --no-pager diff HEAD %s/%s" %
+                   (rebase_remote, rebase_branch),
+                   dir=test_master, output=True)
     if diff == '':
-        print("No differences between HEAD and master/master - exiting")
+        print("No differences between HEAD and %s/%s - exiting" %
+              (rebase_remote, rebase_branch))
         sys.exit(0)
-
-def push_to(url):
-    print("Pushing to %s" % url)
+    run_cmd("git describe %s/%s" %
+            (rebase_remote, rebase_branch),
+            show=True, dir=test_master)
+    run_cmd("git describe HEAD", show=True, dir=test_master)
+    run_cmd("git --no-pager diff --stat HEAD %s/%s" %
+            (rebase_remote, rebase_branch),
+            show=True, dir=test_master)
+
+def push_to(push_url, push_branch = "master"):
+    push_remote = "pushto"
+    print("Pushing to %s" % push_url)
     if options.mark:
-        run_cmd("EDITOR=script/commit_mark.sh git commit --amend -c HEAD", dir=test_master)
+        run_cmd("git config --replace-all core.editor script/commit_mark.sh", dir=test_master)
+        run_cmd("git commit --amend -c HEAD", dir=test_master)
         # the notes method doesn't work yet, as metze hasn't allowed refs/notes/* in master
         # run_cmd("EDITOR=script/commit_mark.sh git notes edit HEAD", dir=test_master)
-    run_cmd("git remote add -t master pushto %s" % url, show=True, dir=test_master)
-    run_cmd("git push pushto +HEAD:master", show=True, dir=test_master)
+    run_cmd("git remote add -t %s %s %s" %
+            (push_branch, push_remote, push_url),
+            show=True, dir=test_master)
+    run_cmd("git push %s +HEAD:%s" %
+            (push_remote, push_branch),
+            show=True, dir=test_master)
 
 def_testbase = os.getenv("AUTOBUILD_TESTBASE", "/memdisk/%s" % os.getenv('USER'))
 
+gitroot = find_git_root()
+if gitroot is None:
+    raise Exception("Failed to find git root")
+
 parser = OptionParser()
 parser.add_option("", "--tail", help="show output while running", default=False, action="store_true")
 parser.add_option("", "--keeplogs", help="keep logs", default=False, action="store_true")
@@ -306,12 +468,8 @@ parser.add_option("", "--verbose", help="show all commands as they are run",
                   default=False, action="store_true")
 parser.add_option("", "--rebase", help="rebase on the given tree before testing",
                   default=None, type='str')
-parser.add_option("", "--rebase-master", help="rebase on %s before testing" % samba_master,
-                  default=False, action='store_true')
 parser.add_option("", "--pushto", help="push to a git url on success",
                   default=None, type='str')
-parser.add_option("", "--push-master", help="push to %s on success" % samba_master_ssh,
-                  default=False, action='store_true')
 parser.add_option("", "--mark", help="add a Tested-By signoff before pushing",
                   default=False, action="store_true")
 parser.add_option("", "--fix-whitespace", help="fix whitespace on rebase",
@@ -324,11 +482,16 @@ parser.add_option("", "--always-email", help="always send email, even on success
                   action="store_true")
 parser.add_option("", "--daemon", help="daemonize after initial setup",
                   action="store_true")
+parser.add_option("", "--branch", help="the branch to work on (default=master)",
+                  default="master", type='str')
+parser.add_option("", "--log-base", help="location where the logs can be found (default=cwd)",
+                  default=gitroot, type='str')
 
-
-def email_failure(status, failed_task, failed_stage, failed_tag, errstr):
+def email_failure(status, failed_task, failed_stage, failed_tag, errstr, log_base=None):
     '''send an email to options.email about the failure'''
     user = os.getenv("USER")
+    if log_base is None:
+        log_base = gitroot
     text = '''
 Dear Developer,
 
@@ -337,16 +500,27 @@ Your autobuild failed when trying to test %s with the following error:
 
 the autobuild has been abandoned. Please fix the error and resubmit.
 
+A summary of the autobuild process is here:
+
+  %s/autobuild.log
+''' % (failed_task, errstr, log_base)
+    
+    if failed_task != 'rebase':
+        text += '''
 You can see logs of the failed task here:
 
-  http://git.samba.org/%s/samba-autobuild/%s.stdout
-  http://git.samba.org/%s/samba-autobuild/%s.stderr
+  %s/%s.stdout
+  %s/%s.stderr
 
 or you can get full logs of all tasks in this job here:
 
-  http://git.samba.org/%s/samba-autobuild/logs.tar.gz
+  %s/logs.tar.gz
+
+The top commit for the tree that was built was:
 
-''' % (failed_task, errstr, user, failed_tag, user, failed_tag, user)
+%s
+
+''' % (log_base, failed_tag, log_base, failed_tag, log_base, top_commit_msg)
     msg = MIMEText(text)
     msg['Subject'] = 'autobuild failure for task %s during %s' % (failed_task, failed_stage)
     msg['From'] = 'autobuild@samba.org'
@@ -357,9 +531,11 @@ or you can get full logs of all tasks in this job here:
     s.sendmail(msg['From'], [msg['To']], msg.as_string())
     s.quit()
 
-def email_success():
+def email_success(log_base=None):
     '''send an email to options.email about a successful build'''
     user = os.getenv("USER")
+    if log_base is None:
+        log_base = gitroot
     text = '''
 Dear Developer,
 
@@ -372,9 +548,16 @@ Your autobuild has succeeded.
 
 you can get full logs of all tasks in this job here:
 
-  http://git.samba.org/%s/samba-autobuild/logs.tar.gz
+  %s/logs.tar.gz
+
+''' % log_base
+
+    text += '''
+The top commit for the tree that was built was:
+
+%s
+''' % top_commit_msg
 
-''' % (user,)
     msg = MIMEText(text)
     msg['Subject'] = 'autobuild success'
     msg['From'] = 'autobuild@samba.org'
@@ -389,15 +572,14 @@ you can get full logs of all tasks in this job here:
 (options, args) = parser.parse_args()
 
 if options.retry:
-    if not options.rebase_master and options.rebase is None:
+    if options.rebase is None:
         raise Exception('You can only use --retry if you also rebase')
 
 testbase = "%s/b%u" % (options.testbase, os.getpid())
 test_master = "%s/master" % testbase
 
-gitroot = find_git_root()
-if gitroot is None:
-    raise Exception("Failed to find git root")
+# get the top commit message, for emails
+top_commit_msg = run_cmd("git log -1", dir=gitroot, output=True)
 
 try:
     os.makedirs(testbase)
@@ -410,31 +592,41 @@ if options.daemon:
     print "Forking into the background, writing progress to %s" % logfile
     daemonize(logfile)
 
+write_pidfile(gitroot + "/autobuild.pid")
+
 while True:
     try:
         run_cmd("rm -rf %s" % test_master)
         cleanup_list.append(test_master)
-        run_cmd("git clone --shared %s %s" % (gitroot, test_master))
-    except:
+        run_cmd("git clone --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot)
+    except Exception:
         cleanup()
         raise
 
     try:
-        if options.rebase is not None:
-            rebase_tree(options.rebase)
-        elif options.rebase_master:
-            rebase_tree(samba_master)
-        blist = buildlist(tasks, args)
+        try:
+            if options.rebase is not None:
+                rebase_tree(options.rebase, rebase_branch=options.branch)
+        except Exception:
+            cleanup_list.append(gitroot + "/autobuild.pid")
+            cleanup()
+            email_failure(-1, 'rebase', 'rebase', 'rebase',
+                          'rebase on %s failed' % options.branch,
+                          log_base=options.log_base)
+            sys.exit(1)
+        blist = buildlist(tasks, args, options.rebase, rebase_branch=options.branch)
         if options.tail:
             blist.start_tail()
         (status, failed_task, failed_stage, failed_tag, errstr) = blist.run()
         if status != 0 or errstr != "retry":
             break
         cleanup()
-    except:
+    except Exception:
         cleanup()
         raise
 
+cleanup_list.append(gitroot + "/autobuild.pid")
+
 blist.kill_kids()
 if options.tail:
     print("waiting for tail to flush")
@@ -446,14 +638,12 @@ if status == 0:
         print("Running passcmd: %s" % options.passcmd)
         run_cmd(options.passcmd, dir=test_master)
     if options.pushto is not None:
-        push_to(options.pushto)
-    elif options.push_master:
-        push_to(samba_master_ssh)
+        push_to(options.pushto, push_branch=options.branch)
     if options.keeplogs:
         blist.tarlogs("logs.tar.gz")
         print("Logs in logs.tar.gz")
     if options.always_email:
-        email_success()
+        email_success(log_base=options.log_base)
     blist.remove_logs()
     cleanup()
     print(errstr)
@@ -463,7 +653,7 @@ if status == 0:
 blist.tarlogs("logs.tar.gz")
 
 if options.email is not None:
-    email_failure(status, failed_task, failed_stage, failed_tag, errstr)
+    email_failure(status, failed_task, failed_stage, failed_tag, errstr, log_base=options.log_base)
 
 cleanup()
 print(errstr)