ldb: Free memory when repacking database
[garming/samba-autobuild/.git] / script / autobuild.py
index 4fd9b2a43c314c88cf031d49c793d43b1d385f49..0560622ee91a741a489e2f681b453d200bebf8e6 100755 (executable)
@@ -4,11 +4,12 @@
 # released under GNU GPL v3 or later
 
 from __future__ import print_function
-from subprocess import call, check_call, Popen, PIPE
+from subprocess import call, check_call, check_output, Popen, PIPE
 import os
 import tarfile
 import sys
 import time
+import random
 from optparse import OptionParser
 import smtplib
 import email
@@ -50,41 +51,41 @@ if gitroot is None:
 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,
+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",
+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",
+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",
+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",
+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("--fix-whitespace", help="fix whitespace on rebase",
                   default=False, action="store_true")
-parser.add_option("", "--retry", help="automatically retry if master changes",
+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",
+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",
+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",
+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",
+parser.add_option("--always-email", help="always send email, even on success",
                   action="store_true")
-parser.add_option("", "--daemon", help="daemonize after initial setup",
+parser.add_option("--daemon", help="daemonize after initial setup",
                   action="store_true")
-parser.add_option("", "--branch", help="the branch to work on (default=master)",
+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)",
+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?",
+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",
+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='',
@@ -107,6 +108,15 @@ if options.enable_coverage:
 else:
     LCOV_CMD = 'echo "lcov skipped since no --enable-coverage specified"'
 
+if args:
+    # If we are only running specific test,
+    # do not sleep randomly to wait for it to start
+    def random_sleep(low, high):
+        return 'sleep 1'
+else:
+    def random_sleep(low, high):
+        return 'sleep {}'.format(random.randint(low, high))
+
 cleanup_list = []
 
 builddirs = {
@@ -146,381 +156,389 @@ defaulttasks = list(builddirs.keys())
 if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1":
     defaulttasks.remove("samba-o3")
 
-ctdb_configure_params = " --enable-developer --picky-developer ${PREFIX}"
-samba_configure_params = " ${ENABLE_COVERAGE} --picky-developer ${PREFIX} --with-profiling-data"
+ctdb_configure_params = " --enable-developer ${PREFIX}"
+samba_configure_params = " ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data"
 
 samba_libs_envvars = "PYTHONPATH=${PYTHON_PREFIX}:$PYTHONPATH"
 samba_libs_envvars += " PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig"
 samba_libs_envvars += " ADDITIONAL_CFLAGS='-Wmissing-prototypes'"
-samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check ${ENABLE_COVERAGE} --enable-debug --picky-developer -C ${PREFIX}"
+samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check ${ENABLE_COVERAGE} --enable-debug -C ${PREFIX}"
 samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=cmocka,popt,NONE"
 samba_libs_configure_bundled_libs = " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent,!popt"
 samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bundled_libs
 
+
+def format_option(name, value=None):
+    """Format option as str list."""
+    if value is None:  # boolean option
+        return [name]
+    if not isinstance(value, list):  # single value option
+        value = [value]
+    # repeatable option
+    return ['{}={}'.format(name, item) for item in value]
+
+
+def make_test(
+        cmd='make test',
+        FAIL_IMMEDIATELY=1,
+        TESTS='',
+        include_envs=None,
+        exclude_envs=None):
+
+    test_options = []
+    if include_envs:
+        test_options = format_option('--include-env', include_envs)
+    if exclude_envs:
+        test_options = format_option('--exclude-env', exclude_envs)
+    if test_options:
+        # join envs options to original test options
+        TESTS = (TESTS + ' ' + ' '.join(test_options)).strip()
+
+    _options = []
+    if FAIL_IMMEDIATELY:
+        _options.append('FAIL_IMMEDIATELY=1')
+    if TESTS:
+        _options.append("TESTS='{}'".format(TESTS))
+
+    return ' '.join([cmd] + _options)
+
+
 tasks = {
     "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"),
-        ("test", "make autotest", "text/plain"),
-        ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure " + ctdb_configure_params),
+        ("make", "make all"),
+        ("install", "make install"),
+        ("test", "make autotest"),
+        ("check-clean-tree", "../script/clean-source-tree.sh"),
+        ("clean", "make clean"),
         ],
 
     # We have 'test' before 'install' because, 'test' should work without 'install (runs all the other envs)'
     "samba": [
-        ("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_ntvfs "
-            "--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"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(exclude_envs=[
+            "none",
+            "nt4_dc",
+            "nt4_dc_schannel",
+            "nt4_member",
+            "ad_dc",
+            "ad_dc_backup",
+            "ad_dc_ntvfs",
+            "ad_dc_default",
+            "ad_dc_slowtests",
+            "ad_dc_no_nss",
+            "ad_dc_no_ntlm",
+            "fl2003dc",
+            "fl2008dc",
+            "fl2008r2dc",
+            "ad_member",
+            "ad_member_idmap_rid",
+            "ad_member_idmap_ad",
+            "ad_member_rfc2307",
+            "chgdcpass",
+            "vampire_2000_dc",
+            "fl2000dc",
+            "fileserver",
+            "maptoguest",
+            "simpleserver",
+            "backupfromdc",
+            "restoredc",
+            "renamedc",
+            "offlinebackupdc",
+            "labdc",
+            "preforkrestartdc",
+            "proclimitdc",
+            "promoted_dc",
+            "vampire_dc",
+            "rodc",
+            "ad_dc_default",
+            "ad_dc_slowtests",
+            "schema_pair_dc",
+            "schema_dc",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("install", "make install"),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ("clean", "make clean"),
         ],
 
     "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_dc_schannel "
-            "--include-env=nt4_member "
-            "'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer --without-ads --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "nt4_dc",
+            "nt4_dc_schannel",
+            "nt4_member",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("install", "make install"),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ("clean", "make clean"),
         ],
 
     "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 "
-            "--include-env=maptoguest "
-            "--include-env=simpleserver "
-            "'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "fileserver",
+            "maptoguest",
+            "simpleserver",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "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"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "ad_member",
+            "ad_member_idmap_rid",
+            "ad_member_idmap_ad",
+            "ad_member_rfc2307",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "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_no_nss "
-            "--include-env=ad_dc_no_ntlm "
-            "'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "ad_dc",
+            "ad_dc_no_nss",
+            "ad_dc_no_ntlm",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "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=vampire_dc "
-            "--include-env=vampire_2000_dc "
-            "--include-env=rodc "
-            "'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "vampire_dc",
+            "vampire_2000_dc",
+            "rodc",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "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"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "promoted_dc",
+            "chgdcpass",
+            "preforkrestartdc",
+            "proclimitdc",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "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=fl2003dc "
-         "--include-env=fl2008dc "
-         "--include-env=fl2008r2dc "
-         "'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "fl2000dc",
+            "fl2003dc",
+            "fl2008dc",
+            "fl2008r2dc",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "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"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=["ad_dc_default"])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "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"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=["ad_dc_slowtests"])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "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"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=["schema_dc", "schema_pair_dc"])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     # We split out the ad_dc_ntvfs tests (which are long) so other test do not wait
     # This is currently the longest task, so we don't randomly delay it.
     "samba-ad-dc-ntvfs": [
-        ("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_ntvfs "
-            "'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=["ad_dc_ntvfs"])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     # 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 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=backupfromdc "
-            "--include-env=restoredc "
-            "--include-env=renamedc "
-            "--include-env=offlinebackupdc "
-            "--include-env=labdc "
-            "--include-env=ad_dc_backup "
-            "'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "backupfromdc",
+            "restoredc",
+            "renamedc",
+            "offlinebackupdc",
+            "labdc",
+            "ad_dc_backup",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
     "samba-test-only": [
-        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab  --abi-check-disable" + samba_configure_params, "text/plain"),
-        ("make", "make -j", "text/plain"),
-        ("test", 'make test FAIL_IMMEDIATELY=1 TESTS="${TESTS}"', "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab  --abi-check-disable" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(TESTS="${TESTS}")),
+        ("lcov", LCOV_CMD),
         ],
 
     # Test cross-compile infrastructure
     "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"),
+        ("random-sleep", random_sleep(900, 1500)),
+        ("configure-native", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
         ("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"),
+            " --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xe/ab" + samba_configure_params),
         ("configure-cross-answers", "./configure.developer --out ./bin-xa --cross-compile" \
-            " --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xa/ab" + samba_configure_params, "text/plain"),
+            " --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xa/ab" + samba_configure_params),
         ("compare-results", "script/compare_cc_results.py "
             "./bin/c4che/default{} "
             "./bin-xe/c4che/default{} "
-            "./bin-xa/c4che/default{}".format(*([CACHE_SUFFIX]*3)), "text/plain"),
+            "./bin-xa/c4che/default{}".format(*([CACHE_SUFFIX]*3))),
         ],
 
     # test build with -O3 -- catches extra warnings and bugs, tests the ad_dc environments
     "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 "
-            "TESTS='--include-env=ad_dc'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "ADDITIONAL_CFLAGS='-O3 -Wp,-D_FORTIFY_SOURCE=2' ./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(cmd='make quicktest', include_envs=["ad_dc"])),
+        ("lcov", LCOV_CMD),
+        ("install", "make install"),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ("clean", "make clean"),
         ],
 
     "samba-ctdb": [
-        ("random-sleep", "script/random-sleep.sh 900 1500", "text/plain"),
+        ("random-sleep", random_sleep(900, 1500)),
 
         # 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"),
-        ("tdb-make", "cd lib/tdb && make", "text/plain"),
-        ("tdb-install", "cd lib/tdb && make install", "text/plain"),
+        ("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}"),
+        ("tdb-make", "cd lib/tdb && make"),
+        ("tdb-install", "cd lib/tdb && make install"),
 
         # build samba with cluster support (also building ctdb):
-        ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}:$PYTHONPATH PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure.developer --picky-developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --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"),
-        ("ctdb-check", "test -e ${PREFIX_DIR}/sbin/ctdbd", "text/plain"),
+        ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}:$PYTHONPATH PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --bundled-libraries=!tdb"),
+        ("samba-make", "make"),
+        ("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT"),
+        ("samba-install", "make install"),
+        ("ctdb-check", "test -e ${PREFIX_DIR}/sbin/ctdbd"),
 
         # clean up:
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("clean", "make clean", "text/plain"),
-        ("ctdb-clean", "cd ./ctdb && make clean", "text/plain"),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ("clean", "make clean"),
+        ("ctdb-clean", "cd ./ctdb && make clean"),
         ],
 
     "samba-libs": [
-        ("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"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_libs),
+        ("talloc-make", "cd lib/talloc && make"),
+        ("talloc-install", "cd lib/talloc && make install"),
 
-        ("tdb-configure", "cd lib/tdb && " + samba_libs_configure_libs, "text/plain"),
-        ("tdb-make", "cd lib/tdb && make", "text/plain"),
-        ("tdb-install", "cd lib/tdb && make install", "text/plain"),
+        ("tdb-configure", "cd lib/tdb && " + samba_libs_configure_libs),
+        ("tdb-make", "cd lib/tdb && make"),
+        ("tdb-install", "cd lib/tdb && make install"),
 
-        ("tevent-configure", "cd lib/tevent && " + samba_libs_configure_libs, "text/plain"),
-        ("tevent-make", "cd lib/tevent && make", "text/plain"),
-        ("tevent-install", "cd lib/tevent && make install", "text/plain"),
+        ("tevent-configure", "cd lib/tevent && " + samba_libs_configure_libs),
+        ("tevent-make", "cd lib/tevent && make"),
+        ("tevent-install", "cd lib/tevent && make install"),
 
-        ("ldb-configure", "cd lib/ldb && " + samba_libs_configure_libs, "text/plain"),
-        ("ldb-make", "cd lib/ldb && make", "text/plain"),
-        ("ldb-install", "cd lib/ldb && make install", "text/plain"),
+        ("ldb-configure", "cd lib/ldb && " + samba_libs_configure_libs),
+        ("ldb-make", "cd lib/ldb && make"),
+        ("ldb-install", "cd lib/ldb && make install"),
 
-        ("nondevel-configure", "./configure ${PREFIX}", "text/plain"),
-        ("nondevel-make", "make -j", "text/plain"),
-        ("nondevel-check", "./bin/smbd -b | grep WITH_NTVFS_FILESERVER && exit 1; exit 0", "text/plain"),
-        ("nondevel-install", "make install", "text/plain"),
-        ("nondevel-dist", "make dist", "text/plain"),
+        ("nondevel-configure", "./configure ${PREFIX}"),
+        ("nondevel-make", "make -j"),
+        ("nondevel-check", "./bin/smbd -b | grep WITH_NTVFS_FILESERVER && exit 1; exit 0"),
+        ("nondevel-install", "make install"),
+        ("nondevel-dist", "make dist"),
 
         # retry with all modules shared
-        ("allshared-distclean", "make distclean", "text/plain"),
-        ("allshared-configure", samba_libs_configure_samba + " --with-shared-modules=ALL", "text/plain"),
-        ("allshared-make", "make -j", "text/plain"),
+        ("allshared-distclean", "make distclean"),
+        ("allshared-configure", samba_libs_configure_samba + " --with-shared-modules=ALL"),
+        ("allshared-make", "make -j"),
         ],
 
     "samba-none-env": [
-        ("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=none'",
-            "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=["none"])),
+        ("lcov", LCOV_CMD),
         ],
 
     "samba-static": [
-        ("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+        ("random-sleep", random_sleep(1, 1)),
         # build with all modules static
-        ("allstatic-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=ALL", "text/plain"),
-        ("allstatic-make", "make -j", "text/plain"),
-        ("allstatic-test", "make test "
-            "FAIL_IMMEDIATELY=1 "
-            "TESTS='samba3.smb2.create.*nt4_dc'",
-            "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
+        ("allstatic-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=ALL"),
+        ("allstatic-make", "make -j"),
+        ("allstatic-test", make_test(TESTS="samba3.smb2.create.*nt4_dc")),
+        ("lcov", LCOV_CMD),
 
         # retry without any required modules
-        ("none-distclean", "make distclean", "text/plain"),
-        ("none-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=!FORCED,!DEFAULT --with-shared-modules=!FORCED,!DEFAULT", "text/plain"),
-        ("none-make", "make -j", "text/plain"),
+        ("none-distclean", "make distclean"),
+        ("none-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=!FORCED,!DEFAULT --with-shared-modules=!FORCED,!DEFAULT"),
+        ("none-make", "make -j"),
 
         # retry with nonshared smbd and smbtorture
-        ("nonshared-distclean", "make distclean", "text/plain"),
-        ("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=talloc,tdb,pytdb,ldb,pyldb,tevent,pytevent --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd", "text/plain"),
-        ("nonshared-make", "make -j", "text/plain"),
+        ("nonshared-distclean", "make distclean"),
+        ("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=talloc,tdb,pytdb,ldb,pyldb,tevent,pytevent --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd"),
+        ("nonshared-make", "make -j"),
         ],
 
     "samba-systemkrb5": [
-        ("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"),
+        ("random-sleep", random_sleep(900, 1500)),
+        ("configure", "./configure.developer " + samba_configure_params + " --with-system-mitkrb5 --with-experimental-mit-ad-dc"),
+        ("make", "make -j"),
         # we currently cannot run a full make test, a limited list of tests could be run
         # via "make test TESTS=sometests"
-        ("test", "make test FAIL_IMMEDIATELY=1 "
-            "TESTS='--include-env=ktest'", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("test", make_test(include_envs=["ktest"])),
+        ("lcov", LCOV_CMD),
+        ("install", "make install"),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ("clean", "make clean"),
         ],
 
     # Test Samba without python still builds.  When this test fails
@@ -530,157 +548,157 @@ tasks = {
     # support this environment).  The target here is for vendors
     # shipping a minimal smbd.
     "samba-nopython": [
-        ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
-        ("configure", "./configure.developer ${ENABLE_COVERAGE} --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"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("clean", "make clean", "text/plain"),
-
-        ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
-        ("talloc-make", "cd lib/talloc && make", "text/plain"),
-        ("talloc-install", "cd lib/talloc && make install", "text/plain"),
-
-        ("tdb-configure", "cd lib/tdb && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
-        ("tdb-make", "cd lib/tdb && make", "text/plain"),
-        ("tdb-install", "cd lib/tdb && make install", "text/plain"),
-
-        ("tevent-configure", "cd lib/tevent && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
-        ("tevent-make", "cd lib/tevent && make", "text/plain"),
-        ("tevent-install", "cd lib/tevent && make install", "text/plain"),
-
-        ("ldb-configure", "cd lib/ldb && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
-        ("ldb-make", "cd lib/ldb && make", "text/plain"),
-        ("ldb-install", "cd lib/ldb && make install", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --disable-python --without-ad-dc"),
+        ("make", "make -j"),
+        ("install", "make install"),
+        ("find-python", "script/find_python.sh ${PREFIX}"),
+        ("test", "make test-nopython"),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ("clean", "make clean"),
+
+        ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"),
+        ("talloc-make", "cd lib/talloc && make"),
+        ("talloc-install", "cd lib/talloc && make install"),
+
+        ("tdb-configure", "cd lib/tdb && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"),
+        ("tdb-make", "cd lib/tdb && make"),
+        ("tdb-install", "cd lib/tdb && make install"),
+
+        ("tevent-configure", "cd lib/tevent && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"),
+        ("tevent-make", "cd lib/tevent && make"),
+        ("tevent-install", "cd lib/tevent && make install"),
+
+        ("ldb-configure", "cd lib/ldb && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"),
+        ("ldb-make", "cd lib/ldb && make"),
+        ("ldb-install", "cd lib/ldb && make install"),
 
         # retry against installed library packages
-        ("libs-configure", samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc", "text/plain"),
-        ("libs-make", "make -j", "text/plain"),
-        ("libs-install", "make install", "text/plain"),
-        ("libs-check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("libs-clean", "make clean", "text/plain"),
+        ("libs-configure", samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc"),
+        ("libs-make", "make -j"),
+        ("libs-install", "make install"),
+        ("libs-check-clean-tree", "script/clean-source-tree.sh"),
+        ("libs-clean", "make clean"),
         ],
 
     # check we can do the same thing using python2
     "samba-nopython-py2": [
-        ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
-        ("configure", "PYTHON=python2 ./configure.developer ${ENABLE_COVERAGE} --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"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("clean", "PYTHON=python2 make clean", "text/plain"),
-
-        ("talloc-configure", "cd lib/talloc && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
-        ("talloc-make", "cd lib/talloc && PYTHON=python2 make", "text/plain"),
-        ("talloc-install", "cd lib/talloc && PYTHON=python2 make install", "text/plain"),
-
-        ("tdb-configure", "cd lib/tdb && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
-        ("tdb-make", "cd lib/tdb && PYTHON=python2 make", "text/plain"),
-        ("tdb-install", "cd lib/tdb && PYTHON=python2 make install", "text/plain"),
-
-        ("tevent-configure", "cd lib/tevent && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
-        ("tevent-make", "cd lib/tevent && PYTHON=python2 make", "text/plain"),
-        ("tevent-install", "cd lib/tevent && PYTHON=python2 make install", "text/plain"),
-
-        ("ldb-configure", "cd lib/ldb && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"),
-        ("ldb-make", "cd lib/ldb && PYTHON=python2 make", "text/plain"),
-        ("ldb-install", "cd lib/ldb && PYTHON=python2 make install", "text/plain"),
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "PYTHON=python2 ./configure.developer ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --disable-python --without-ad-dc"),
+        ("make", "PYTHON=python2 make -j"),
+        ("install", "PYTHON=python2 make install"),
+        ("find-python", "script/find_python.sh ${PREFIX}"),
+        ("test", "make test-nopython"),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ("clean", "PYTHON=python2 make clean"),
+
+        ("talloc-configure", "cd lib/talloc && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"),
+        ("talloc-make", "cd lib/talloc && PYTHON=python2 make"),
+        ("talloc-install", "cd lib/talloc && PYTHON=python2 make install"),
+
+        ("tdb-configure", "cd lib/tdb && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"),
+        ("tdb-make", "cd lib/tdb && PYTHON=python2 make"),
+        ("tdb-install", "cd lib/tdb && PYTHON=python2 make install"),
+
+        ("tevent-configure", "cd lib/tevent && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"),
+        ("tevent-make", "cd lib/tevent && PYTHON=python2 make"),
+        ("tevent-install", "cd lib/tevent && PYTHON=python2 make install"),
+
+        ("ldb-configure", "cd lib/ldb && PYTHON=python2 " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python"),
+        ("ldb-make", "cd lib/ldb && PYTHON=python2 make"),
+        ("ldb-install", "cd lib/ldb && PYTHON=python2 make install"),
 
         # retry against installed library packages
-        ("libs-configure", "PYTHON=python2 " + samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc", "text/plain"),
-        ("libs-make", "PYTHON=python2 make -j", "text/plain"),
-        ("libs-install", "PYTHON=python2 make install", "text/plain"),
-        ("libs-check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
-        ("libs-clean", "PYTHON=python2 make clean", "text/plain"),
+        ("libs-configure", "PYTHON=python2 " + samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc"),
+        ("libs-make", "PYTHON=python2 make -j"),
+        ("libs-install", "PYTHON=python2 make install"),
+        ("libs-check-clean-tree", "script/clean-source-tree.sh"),
+        ("libs-clean", "PYTHON=python2 make clean"),
         ],
 
     "ldb": [
-        ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
-        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}", "text/plain"),
-        ("make", "make", "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("test", "make test", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("clean", "make clean", "text/plain"),
-        ("configure-no-lmdb", "./configure ${ENABLE_COVERAGE} --enable-developer --without-ldb-lmdb -C ${PREFIX}", "text/plain"),
-        ("make-no-lmdb", "make", "text/plain"),
-        ("test-no-lmdb", "make test", "text/plain"),
-        ("lcov-no-lmdb", LCOV_CMD, "text/plain"),
-        ("install-no-lmdb", "make install", "text/plain"),
-        ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
-        ("distcheck", "make distcheck", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(60, 600)),
+        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}"),
+        ("make", "make"),
+        ("install", "make install"),
+        ("test", "make test"),
+        ("lcov", LCOV_CMD),
+        ("clean", "make clean"),
+        ("configure-no-lmdb", "./configure ${ENABLE_COVERAGE} --enable-developer --without-ldb-lmdb -C ${PREFIX}"),
+        ("make-no-lmdb", "make"),
+        ("test-no-lmdb", "make test"),
+        ("lcov-no-lmdb", LCOV_CMD),
+        ("install-no-lmdb", "make install"),
+        ("check-clean-tree", "../../script/clean-source-tree.sh"),
+        ("distcheck", "make distcheck"),
+        ("clean", "make clean"),
         ],
 
     "tdb": [
-        ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
-        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}", "text/plain"),
-        ("make", "make", "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("test", "make test", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
-        ("distcheck", "make distcheck", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(60, 600)),
+        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}"),
+        ("make", "make"),
+        ("install", "make install"),
+        ("test", "make test"),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "../../script/clean-source-tree.sh"),
+        ("distcheck", "make distcheck"),
+        ("clean", "make clean"),
         ],
 
     "talloc": [
-        ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
-        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}", "text/plain"),
-        ("make", "make", "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("test", "make test", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
-        ("distcheck", "make distcheck", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(60, 600)),
+        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}"),
+        ("make", "make"),
+        ("install", "make install"),
+        ("test", "make test"),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "../../script/clean-source-tree.sh"),
+        ("distcheck", "make distcheck"),
+        ("clean", "make clean"),
         ],
 
     "replace": [
-        ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
-        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}", "text/plain"),
-        ("make", "make", "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("test", "make test", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
-        ("distcheck", "make distcheck", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(60, 600)),
+        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}"),
+        ("make", "make"),
+        ("install", "make install"),
+        ("test", "make test"),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "../../script/clean-source-tree.sh"),
+        ("distcheck", "make distcheck"),
+        ("clean", "make clean"),
         ],
 
     "tevent": [
-        ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
-        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}", "text/plain"),
-        ("make", "make", "text/plain"),
-        ("install", "make install", "text/plain"),
-        ("test", "make test", "text/plain"),
-        ("lcov", LCOV_CMD, "text/plain"),
-        ("check-clean-tree", "../../script/clean-source-tree.sh", "text/plain"),
-        ("distcheck", "make distcheck", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(60, 600)),
+        ("configure", "./configure ${ENABLE_COVERAGE} --enable-developer -C ${PREFIX}"),
+        ("make", "make"),
+        ("install", "make install"),
+        ("test", "make test"),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "../../script/clean-source-tree.sh"),
+        ("distcheck", "make distcheck"),
+        ("clean", "make clean"),
         ],
 
     "pidl": [
-        ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
-        ("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"),
-        ("checkout-yapp-generated", "git checkout lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm", "text/plain"),
-        ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
-        ("clean", "make clean", "text/plain"),
+        ("random-sleep", random_sleep(60, 600)),
+        ("configure", "perl Makefile.PL PREFIX=${PREFIX_DIR}"),
+        ("touch", "touch *.yp"),
+        ("make", "make"),
+        ("test", "make test"),
+        ("install", "make install"),
+        ("checkout-yapp-generated", "git checkout lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm"),
+        ("check-clean-tree", "../script/clean-source-tree.sh"),
+        ("clean", "make clean"),
         ],
 
     # these are useful for debugging autobuild
-    'pass': [("pass", 'echo passing && /bin/true', "text/plain")],
-    'fail': [("fail", 'echo failing && /bin/false', "text/plain")],
+    'pass': [("pass", 'echo passing && /bin/true')],
+    'fail': [("fail", 'echo failing && /bin/false')],
 }
 
 
@@ -696,7 +714,8 @@ def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
     if show:
         do_print("Running: '%s' in '%s'" % (cmd, dir))
     if output:
-        return Popen([cmd], shell=True, stdout=PIPE, cwd=dir, close_fds=True).communicate()[0]
+        out = check_output([cmd], shell=True, cwd=dir)
+        return out.decode(encoding='utf-8', errors='backslashreplace')
     elif checkfail:
         return check_call(cmd, shell=True, cwd=dir)
     else:
@@ -708,11 +727,7 @@ class builder(object):
 
     def __init__(self, name, sequence, cp=True):
         self.name = name
-        if name in builddirs:
-            self.dir = builddirs[name]
-        else:
-            self.dir = "."
-
+        self.dir = builddirs.get(name, '.')
         self.tag = self.name.replace('/', '_')
         self.sequence = sequence
         self.next = 0
@@ -726,6 +741,7 @@ class builder(object):
         self.stderr = open(self.stderr_path, 'w')
         self.stdin  = open("/dev/null", 'r')
         self.test_source_dir = "%s/%s" % (testbase, self.tag)
+        self.cwd = "%s/%s" % (self.test_source_dir, self.dir)
         self.prefix = "%s/%s" % (test_prefix, self.tag)
         run_cmd("rm -rf %s" % self.test_source_dir)
         run_cmd("rm -rf %s" % self.prefix)
@@ -743,7 +759,7 @@ class builder(object):
             do_print('%s: Completed OK' % self.name)
             self.done = True
             return
-        (self.stage, self.cmd, self.output_mime_type) = self.sequence[self.next]
+        (self.stage, self.cmd) = self.sequence[self.next]
         self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(plat_specific=1, standard_lib=0, prefix=self.prefix))
         self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix)
         self.cmd = self.cmd.replace("${PREFIX_DIR}", "%s" % self.prefix)
@@ -752,15 +768,10 @@ class builder(object):
         self.cmd = self.cmd.replace("${LOG_BASE}", options.log_base)
         self.cmd = self.cmd.replace("${NAME}", self.name)
         self.cmd = self.cmd.replace("${ENABLE_COVERAGE}", options.enable_coverage)
-#        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.test_source_dir, self.dir))
-        do_print('%s: [%s] Running %s in %r' % (self.name, self.stage, self.cmd, os.getcwd()))
+        do_print('%s: [%s] Running %s in %r' % (self.name, self.stage, self.cmd, self.cwd))
         self.proc = Popen(self.cmd, shell=True,
-                          close_fds=True,
+                          close_fds=True, cwd=self.cwd,
                           stdout=self.stdout, stderr=self.stderr, stdin=self.stdin)
-        os.chdir(cwd)
         self.next += 1
 
 
@@ -768,23 +779,16 @@ class buildlist(object):
     '''handle build of multiple directories'''
 
     def __init__(self, tasknames, rebase_url, rebase_branch="master"):
-        global tasks
-        self.tlist = []
         self.tail_proc = None
         self.retry = None
-        if tasknames == []:
+        if not tasknames:
             if options.restrict_tests:
                 tasknames = ["samba-test-only"]
             else:
                 tasknames = defaulttasks
-        else:
-            # If we are only running one test,
-            # do not sleep randomly to wait for it to start
-            os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
 
-        for n in tasknames:
-            b = builder(n, tasks[n], cp=n is not "pidl")
-            self.tlist.append(b)
+        self.tlist = [builder(n, tasks[n], cp=(n != "pidl")) for n in tasknames]
+
         if options.retry:
             rebase_remote = "rebaseon"
             retry_task = [("retry",
@@ -799,13 +803,12 @@ class buildlist(object):
                               diff old_remote_branch.desc remote_branch.desc
                             done
                            ''' % (
-                                rebase_branch, rebase_remote, rebase_url,
+                               rebase_branch, rebase_remote, rebase_url,
                                rebase_remote,
                                rebase_remote, rebase_branch,
                                rebase_remote,
                                rebase_remote, rebase_branch
-                            ),
-                            "test/plain")]
+                            ))]
 
             self.retry = builder('retry', retry_task, cp=False)
             self.need_retry = False
@@ -864,34 +867,31 @@ class buildlist(object):
         self.kill_kids()
         return (0, None, None, None, "All OK")
 
-    def write_system_info(self):
-        filename = 'system-info.txt'
-        f = open(filename, 'w')
-        for cmd in ['uname -a',
-                    'lsb_release -a',
-                    'free',
-                    'mount',
-                    'cat /proc/cpuinfo',
-                    'cc --version',
-                    'df -m .',
-                    'df -m %s' % testbase]:
-            out = run_cmd(cmd, output=True, checkfail=False)
-            print('### %s' % cmd, file=f)
-            print(out.decode('utf8', 'backslashreplace'), file=f)
-            print(file=f)
-        f.close()
-        return filename
+    def write_system_info(self, filename):
+        with open(filename, 'w') as f:
+            for cmd in ['uname -a',
+                        'lsb_release -a',
+                        'free',
+                        'mount',
+                        'cat /proc/cpuinfo',
+                        'cc --version',
+                        'df -m .',
+                        'df -m %s' % testbase]:
+                out = run_cmd(cmd, output=True, checkfail=False)
+                print('### %s' % cmd, file=f)
+                print(out, file=f)
+                print(file=f)
 
     def tarlogs(self, fname):
-        tar = tarfile.open(fname, "w:gz")
-        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")
-        sys_info = self.write_system_info()
-        tar.add(sys_info)
-        tar.close()
+        with tarfile.open(fname, "w:gz") as tar:
+            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")
+            filename = 'system-info.txt'
+            self.write_system_info(filename)
+            tar.add(filename)
 
     def remove_logs(self):
         for b in self.tlist:
@@ -942,9 +942,8 @@ def daemonize(logfile):
 
 def write_pidfile(fname):
     '''write a pid file, cleanup on exit'''
-    f = open(fname, mode='w')
-    f.write("%u\n" % os.getpid())
-    f.close()
+    with open(fname, mode='w') as f:
+        f.write("%u\n" % os.getpid())
 
 
 def rebase_tree(rebase_url, rebase_branch="master"):
@@ -1009,9 +1008,8 @@ def send_email(subject, text, log_tar):
     outer.preamble = 'Autobuild mails are now in MIME because we optionally attach the logs.\n'
     outer.attach(MIMEText(text, 'plain'))
     if options.attach_logs:
-        fp = open(log_tar, 'rb')
-        msg = MIMEApplication(fp.read(), 'gzip', email.encoders.encode_base64)
-        fp.close()
+        with open(log_tar, 'rb') as fp:
+            msg = MIMEApplication(fp.read(), 'gzip', email.encoders.encode_base64)
         # Set the filename parameter
         msg.add_header('Content-Disposition', 'attachment', filename=os.path.basename(log_tar))
         outer.attach(msg)
@@ -1130,7 +1128,6 @@ The top commit for the tree that was built was:
 
 # 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')
 
 try:
     os.makedirs(testbase)
@@ -1164,17 +1161,18 @@ while True:
         raise
 
     try:
-        try:
-            if options.rebase is not None:
-                rebase_tree(options.rebase, rebase_branch=options.branch)
-        except Exception:
-            cleanup_list.append(gitroot + "/autobuild.pid")
-            cleanup()
-            elapsed_time = time.time() - start_time
-            email_failure(-1, 'rebase', 'rebase', 'rebase',
-                          'rebase on %s failed' % options.branch,
-                          elapsed_time, log_base=options.log_base)
-            sys.exit(1)
+        if options.rebase is not None:
+            rebase_tree(options.rebase, rebase_branch=options.branch)
+    except Exception:
+        cleanup_list.append(gitroot + "/autobuild.pid")
+        cleanup()
+        elapsed_time = time.time() - start_time
+        email_failure(-1, 'rebase', 'rebase', 'rebase',
+                      'rebase on %s failed' % options.branch,
+                      elapsed_time, log_base=options.log_base)
+        sys.exit(1)
+
+    try:
         blist = buildlist(args, options.rebase, rebase_branch=options.branch)
         if options.tail:
             blist.start_tail()