script/autobuild.py: split samba-no-opath into two tests

This was is basically a combination of 'samba-nt4' and
'samba-fileserver'.

As a single job it used more than 1h only for testing,
while the samba-no-nopath-build uses ~ 10mins (with a filled ccache).
Now we have two test jobs with ~ 30mins.

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 1850db0a66a0cedeca52ac6303120ad999865bae..e98b8fed3c9abbfda1b1d279ddfd05170a3f7b72 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -378,7 +378,10 @@ samba-nt4:
 samba-ad-dc-1-mitkrb5:
   extends: .needs_samba-mit-build-private
 
-samba-no-opath:
+samba-no-opath1:
+  extends: .needs_samba-no-opath-build-private
+
+samba-no-opath2:
   extends: .needs_samba-no-opath-build-private
 
 # 'pages' is a special job which can publish artifacts in `public` dir to gitlab pages
@@ -411,6 +414,8 @@ pages:
     - samba-schemaupgrade
     - samba-ad-dc-1-mitkrb5
     - samba-fips
+    - samba-no-opath1
+    - samba-no-opath2
   script:
     - ./configure.developer
     - make -j

diff --git a/script/autobuild.py b/script/autobuild.py
index 25e6291d7e560fa178787b7eb42f9b491a8564b8..a340d471297d69bf6a7a504f396276f2322e55b3 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -442,12 +442,12 @@ tasks = {
         ],
     },
 
-    "samba-no-opath": {
+    "samba-no-opath1": {
         "dependency": "samba-no-opath-build",
         "sequence": [
             ("random-sleep", random_sleep(300, 900)),
             ("test", make_test(
-                cmd="make test DISABLE_OPATH=1",
+                cmd="make testonly DISABLE_OPATH=1",
                 include_envs=[
                 "nt4_dc",
                 "nt4_dc_smb1",
@@ -455,6 +455,19 @@ tasks = {
                 "nt4_dc_schannel",
                 "nt4_member",
                 "simpleserver",
+                ])),
+            ("lcov", LCOV_CMD),
+            ("check-clean-tree", "script/clean-source-tree.sh"),
+        ],
+    },
+
+    "samba-no-opath2": {
+        "dependency": "samba-no-opath-build",
+        "sequence": [
+            ("random-sleep", random_sleep(300, 900)),
+            ("test", make_test(
+                cmd="make testonly DISABLE_OPATH=1",
+                include_envs=[
                 "fileserver",
                 "fileserver_smb1",
                 "fileserver_smb1_done",