build: a more portable way of finding waf in makefiles

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

diff --git a/script/autobuild.py b/script/autobuild.py
index 62117ec6508e12aaa2f50d34e91c0dd122a91906..a124ddfd787e650b1ac40e3abd4aeeebc848c952 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -24,16 +24,18 @@ tasks = {
                   ("install", "make install", "text/plain"),
                   ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain") ],
 
+    # We have 'test' before 'install' because, 'test' should work without 'install'
     "source4" : [ ("configure", "./configure.developer ${PREFIX}", "text/plain"),
                   ("make", "make -j", "text/plain"),
-                  ("install", "make install", "text/plain"),
-                  ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain") ],
+                  ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain"),
+                  ("install", "make install", "text/plain") ],
 
     "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") ],
+                          ("test", "TDB_NO_FSYNC=1 make test", "text/plain") ],
 
+    # We don't use TDB_NO_FSYNC=1 here, because we want to test the transaction code
     "lib/tdb" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
                   ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
                   ("make", "make -j", "text/plain"),
@@ -215,6 +217,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):
@@ -271,6 +275,12 @@ def daemonize(logfile):
     os.dup2(0, 1)
     os.dup2(0, 2)
 
+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(url):
     print("Rebasing on %s" % url)
@@ -288,7 +298,8 @@ def rebase_tree(url):
 def push_to(url):
     print("Pushing to %s" % 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)
@@ -338,6 +349,13 @@ 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:
+
+  http://git.samba.org/%s/samba-autobuild/autobuild.log
+''' % (failed_task, errstr, user)
+    
+    if failed_task != 'rebase':
+        text += '''
 You can see logs of the failed task here:
 
   http://git.samba.org/%s/samba-autobuild/%s.stdout
@@ -347,7 +365,11 @@ or you can get full logs of all tasks in this job here:
 
   http://git.samba.org/%s/samba-autobuild/logs.tar.gz
 
-''' % (failed_task, errstr, user, failed_tag, user, failed_tag, user)
+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'
@@ -375,7 +397,14 @@ you can get full logs of all tasks in this job here:
 
   http://git.samba.org/%s/samba-autobuild/logs.tar.gz
 
-''' % (user,)
+''' % user
+
+    text += '''
+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'
@@ -400,6 +429,9 @@ 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)
 except Exception, reason:
@@ -411,6 +443,8 @@ 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)
@@ -421,10 +455,14 @@ while True:
         raise
 
     try:
-        if options.rebase is not None:
-            rebase_tree(options.rebase)
-        elif options.rebase_master:
-            rebase_tree(samba_master)
+        try:
+            if options.rebase is not None:
+                rebase_tree(options.rebase)
+            elif options.rebase_master:
+                rebase_tree(samba_master)
+        except:
+            email_failure(-1, 'rebase', 'rebase', 'rebase', 'rebase on master failed')
+            sys.exit(1)
         blist = buildlist(tasks, args)
         if options.tail:
             blist.start_tail()
@@ -436,6 +474,8 @@ while True:
         cleanup()
         raise
 
+cleanup_list.append(gitroot + "/autobuild.pid")
+
 blist.kill_kids()
 if options.tail:
     print("waiting for tail to flush")