autobuild: Split up the build further with samba-ad-dc-2

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6846b2a782d3d2b6b1e90bb90ce5a84dff180a83..1e86d7ed9f88dc6a35ffa3cb109ae69c02e54d81 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,15 @@ build_samba_ad_dc:
     # this one takes about 1 hours to finish
     - python script/autobuild.py samba-ad-dc     --verbose --tail --testbase /tmp/samba-testbase
 
+build_samba_ad_dc_2:
+  stage: build
+  tags:
+    - docker
+    - private
+  script:
+    # this one takes about 1 hours to finish
+    - python script/autobuild.py samba-ad-dc-2     --verbose --tail --testbase /tmp/samba-testbase
+
 build_samba_none_env:
   stage: build
   tags:

diff --git a/.travis.yml b/.travis.yml
index 2ef0a0b1653578bd19f7483625f716a5b3b0410c..e9b6a6b29386f265122a114ed161b1163a98e381 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ env:
   - TASK=samba-nt4
   - TASK=samba-fileserver
   - TASK=samba-ad-dc
+  - TASK=samba-ad-dc-2
   - TASK=ldb
   - TASK=tdb
   - TASK=talloc

diff --git a/script/autobuild.py b/script/autobuild.py
index 6e8abe77479da96b4fccef4ef9bffb6550fc32df..0a54723c7a590b2ed6c9169b319719ee610c4333 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -36,6 +36,7 @@ builddirs = {
     "samba-test-only"  : ".",
     "samba-none-env"  : ".",
     "samba-ad-dc"  : ".",
+    "samba-ad-dc-2"  : ".",
     "samba-systemkrb5"  : ".",
     "samba-nopython"  : ".",
     "ldb"     : "lib/ldb",
@@ -60,6 +61,7 @@ defaulttasks = [ "ctdb",
                  "samba-static",
                  "samba-none-env",
                  "samba-ad-dc",
+                 "samba-ad-dc-2",
                  "samba-systemkrb5",
                  "samba-nopython",
                  "ldb",
@@ -104,6 +106,9 @@ tasks = {
                  "--exclude-env=nt4_dc "
                  "--exclude-env=nt4_member "
                  "--exclude-env=ad_dc "
+                 "--exclude-env=chgdcpass "
+                 "--exclude-env=vampire_2000_dc "
+                 "--exclude-env=fl2000dc "
                  "--exclude-env=fileserver'",
                  "text/plain"),
                 ("install", "make install", "text/plain"),
@@ -132,6 +137,13 @@ tasks = {
                       ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=ad_dc'", "text/plain"),
                       ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
 
+    # We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long)
+    "samba-ad-dc-2" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+                      ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+                      ("make", "make -j", "text/plain"),
+                      ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=chgdcpass --include-env=vampire_2000_dc --include-env=fl2000dc'", "text/plain"),
+                      ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
     "samba-test-only" : [ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab  --abi-check-disable" + samba_configure_params, "text/plain"),
                           ("make", "make -j", "text/plain"),
                           ("test", 'make test FAIL_IMMEDIATELY=1 TESTS="${TESTS}"',"text/plain") ],