cleanup_list = []
-os.putenv('CC', "ccache gcc")
+builddirs = {
+ "samba3" : "source3",
+ "samba4" : ".",
+ "ldb" : "lib/ldb",
+ "tdb" : "lib/tdb",
+ "talloc" : "lib/talloc",
+ "replace" : "lib/replace",
+ "tevent" : "lib/tevent",
+ "pidl" : "pidl",
+ "pass" : ".",
+ "fail" : ".",
+ "retry" : "."
+ }
+
+defaulttasks = [ "samba3", "samba4", "ldb", "tdb", "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"),
- ("configure", "./configure --enable-developer -C ${PREFIX}", "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 -j 4 bin/smbtorture4", "text/plain"),
+ ("make everything", "make -j 4 everything", "text/plain"),
+ ("install", "make install", "text/plain"),
+ ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "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'
+ "samba4" : [ ("configure", "./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab", "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "TDB_NO_FSYNC=1 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") ],
+
+ "ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("install", "make install", "text/plain"),
+ ("test", "TDB_NO_FSYNC=1 make test", "text/plain"),
+ ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
+ ("distcheck", "make distcheck", "text/plain"),
+ ("clean", "make clean", "text/plain") ],
+
+ # We don't use TDB_NO_FSYNC=1 here, because we want to test the transaction code
+ "tdb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ ("make", "make -j", "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" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ ("make", "make -j", "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" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
("make", "make -j", "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" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ ("make", "make -j", "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" : [ ("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
+retry_task = [ ( "retry",
+ '''set -e
git remote add -t master master %s
git fetch master
while :; do
git describe master/master > master.desc
diff old_master.desc master.desc
done
- ''' % samba_master]
+ ''' % samba_master, "test/plain" ) ]
def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
if show is None:
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
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):
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"))
+ 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))
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 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)
+ run_cmd("git describe HEAD", show=True, dir=test_master)
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)
if options.fix_whitespace:
if diff == '':
print("No differences between HEAD and master/master - exiting")
sys.exit(0)
+ run_cmd("git describe master/master", show=True, dir=test_master)
+ run_cmd("git describe HEAD", show=True, dir=test_master)
+ run_cmd("git --no-pager diff --stat HEAD master/master", show=True, dir=test_master)
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)
cleanup_list.append(test_master)
- run_cmd("git clone --shared %s %s" % (gitroot, test_master))
+ run_cmd("git clone --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot)
except:
cleanup()
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")