diff options
author | Andrew Bartlett <abartlet@samba.org> | 2019-12-10 10:59:49 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2019-12-11 02:55:32 +0000 |
commit | d349d344f8872e25526fdb76a38523477baa4366 (patch) | |
tree | 533407908f8c1a1751c0fea546b44a54eb69e75d | |
parent | df38d511045311b9b7c68c94aad800c69088e331 (diff) | |
download | samba-d349d344f8872e25526fdb76a38523477baa4366.tar.gz |
autobuild.py: Avoid listing jobs twice
We use the tasks table instead, to avoid the issue shown in the previous commit.
Now we just have to keep .gitlab-ci.yml and the tasks table in sync.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@samba.org>
-rwxr-xr-x | script/autobuild.py | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index b6bddcb3ac8..2a23c8dbb87 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -121,33 +121,6 @@ cleanup_list = [] builddirs = { "ctdb": "ctdb", - "samba": ".", - "samba-mitkrb5": ".", - "samba-nt4": ".", - "samba-fileserver": ".", - "samba-simpleserver": ".", - "samba-ktest-heimdal": ".", - "samba-admem": ".", - "samba-admem-mit": ".", - "samba-xc": ".", - "samba-o3": ".", - "samba-ctdb": ".", - "samba-libs": ".", - "samba-static": ".", - "samba-none-env": ".", - "samba-ad-dc-1": ".", - "samba-ad-dc-1-mitkrb5": ".", - "samba-ad-dc-2": ".", - "samba-ad-dc-3": ".", - "samba-ad-dc-4": ".", - "samba-ad-dc-4-mitkrb5": ".", - "samba-ad-dc-5": ".", - "samba-ad-dc-6": ".", - "samba-ad-dc-ntvfs": ".", - "samba-ad-dc-backup": ".", - "samba-nopython": ".", - "samba-nopython-py2": ".", - "samba-schemaupgrade": ".", "ldb": "lib/ldb", "tdb": "lib/tdb", "talloc": "lib/talloc", @@ -156,11 +129,6 @@ builddirs = { "pidl": "pidl" } -defaulttasks = list(builddirs.keys()) - -if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1": - defaulttasks.remove("samba-o3") - ctdb_configure_params = " --enable-developer ${PREFIX}" samba_configure_params = " ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data" @@ -208,6 +176,9 @@ def make_test( return ' '.join([cmd] + _options) +# When updating this list, also update .gitlab-ci.yml to add the job +# and to make it a dependency of 'page' for the coverage report. + tasks = { "ctdb": [ ("random-sleep", random_sleep(300, 900)), @@ -816,6 +787,14 @@ tasks = { 'fail': [("fail", 'echo failing && /bin/false')], } +defaulttasks = list(tasks.keys()) +defaulttasks.remove("pass") +defaulttasks.remove("fail") +defaulttasks.remove("samba-test-only") + +if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1": + defaulttasks.remove("samba-o3") + def do_print(msg): print("%s" % msg) |