script/autobuild.py: test some --with-{static,shared}-modules combinations
[vlendec/samba-autobuild/.git] / script / autobuild.py
index 6e1de9e7281db8d9fb4890bcc21e3a95686512a5..2b939eb98263f140a9bbac831be527da0bc8d6c1 100755 (executable)
@@ -7,11 +7,13 @@ from subprocess import call, check_call,Popen, PIPE
 import os, tarfile, sys, time
 from optparse import OptionParser
 import smtplib
+import email
 from email.mime.text import MIMEText
+from email.mime.base import MIMEBase
+from email.mime.application import MIMEApplication
+from email.mime.multipart import MIMEMultipart
 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')
+import platform
 
 # This speeds up testing remarkably.
 os.environ['TDB_NO_FSYNC'] = '1'
@@ -19,14 +21,13 @@ os.environ['TDB_NO_FSYNC'] = '1'
 cleanup_list = []
 
 builddirs = {
-    "samba3"  : "source3",
-    "samba3-ctdb" : "source3",
+    "ctdb"    : "ctdb",
     "samba"  : ".",
+    "samba-xc" : ".",
     "samba-ctdb" : ".",
     "samba-libs"  : ".",
     "ldb"     : "lib/ldb",
     "tdb"     : "lib/tdb",
-    "ntdb"    : "lib/ntdb",
     "talloc"  : "lib/talloc",
     "replace" : "lib/replace",
     "tevent"  : "lib/tevent",
@@ -36,39 +37,43 @@ builddirs = {
     "retry"   : "."
     }
 
-defaulttasks = [ "samba3", "samba3-ctdb", "samba", "samba-ctdb", "samba-libs", "ldb", "tdb", "ntdb", "talloc", "replace", "tevent", "pidl" ]
+defaulttasks = [ "ctdb", "samba", "samba-xc", "samba-ctdb", "samba-libs", "ldb", "tdb", "talloc", "replace", "tevent", "pidl" ]
 
-tasks = {
-    "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") ],
+samba_configure_params = " --picky-developer ${PREFIX} --with-profiling-data"
 
-    "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") ],
+samba_libs_envvars =  "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH"
+samba_libs_envvars += " PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig"
+samba_libs_envvars += " ADDITIONAL_CFLAGS='-Wmissing-prototypes'"
+samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check --enable-debug --picky-developer -C ${PREFIX}"
+samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=NONE"
+samba_libs_configure_samba = samba_libs_configure_base + " --bundled-libraries=!talloc,!tdb,!pytdb,!ldb,!pyldb,!tevent,!pytevent"
+
+tasks = {
+    "ctdb" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+               ("configure", "./configure ${PREFIX}", "text/plain"),
+               ("make", "make all", "text/plain"),
+               ("install", "make install", "text/plain"),
+               ("test", "make autotest", "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"),
+    "samba" : [ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "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") ],
 
+    # Test cross-compile infrastructure
+    "samba-xc" : [ ("configure-native", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+                   ("configure-cross-execute", "./configure.developer -b ./bin-xe --cross-compile --cross-execute=script/identity_cc.sh" \
+                    " --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xe/ab" + samba_configure_params, "text/plain"),
+                   ("configure-cross-answers", "./configure.developer -b ./bin-xa --cross-compile" \
+                    " --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xa/ab" + samba_configure_params, "text/plain"),
+                   ("compare-results", "script/compare_cc_results.py ./bin/c4che/default.cache.py ./bin-xe/c4che/default.cache.py ./bin-xa/c4che/default.cache.py", "text/plain")],
+
+
     "samba-ctdb" : [ ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
 
                      # make sure we have tdb around:
@@ -76,38 +81,56 @@ tasks = {
                      ("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"),
+                     # build samba with cluster support (also building ctdb):
+                     ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure.developer --picky-developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --bundled-libraries=!tdb", "text/plain"),
+                     ("samba-make", "make", "text/plain"),
+                     ("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"),
+                     ("samba-install", "make install", "text/plain"),
+                     ("ctdb-check", "test -e ${PREFIX_DIR}/sbin/ctdbd", "text/plain"),
+
+                     # clean up:
                      ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-                     ("clean", "make clean", "text/plain") ],
+                     ("clean", "make clean", "text/plain"),
+                     ("ctdb-clean", "cd ./ctdb && 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-configure", "cd lib/talloc && " + samba_libs_configure_libs, "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-configure", "cd lib/tdb && " + samba_libs_configure_libs, "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-configure", "cd lib/tevent && " + samba_libs_configure_libs, "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-configure", "cd lib/ldb && " + samba_libs_configure_libs, "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"),
+                      ("configure", samba_libs_configure_samba, "text/plain"),
                       ("make", "make", "text/plain"),
-                      ("install", "make install", "text/plain")],
+                      ("install", "make install", "text/plain"),
+                      ("dist", "make dist", "text/plain"),
+
+                      # retry with all modules shared
+                      ("allshared-distclean", "make distclean", "text/plain"),
+                      ("allshared-configure", samba_libs_configure_samba + " --with-shared-modules=ALL", "text/plain"),
+                      ("allshared-make", "make", "text/plain"),
+
+                      # retry with all modules static
+                      ("allstatic-distclean", "make distclean", "text/plain"),
+                      ("allstatic-configure", samba_libs_configure_samba + " --with-static-modules=ALL", "text/plain"),
+                      ("allstatic-make", "make", "text/plain"),
+
+                      # retry without any required modules
+                      ("none-distclean", "make distclean", "text/plain"),
+                      ("none-configure", samba_libs_configure_samba + " --with-static-modules=!FORCED,!DEFAULT --with-shared-modules=!FORCED,!DEFAULT", "text/plain"),
+                      ("none-make", "make", "text/plain")],
 
     "ldb" : [
               ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
@@ -129,16 +152,6 @@ tasks = {
               ("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"),
@@ -176,6 +189,7 @@ tasks = {
                ("make", "make", "text/plain"),
                ("test", "make test", "text/plain"),
                ("install", "make install", "text/plain"),
+               ("checkout-yapp-generated", "git checkout lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm", "text/plain"),
                ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
                ("clean", "make clean", "text/plain") ],
 
@@ -223,7 +237,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" % (test_master, self.sdir), dir=test_master, show=True)
+        run_cmd("git clone --recursive --shared %s %s" % (test_master, self.sdir), dir=test_master, show=True)
         self.start_next()
 
     def start_next(self):
@@ -256,6 +270,11 @@ class buildlist(object):
         self.retry = None
         if tasknames == []:
             tasknames = defaulttasks
+        else:
+            # If we are only running one test,
+            # do not sleep randomly to wait for it to start
+            os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
+
         for n in tasknames:
             b = builder(n, tasks[n])
             self.tlist.append(b)
@@ -417,11 +436,11 @@ def rebase_tree(rebase_url, rebase_branch = "master"):
             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 %s/%s" %
+        run_cmd("git rebase --force-rebase --whitespace=fix %s/%s" %
                 (rebase_remote, rebase_branch),
                 show=True, dir=test_master)
     else:
-        run_cmd("git rebase %s/%s" %
+        run_cmd("git rebase --force-rebase %s/%s" %
                 (rebase_remote, rebase_branch),
                 show=True, dir=test_master)
     diff = run_cmd("git --no-pager diff HEAD %s/%s" %
@@ -439,18 +458,27 @@ def rebase_tree(rebase_url, rebase_branch = "master"):
             (rebase_remote, rebase_branch),
             show=True, dir=test_master)
 
-def push_to(url):
-    print("Pushing to %s" % url)
+def push_to(push_url, push_branch = "master"):
+    push_remote = "pushto"
+    print("Pushing to %s" % push_url)
     if options.mark:
         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")
@@ -462,12 +490,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",
@@ -476,72 +500,106 @@ parser.add_option("", "--retry", help="automatically retry if master changes",
                   default=False, action="store_true")
 parser.add_option("", "--email", help="send email to the given address on failure",
                   type='str', default=None)
+parser.add_option("", "--email-from", help="send email from the given address",
+                  type='str', default="autobuild@samba.org")
+parser.add_option("", "--email-server", help="send email via the given server",
+                  type='str', default='localhost')
 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')
+parser.add_option("", "--attach-logs", help="Attach logs to mails sent on success/failure?",
+                  default=False, action="store_true")
 
+def send_email(subject, text, log_tar):
+    outer = MIMEMultipart()
+    outer['Subject'] = subject
+    outer['To'] = options.email
+    outer['From'] = options.email_from
+    outer['Date'] = email.utils.formatdate(localtime = True)
+    outer.preamble = 'Autobuild mails are now in MIME because we optionally attach the logs.\n'
+    outer.attach(MIMEText(text, 'plain'))
+    if options.attach_logs:
+        fp = open(log_tar, 'rb')
+        msg = MIMEApplication(fp.read(), 'gzip', email.encoders.encode_base64)
+        fp.close()
+        # Set the filename parameter
+        msg.add_header('Content-Disposition', 'attachment', filename=os.path.basename(log_tar))
+        outer.attach(msg)
+    content = outer.as_string()
+    s = smtplib.SMTP(options.email_server)
+    s.sendmail(options.email_from, [options.email], content)
+    s.set_debuglevel(1)
+    s.quit()
 
-def email_failure(status, failed_task, failed_stage, failed_tag, errstr):
+def email_failure(status, failed_task, failed_stage, failed_tag, errstr,
+                  elapsed_time, log_base=None):
     '''send an email to options.email about the failure'''
+    elapsed_minutes = elapsed_time / 60.0
     user = os.getenv("USER")
+    if log_base is None:
+        log_base = gitroot
     text = '''
 Dear Developer,
 
-Your autobuild failed when trying to test %s with the following error:
+Your autobuild on %s failed after %.1f minutes
+when trying to test %s with the following error:
+
    %s
 
 the autobuild has been abandoned. Please fix the error and resubmit.
 
 A summary of the autobuild process is here:
 
-  http://git.samba.org/%s/samba-autobuild/autobuild.log
-''' % (failed_task, errstr, user)
-    
+  %s/autobuild.log
+''' % (platform.node(), elapsed_minutes, 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:
 
 %s
 
-''' % (user, failed_tag, user, failed_tag, user, top_commit_msg)
-    msg = MIMEText(text)
-    msg['Subject'] = 'autobuild failure for task %s during %s' % (failed_task, failed_stage)
-    msg['From'] = 'autobuild@samba.org'
-    msg['To'] = options.email
+''' % (log_base, failed_tag, log_base, failed_tag, log_base, top_commit_msg)
 
-    s = smtplib.SMTP()
-    s.connect()
-    s.sendmail(msg['From'], [msg['To']], msg.as_string())
-    s.quit()
+    logs = os.path.join(gitroot, 'logs.tar.gz')
+    send_email('autobuild failure on %s for task %s during %s'
+               % (platform.node(), failed_task, failed_stage),
+               text, logs)
 
-def email_success():
+def email_success(elapsed_time, 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,
 
-Your autobuild has succeeded.
+Your autobuild on %s has succeeded after %.1f minutes.
 
-'''
+''' % (platform.node(), elapsed_time / 60.)
 
     if options.keeplogs:
         text += '''
 
 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
 
-''' % user
+''' % log_base
 
     text += '''
 The top commit for the tree that was built was:
@@ -549,30 +607,20 @@ The top commit for the tree that was built was:
 %s
 ''' % top_commit_msg
 
-    msg = MIMEText(text)
-    msg['Subject'] = 'autobuild success'
-    msg['From'] = 'autobuild@samba.org'
-    msg['To'] = options.email
-
-    s = smtplib.SMTP()
-    s.connect()
-    s.sendmail(msg['From'], [msg['To']], msg.as_string())
-    s.quit()
+    logs = os.path.join(gitroot, 'logs.tar.gz')
+    send_email('autobuild sucess on %s ' % platform.node(),
+               text, logs)
 
 
 (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)
 
@@ -589,11 +637,13 @@ if options.daemon:
 
 write_pidfile(gitroot + "/autobuild.pid")
 
+start_time = time.time()
+
 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), show=True, dir=gitroot)
+        run_cmd("git clone --recursive --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot)
     except Exception:
         cleanup()
         raise
@@ -601,19 +651,16 @@ while True:
     try:
         try:
             if options.rebase is not None:
-                rebase_url = options.rebase
-            elif options.rebase_master:
-                rebase_url = samba_master
-            else:
-                rebase_url = None
-            if rebase_url is not None:
-                rebase_tree(rebase_url)
+                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 master failed')
+            elapsed_time = time.time() - start_time
+            email_failure(-1, 'rebase', 'rebase', 'rebase',
+                          'rebase on %s failed' % options.branch,
+                          elapsed_time, log_base=options.log_base)
             sys.exit(1)
-        blist = buildlist(tasks, args, rebase_url)
+        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()
@@ -631,20 +678,19 @@ if options.tail:
     print("waiting for tail to flush")
     time.sleep(1)
 
+elapsed_time = time.time() - start_time
 if status == 0:
     print errstr
     if options.passcmd is not None:
         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)
-    if options.keeplogs:
+        push_to(options.pushto, push_branch=options.branch)
+    if options.keeplogs or options.attach_logs:
         blist.tarlogs("logs.tar.gz")
         print("Logs in logs.tar.gz")
     if options.always_email:
-        email_success()
+        email_success(elapsed_time, log_base=options.log_base)
     blist.remove_logs()
     cleanup()
     print(errstr)
@@ -654,7 +700,8 @@ 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,
+                  elapsed_time, log_base=options.log_base)
 
 cleanup()
 print(errstr)