script/autobuild.py: split samba-ad-dc-4* tests into two

As single job they used more than 1h.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index dba1dad7b5054c413bb383f9304156a74131561d..425089ff467b26e82894b9cdfd4b82c6a22e8f4b 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -285,7 +285,10 @@ samba-ad-dc-2:
 samba-ad-dc-3:
   extends: .needs_samba-def-build
 
-samba-ad-dc-4:
+samba-ad-dc-4a:
+  extends: .needs_samba-def-build
+
+samba-ad-dc-4b:
   extends: .needs_samba-def-build
 
 samba-ad-dc-5:
@@ -323,7 +326,10 @@ samba-ad-dc-ntvfs:
 samba-admem-mit:
   extends: .needs_samba-mit-build
 
-samba-ad-dc-4-mitkrb5:
+samba-ad-dc-4a-mitkrb5:
+  extends: .needs_samba-mit-build
+
+samba-ad-dc-4b-mitkrb5:
   extends: .needs_samba-mit-build
 
 # This task is run first to ensure we compile before we start the
@@ -398,7 +404,8 @@ pages:
     - samba-admem
     - samba-ad-dc-2
     - samba-ad-dc-3
-    - samba-ad-dc-4
+    - samba-ad-dc-4a
+    - samba-ad-dc-4b
     - samba-ad-dc-5
     - samba-ad-dc-6
     - samba-libs
@@ -409,7 +416,8 @@ pages:
     - samba-ctdb
     - samba-ad-dc-ntvfs
     - samba-admem-mit
-    - samba-ad-dc-4-mitkrb5
+    - samba-ad-dc-4a-mitkrb5
+    - samba-ad-dc-4b-mitkrb5
     - samba-ad-back1
     - samba-ad-back2
     - samba-fileserver

diff --git a/script/autobuild.py b/script/autobuild.py
index 93ebf1a175878082594ce738175a86c0d72b98dc..3b2266c7a69699571ab1592246781186c62d1371 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -522,13 +522,23 @@ tasks = {
         ],
     },
 
-    "samba-ad-dc-4": {
+    "samba-ad-dc-4a": {
         "dependency": "samba-def-build",
         "sequence": [
             ("random-sleep", random_sleep(1, 1)),
             ("test", make_test(include_envs=[
             "fl2000dc",
             "fl2003dc",
+            ])),
+            ("lcov", LCOV_CMD),
+            ("check-clean-tree", CLEAN_SOURCE_TREE_CMD),
+        ],
+    },
+    "samba-ad-dc-4b": {
+        "dependency": "samba-def-build",
+        "sequence": [
+            ("random-sleep", random_sleep(1, 1)),
+            ("test", make_test(include_envs=[
             "fl2008dc",
             "fl2008r2dc",
             ])),
@@ -651,15 +661,25 @@ tasks = {
         ],
     },
 
-    "samba-ad-dc-4-mitkrb5": {
+    "samba-ad-dc-4a-mitkrb5": {
+        "dependency": "samba-mit-build",
+        "sequence": [
+            ("random-sleep", random_sleep(1, 1)),
+            ("test", make_test(include_envs=[
+            "fl2000dc",
+            "fl2003dc",
+            ])),
+            ("lcov", LCOV_CMD),
+            ("check-clean-tree", CLEAN_SOURCE_TREE_CMD),
+        ],
+    },
+    "samba-ad-dc-4b-mitkrb5": {
         "dependency": "samba-mit-build",
         "sequence": [
             ("random-sleep", random_sleep(1, 1)),
             ("test", make_test(include_envs=[
             "fl2000dc",
             "fl2003dc",
-            "fl2008dc",
-            "fl2008r2dc",
             ])),
             ("lcov", LCOV_CMD),
             ("check-clean-tree", CLEAN_SOURCE_TREE_CMD),