autobuild: Merge samba-simpleserver into samba-nt4

This saves CI resources (20mins build time) at the expense of making
the samba-nt4 job take 45min (5 min longer).

The new maximum job time is 1:15 by samba-o3 on the different hosts.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Mar 23 14:45:59 UTC 2020 on sn-devel-184

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f46e78ffe2c2be6d83954f2b8e1236c68c49bddc..06890ee9c99d05e0077e33348f28b3e5e941e6dc 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -184,9 +184,6 @@ samba-ad-dc-4-mitkrb5:
 samba-ad-dc-backup:
   extends: .private_template
 
-samba-simpleserver:
-  extends: .private_template
-
 samba-fileserver:
   extends: .private_template
 
@@ -230,7 +227,6 @@ pages:
     - samba-admem-mit
     - samba-ad-dc-4-mitkrb5
     - samba-ad-dc-backup
-    - samba-simpleserver
     - samba-fileserver
     - samba-ad-dc-1
     - samba-nt4

diff --git a/script/autobuild.py b/script/autobuild.py
index 7850df08a926e10f097917b8ca16b10a34f77ff7..3889d6ed6200c35f395fe6cda58aad8411797d22 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -296,12 +296,13 @@ tasks = {
 
     "samba-nt4": [
         ("random-sleep", random_sleep(300, 900)),
-        ("configure", "./configure.developer --without-ads --without-ad-dc --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("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=[
             "nt4_dc",
             "nt4_dc_schannel",
             "nt4_member",
+            "simpleserver",
             ])),
         ("lcov", LCOV_CMD),
         ("install", "make install"),
@@ -309,17 +310,6 @@ tasks = {
         ("clean", "make clean"),
         ],
 
-    "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-system-heimdalkrb5 --with-selftest-prefix=./bin/ab" + samba_configure_params),