selftest: split fileserver testenv into simpleserver and fileserver

The simpleserver testenv continues to be built with minimal
dependencies. fileserver otoh will be built with bells and whistles including
JSON which I need for using the env as target for Spotlight tests.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01838b93d72cf5d282bfca7db954794387b65cc7..62a3c7fcb5d4bc15ab606c4fab0ce5efc58a4c61 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,6 +174,9 @@ samba-ad-dc-ntvfs:
 samba-ad-dc-backup:
   extends: .private_template
 
+samba-simpleserver:
+  extends: .private_template
+
 samba-fileserver:
   extends: .private_template
 

diff --git a/script/autobuild.py b/script/autobuild.py
index 0560622ee91a741a489e2f681b453d200bebf8e6..29e6234ded943ebb64077a02bcc52e527e69a010 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -280,14 +280,24 @@ tasks = {
         ("clean", "make clean"),
         ],
 
-    "samba-fileserver": [
+    "samba-simpleserver": [
         ("random-sleep", random_sleep(300, 900)),
         ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json --with-selftest-prefix=./bin/ab" + samba_configure_params),
         ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "simpleserver",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ],
+
+    "samba-fileserver": [
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer --without-ad-dc --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
         ("test", make_test(include_envs=[
             "fileserver",
             "maptoguest",
-            "simpleserver",
             ])),
         ("lcov", LCOV_CMD),
         ("check-clean-tree", "script/clean-source-tree.sh"),