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>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e71868bc64acc17558c1aa486bbd19b3b273cf6..f46e78ffe2c2be6d83954f2b8e1236c68c49bddc 100644 (file)
--- 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 b9824b8bd3f951238dd61ccc111e0cb18eda4fb6..7850df08a926e10f097917b8ca16b10a34f77ff7 100755 (executable)
--- 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"),