diff options
author | Andrew Bartlett <abartlet@samba.org> | 2020-03-12 16:07:01 +1300 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2020-03-23 13:02:32 +0000 |
commit | 7a44bd1c422d7e20aa0e81fcc2d40a83b6414d1f (patch) | |
tree | fbdac55dfcad297b5b4871978f8f10ec358c2a6a | |
parent | fb2918bb048349e6793a17f2f6c35f96e033ab0f (diff) | |
download | samba-7a44bd1c422d7e20aa0e81fcc2d40a83b6414d1f.tar.gz |
autobuild: Merge the samba-ktest-heimdal and samba-fileserver jobs
This avoids a full compile of Samba just to test Kerberos with a system Heimdal
while still providing an environment to test other fileserver features.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rwxr-xr-x | script/autobuild.py | 15 |
2 files changed, 3 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e71868bc64..f46e78ffe2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -190,9 +190,6 @@ samba-simpleserver: samba-fileserver: extends: .private_template -samba-ktest-heimdal: - extends: .private_template - samba-ad-dc-1: extends: .private_template @@ -235,7 +232,6 @@ pages: - samba-ad-dc-backup - samba-simpleserver - samba-fileserver - - samba-ktest-heimdal - samba-ad-dc-1 - samba-nt4 - samba-schemaupgrade diff --git a/script/autobuild.py b/script/autobuild.py index b9824b8bd3f..7850df08a92 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -322,22 +322,13 @@ tasks = { "samba-fileserver": [ ("random-sleep", random_sleep(300, 900)), - ("configure", "./configure.developer --without-ad-dc --with-selftest-prefix=./bin/ab" + samba_configure_params), + ("configure", "./configure.developer --without-ad-dc --with-system-heimdalkrb5 --with-selftest-prefix=./bin/ab" + samba_configure_params), ("make", "make -j"), ("test", make_test(include_envs=[ "fileserver", "maptoguest", - ])), - ("lcov", LCOV_CMD), - ("check-clean-tree", "script/clean-source-tree.sh"), - ], - - "samba-ktest-heimdal": [ - ("random-sleep", random_sleep(300, 900)), - ("configure", "./configure.developer --without-ad-dc --with-system-heimdalkrb5 --with-selftest-prefix=./bin/ab" + samba_configure_params), - ("make", "make -j"), - ("test", make_test(include_envs=[ - "ktest", + "ktest", # ktest is also tested in samba and samba-mitkrb5 + # but is tested here against a system Heimdal ])), ("lcov", LCOV_CMD), ("check-clean-tree", "script/clean-source-tree.sh"), |