script/autobuild.py: split samba-ad-dc-backup into samba-ad-back{1,2}

This will make it possible to run them in parallel (hopefully on shared
gitlab runners).

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.yml b/.gitlab-ci.yml
index 577aacea54dd86e522cfad33d44c55654c9efa79..b1ccf49484b51666d5d03fa24500e5171cfdc623 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -350,7 +350,10 @@ samba-fips:
     - .needs_samba-no-opath-build
     - .private_runner
 
-samba-ad-dc-backup:
+samba-ad-back1:
+  extends: .needs_samba-def-build-private
+
+samba-ad-back2:
   extends: .needs_samba-def-build-private
 
 samba-fileserver:
@@ -396,7 +399,8 @@ pages:
     - samba-ad-dc-ntvfs
     - samba-admem-mit
     - samba-ad-dc-4-mitkrb5
-    - samba-ad-dc-backup
+    - samba-ad-back1
+    - samba-ad-back2
     - samba-fileserver
     - samba-ad-dc-1
     - samba-nt4

diff --git a/script/autobuild.py b/script/autobuild.py
index 55b27291acbba90b02099d00b2dc7e6584ac1ff6..5f0a77f35907791d621a74eb834dcdb090dfda17 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -579,8 +579,8 @@ tasks = {
     },
 
     # run the backup/restore testenvs separately as they're fairly standalone
-    # (and CI seems to max out at ~8 different DCs running at once)
-    "samba-ad-dc-backup": {
+    # (and CI seems to max out at ~3 different DCs running at once)
+    "samba-ad-back1": {
         "dependency": "samba-def-build",
         "sequence": [
             ("random-sleep", random_sleep(300, 900)),
@@ -588,6 +588,17 @@ tasks = {
             "backupfromdc",
             "restoredc",
             "renamedc",
+            ])),
+            ("lcov", LCOV_CMD),
+            ("check-clean-tree", CLEAN_SOURCE_TREE_CMD),
+        ],
+    },
+    "samba-ad-back2": {
+        "dependency": "samba-def-build",
+        "sequence": [
+            ("random-sleep", random_sleep(300, 900)),
+            ("test", make_test(include_envs=[
+            "backupfromdc",
             "offlinebackupdc",
             "labdc",
             ])),