sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

autobuild.py: Avoid listing jobs twice

Browse Source 
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>
This commit is contained in:
Andrew Bartlett 2019-12-10 10:59:49 +13:00
parent df38d51104
commit d349d344f8
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
script/autobuild.py
View File

@ -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)