diff options
| -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"), |