script/autobuild.py: set the default for --log-base to the current gitroot

[sfrench/samba-autobuild/.git] / script / autobuild.py

diff --git a/script/autobuild.py b/script/autobuild.py
index ec1868ad4752f75554daea98ce6eed94aab20d7c..efef2f4246bd2d3ba2e3d0ed4358ded01830cbe3 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -10,9 +10,6 @@ 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'
 
@@ -456,6 +453,10 @@ def push_to(push_url, push_branch = "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")
@@ -467,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",
@@ -487,12 +484,14 @@ 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, log_base=None):
     '''send an email to options.email about the failure'''
     user = os.getenv("USER")
     if log_base is None:
-        log_base = "http://git.samba.org/%s/samba-autobuild" % user
+        log_base = gitroot
     text = '''
 Dear Developer,
 
@@ -536,7 +535,7 @@ 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 = "http://git.samba.org/%s/samba-autobuild" % user
+        log_base = gitroot
     text = '''
 Dear Developer,
 
@@ -573,16 +572,12 @@ The top commit for the tree that was built was:
 (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)
 
@@ -611,20 +606,15 @@ 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_branch=options.branch)
+                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)
+                          'rebase on %s failed' % options.branch,
+                          log_base=options.log_base)
             sys.exit(1)
-        blist = buildlist(tasks, args, rebase_url, rebase_branch=options.branch)
+        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()
@@ -649,13 +639,11 @@ if status == 0:
         run_cmd(options.passcmd, dir=test_master)
     if options.pushto is not None:
         push_to(options.pushto, push_branch=options.branch)
-    elif options.push_master:
-        push_to(samba_master_ssh, 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)
@@ -665,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)