# This speeds up testing remarkably.
os.environ['TDB_NO_FSYNC'] = '1'
+
+def find_git_root():
+ '''get to the top of the git repo'''
+ p = os.getcwd()
+ while p != '/':
+ if os.path.isdir(os.path.join(p, ".git")):
+ return p
+ p = os.path.abspath(os.path.join(p, '..'))
+ return None
+
+
+gitroot = find_git_root()
+if gitroot is None:
+ raise Exception("Failed to find git root")
+
+
+def_testbase = os.getenv("AUTOBUILD_TESTBASE", "/memdisk/%s" % os.getenv('USER'))
+
+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")
+parser.add_option("", "--nocleanup", help="don't remove test tree", default=False, action="store_true")
+parser.add_option("", "--testbase", help="base directory to run tests in (default %s)" % def_testbase,
+ default=def_testbase)
+parser.add_option("", "--passcmd", help="command to run on success", default=None)
+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("", "--pushto", help="push to a git url on success",
+ default=None, type='str')
+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",
+ default=False, action="store_true")
+parser.add_option("", "--retry", help="automatically retry if master changes",
+ default=False, action="store_true")
+parser.add_option("", "--email", help="send email to the given address on failure",
+ type='str', default=None)
+parser.add_option("", "--email-from", help="send email from the given address",
+ type='str', default="autobuild@samba.org")
+parser.add_option("", "--email-server", help="send email via the given server",
+ type='str', default='localhost')
+parser.add_option("", "--always-email", help="always send email, even on success",
+ action="store_true")
+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')
+parser.add_option("", "--attach-logs", help="Attach logs to mails sent on success/failure?",
+ default=False, action="store_true")
+parser.add_option("", "--restrict-tests", help="run as make test with this TESTS= regex",
+ default='')
+parser.add_option("--enable-coverage", dest='enable_coverage',
+ action="store_const", const='--enable-coverage', default='',
+ help="Add --enable-coverage option while configure")
+
+(options, args) = parser.parse_args()
+
+if options.retry:
+ 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
+test_prefix = "%s/prefix" % testbase
+test_tmpdir = "%s/tmp" % testbase
+os.environ['TMPDIR'] = test_tmpdir
+
+
cleanup_list = []
builddirs = {
"samba": ".",
"samba-nt4": ".",
"samba-fileserver": ".",
+ "samba-ad-member": ".",
"samba-xc": ".",
"samba-o3": ".",
"samba-ctdb": ".",
"samba-libs": ".",
"samba-static": ".",
"samba-none-env": ".",
- "samba-ad-dc": ".",
- "samba-ad-dc-ntvfs": ".",
+ "samba-ad-dc-1": ".",
"samba-ad-dc-2": ".",
+ "samba-ad-dc-3": ".",
+ "samba-ad-dc-4": ".",
+ "samba-ad-dc-5": ".",
+ "samba-ad-dc-6": ".",
+ "samba-ad-dc-ntvfs": ".",
"samba-ad-dc-backup": ".",
"samba-systemkrb5": ".",
"samba-nopython": ".",
"samba-nopython-py2": ".",
+ "samba-schemaupgrade": ".",
"ldb": "lib/ldb",
"tdb": "lib/tdb",
"talloc": "lib/talloc",
samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bundled_libs
tasks = {
- "ctdb": [("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+ "ctdb": [("random-sleep", "../script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure " + ctdb_configure_params, "text/plain"),
("make", "make all", "text/plain"),
("install", "make install", "text/plain"),
# We have 'test' before 'install' because, 'test' should work without 'install (runs all the other envs)'
"samba": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
"TESTS='--exclude-env=none "
"--exclude-env=nt4_dc "
+ "--exclude-env=nt4_dc_schannel "
"--exclude-env=nt4_member "
"--exclude-env=ad_dc "
"--exclude-env=ad_dc_backup "
"--exclude-env=ad_dc_default "
"--exclude-env=ad_dc_slowtests "
"--exclude-env=ad_dc_no_nss "
+ "--exclude-env=ad_dc_no_ntlm "
"--exclude-env=fl2003dc "
"--exclude-env=fl2008dc "
"--exclude-env=fl2008r2dc "
"--exclude-env=ad_member "
"--exclude-env=ad_member_idmap_rid "
"--exclude-env=ad_member_idmap_ad "
+ "--exclude-env=ad_member_rfc2307 "
"--exclude-env=chgdcpass "
"--exclude-env=vampire_2000_dc "
"--exclude-env=fl2000dc "
"--exclude-env=fileserver "
+ "--exclude-env=maptoguest "
+ "--exclude-env=simpleserver "
"--exclude-env=backupfromdc "
"--exclude-env=restoredc "
"--exclude-env=renamedc "
"--exclude-env=offlinebackupdc "
"--exclude-env=labdc "
+ "--exclude-env=preforkrestartdc "
+ "--exclude-env=proclimitdc "
+ "--exclude-env=promoted_dc "
+ "--exclude-env=vampire_dc "
+ "--exclude-env=rodc "
+ "--exclude-env=ad_dc_default "
+ "--exclude-env=ad_dc_slowtests "
+ "--exclude-env=schema_pair_dc "
+ "--exclude-env=schema_dc "
"'",
"text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
- "samba-nt4": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-nt4": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --without-ads --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
- "TESTS='--include-env=nt4_dc --include-env=nt4_member'", "text/plain"),
+ "TESTS='"
+ "--include-env=nt4_dc "
+ "--include-env=nt4_dc_schannel "
+ "--include-env=nt4_member "
+ "'", "text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
- "samba-fileserver": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-fileserver": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
- "TESTS='--include-env=fileserver'", "text/plain"),
+ "TESTS='"
+ "--include-env=fileserver "
+ "--include-env=maptoguest "
+ "--include-env=simpleserver "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
- "samba-ad-dc": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-ad-member": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=ad_member "
+ "--include-env=ad_member_idmap_rid "
+ "--include-env=ad_member_idmap_ad "
+ "--include-env=ad_member_rfc2307 "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-1": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
"TESTS='--include-env=ad_dc "
- "--include-env=ad_dc_backup "
- "--include-env=fl2003dc "
- "--include-env=fl2008r2dc "
- "--include-env=ad_member "
- "--include-env=ad_member_idmap_rid "
- "--include-env=ad_member_idmap_ad'", "text/plain"),
+ "--include-env=ad_dc_no_nss "
+ "--include-env=ad_dc_no_ntlm "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
- "samba-ad-dc-2": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-ad-dc-2": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
- "TESTS='--include-env=chgdcpass "
+ "TESTS='"
+ "--include-env=vampire_dc "
"--include-env=vampire_2000_dc "
+ "--include-env=rodc "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-3": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=promoted_dc "
+ "--include-env=chgdcpass "
+ "--include-env=preforkrestartdc "
+ "--include-env=proclimitdc "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-4": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
"--include-env=fl2000dc "
- "--include-env=ad_dc_no_nss "
- "'",
- "text/plain"),
+ "--include-env=fl2003dc "
+ "--include-env=fl2008dc "
+ "--include-env=fl2008r2dc "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-5": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=ad_dc_default "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-6": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=ad_dc_slowtests "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+
+ "samba-schemaupgrade": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=schema_dc "
+ "--include-env=schema_pair_dc "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
# We split out the ad_dc_ntvfs tests (which are long) so other test do not wait
("test", "make test FAIL_IMMEDIATELY=1 "
"TESTS='"
"--include-env=ad_dc_ntvfs "
- "--include-env=fl2008dc "
- "--include-env=ad_dc_default "
- "--include-env=ad_dc_slowtests "
"'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
# run the backup/restore testenvs separately as they're fairly standalone
# (and CI seems to max out at ~8 different DCs running at once)
- "samba-ad-dc-backup": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-ad-dc-backup": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
"--include-env=renamedc "
"--include-env=offlinebackupdc "
"--include-env=labdc "
- "'",
- "text/plain"),
+ "--include-env=ad_dc_backup "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
"samba-test-only": [("configure", "./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"),
("test", 'make test FAIL_IMMEDIATELY=1 TESTS="${TESTS}"', "text/plain")],
# Test cross-compile infrastructure
- "samba-xc": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-xc": [("random-sleep", "script/random-sleep.sh 900 1500", "text/plain"),
("configure-native", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("configure-cross-execute", "./configure.developer --out ./bin-xe --cross-compile --cross-execute=script/identity_cc.sh" \
" --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xe/ab" + samba_configure_params, "text/plain"),
"./bin-xa/c4che/default{}".format(*([CACHE_SUFFIX]*3)), "text/plain")],
# test build with -O3 -- catches extra warnings and bugs, tests the ad_dc environments
- "samba-o3": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-o3": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "ADDITIONAL_CFLAGS='-O3 -Wp,-D_FORTIFY_SOURCE=2' ./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make quicktest FAIL_IMMEDIATELY=1 "
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
- "samba-ctdb": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-ctdb": [("random-sleep", "script/random-sleep.sh 900 1500", "text/plain"),
# make sure we have tdb around:
("tdb-configure", "cd lib/tdb && PYTHONPATH=${PYTHON_PREFIX}:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
("ctdb-clean", "cd ./ctdb && make clean", "text/plain")],
"samba-libs": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("talloc-configure", "cd lib/talloc && " + samba_libs_configure_libs, "text/plain"),
("talloc-make", "cd lib/talloc && make", "text/plain"),
("talloc-install", "cd lib/talloc && make install", "text/plain"),
("allshared-make", "make -j", "text/plain")],
"samba-none-env": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test "
"text/plain")],
"samba-static": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
# build with all modules static
("allstatic-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=ALL", "text/plain"),
("allstatic-make", "make -j", "text/plain"),
("nonshared-make", "make -j", "text/plain")],
"samba-systemkrb5": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
- ("configure", "./configure.developer " + samba_configure_params + " --with-system-mitkrb5 --without-ad-dc", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 900 1500", "text/plain"),
+ ("configure", "./configure.developer " + samba_configure_params + " --with-system-mitkrb5 --with-experimental-mit-ad-dc", "text/plain"),
("make", "make -j", "text/plain"),
# we currently cannot run a full make test, a limited list of tests could be run
# via "make test TESTS=sometests"
# support this environment). The target here is for vendors
# shipping a minimal smbd.
"samba-nopython": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc", "text/plain"),
("make", "make -j", "text/plain"),
("install", "make install", "text/plain"),
+ ("find-python", "script/find_python.sh ${PREFIX}", "text/plain"),
("test", "make test-nopython", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain"),
# check we can do the same thing using python2
"samba-nopython-py2": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "PYTHON=python2 ./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc", "text/plain"),
("make", "PYTHON=python2 make -j", "text/plain"),
("install", "PYTHON=python2 make install", "text/plain"),
+ ("find-python", "script/find_python.sh ${PREFIX}", "text/plain"),
("test", "make test-nopython", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "PYTHON=python2 make clean", "text/plain"),
self.stdout = open(self.stdout_path, 'w')
self.stderr = open(self.stderr_path, 'w')
self.stdin = open("/dev/null", 'r')
- self.sdir = "%s/%s" % (testbase, self.tag)
+ self.test_source_dir = "%s/%s" % (testbase, self.tag)
self.prefix = "%s/%s" % (test_prefix, self.tag)
- run_cmd("rm -rf %s" % self.sdir)
+ run_cmd("rm -rf %s" % self.test_source_dir)
run_cmd("rm -rf %s" % self.prefix)
if cp:
- run_cmd("cp --recursive --link --archive %s %s" % (test_master, self.sdir), dir=test_master, show=True)
+ run_cmd("cp --recursive --link --archive %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True)
else:
- run_cmd("git clone --recursive --shared %s %s" % (test_master, self.sdir), dir=test_master, show=True)
+ run_cmd("git clone --recursive --shared %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True)
self.start_next()
def start_next(self):
if self.next == len(self.sequence):
if not options.nocleanup:
- run_cmd("rm -rf %s" % self.sdir)
+ run_cmd("rm -rf %s" % self.test_source_dir)
run_cmd("rm -rf %s" % self.prefix)
do_print('%s: Completed OK' % self.name)
self.done = True
# if self.output_mime_type == "text/x-subunit":
# self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
cwd = os.getcwd()
- os.chdir("%s/%s" % (self.sdir, self.dir))
+ os.chdir("%s/%s" % (self.test_source_dir, self.dir))
do_print('%s: [%s] Running %s in %r' % (self.name, self.stage, self.cmd, os.getcwd()))
self.proc = Popen(self.cmd, shell=True,
close_fds=True,
self.retry = None
for b in self.tlist:
if b.proc is not None:
- run_cmd("killbysubdir %s > /dev/null 2>&1" % b.sdir, checkfail=False)
+ run_cmd("killbysubdir %s > /dev/null 2>&1" % b.test_source_dir, checkfail=False)
b.proc.terminate()
b.proc.wait()
b.proc = None
run_cmd("rm -rf %s" % d)
-def find_git_root():
- '''get to the top of the git repo'''
- p = os.getcwd()
- while p != '/':
- if os.path.isdir(os.path.join(p, ".git")):
- return p
- p = os.path.abspath(os.path.join(p, '..'))
- return None
-
-
def daemonize(logfile):
pid = os.fork()
if pid == 0: # Parent
show=True, dir=test_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")
-parser.add_option("", "--nocleanup", help="don't remove test tree", default=False, action="store_true")
-parser.add_option("", "--testbase", help="base directory to run tests in (default %s)" % def_testbase,
- default=def_testbase)
-parser.add_option("", "--passcmd", help="command to run on success", default=None)
-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("", "--pushto", help="push to a git url on success",
- default=None, type='str')
-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",
- default=False, action="store_true")
-parser.add_option("", "--retry", help="automatically retry if master changes",
- default=False, action="store_true")
-parser.add_option("", "--email", help="send email to the given address on failure",
- type='str', default=None)
-parser.add_option("", "--email-from", help="send email from the given address",
- type='str', default="autobuild@samba.org")
-parser.add_option("", "--email-server", help="send email via the given server",
- type='str', default='localhost')
-parser.add_option("", "--always-email", help="always send email, even on success",
- action="store_true")
-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')
-parser.add_option("", "--attach-logs", help="Attach logs to mails sent on success/failure?",
- default=False, action="store_true")
-parser.add_option("", "--restrict-tests", help="run as make test with this TESTS= regex",
- default='')
-
-
def send_email(subject, text, log_tar):
if options.email is None:
do_print("not sending email because the recipient is not set")
outer.attach(msg)
content = outer.as_string()
s = smtplib.SMTP(options.email_server)
+ email_user = os.getenv('SMTP_USERNAME')
+ email_password = os.getenv('SMTP_PASSWORD')
+ if email_user is not None:
+ s.starttls()
+ s.login(email_user, email_password)
+
s.sendmail(options.email_from, [options.email], content)
s.set_debuglevel(1)
s.quit()
text, logs)
-(options, args) = parser.parse_args()
-
-if options.retry:
- 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
-test_prefix = "%s/prefix" % testbase
-test_tmpdir = "%s/tmp" % testbase
-os.environ['TMPDIR'] = test_tmpdir
-
# get the top commit message, for emails
top_commit_msg = run_cmd("git log -1", dir=gitroot, output=True)
top_commit_msg = top_commit_msg.decode('utf-8', 'backslashreplace')