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'
cleanup_list = []
builddirs = {
- "samba3" : "source3",
- "samba3-ctdb" : "source3",
+ "ctdb" : "ctdb",
"samba" : ".",
"samba-ctdb" : ".",
"samba-libs" : ".",
"retry" : "."
}
-defaulttasks = [ "samba3", "samba3-ctdb", "samba", "samba-ctdb", "samba-libs", "ldb", "tdb", "ntdb", "talloc", "replace", "tevent", "pidl" ]
+defaulttasks = [ "ctdb", "samba", "samba-ctdb", "samba-libs", "ldb", "tdb", "ntdb", "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") ],
-
- "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") ],
+ "ctdb" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+ ("autogen", "./autogen.sh", "text/plain"),
+ ("configure", "./configure ${PREFIX} --enable-socket-wrapper ", "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 ${PREFIX} ${PERL_VENDOR_LIB} --with-selftest-prefix=./bin/ab", "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1", "text/plain"),
("install", "make install", "text/plain"),
("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"),
+ # build and install ctdb:
+ ("ctdb-autogen", "cd ./ctdb && ./autogen.sh", "text/plain"),
+ ("ctdb-configure", "cd ./ctdb && ./configure ${PREFIX} --enable-socket-wrapper --with-included-tdb=no", "text/plain"),
+ ("ctdb-make", "cd ./ctdb && make all", "text/plain"),
+ ("ctdb-install", "cd ./ctdb && make install", "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 against this ctdb:
+ ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure.developer ${PREFIX} ${PERL_VENDOR_LIB} --with-selftest-prefix=./bin/ab --with-cluster-support --with-ctdb-dir=${PREFIX_DIR} --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"),
+
+ # 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"),
("tdb-make", "cd lib/tdb && make", "text/plain"),
("tdb-install", "cd lib/tdb && make install", "text/plain"),
+ ("ntdb-configure", "cd lib/ntdb && 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"),
+ ("ntdb-make", "cd lib/ntdb && make", "text/plain"),
+ ("ntdb-install", "cd lib/ntdb && 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-make", "cd lib/tevent && make", "text/plain"),
("tevent-install", "cd lib/tevent && make install", "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", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ntdb,!pyntdb,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX} ${PERL_VENDOR_LIB}", "text/plain"),
("make", "make", "text/plain"),
- ("install", "make install", "text/plain")],
+ ("install", "make install", "text/plain"),
+ ("dist", "make dist", "text/plain")],
"ldb" : [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(standard_lib=1, prefix=self.prefix))
self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix)
self.cmd = self.cmd.replace("${PREFIX_DIR}", "%s" % self.prefix)
+ self.cmd = self.cmd.replace("${PERL_VENDOR_LIB}", "--with-perl-vendorlib=%s/share/perl5" % 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)
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")
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",
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=None, type='str')
+ 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,
'''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,
(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)
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()
'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()
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")
git.samba.org / metze / samba / wip.git / blobdiff