("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") ],
+ ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain") ],
"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") ],
+ ("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") ],
"lib/tdb" : [ ("autogen", "./autogen-waf.sh", "text/plain"),
("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
return
(self.stage, self.cmd, self.output_mime_type) = self.sequence[self.next]
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"))
+# 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))
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:
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):
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)
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)
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
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'
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'
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:
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)
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()
cleanup()
raise
+cleanup_list.append(gitroot + "/autobuild.pid")
+
blist.kill_kids()
if options.tail:
print("waiting for tail to flush")