selftest: split schemaupgrade testenv out

Schemaupgrade tests are particularly resource intensive and are causing
runners to hit their memory and CPU limits, so we need to split them
out.

Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e836c6f28defd7c039d7812b7b8865191ab5346..fcd456f59affe4ca7c5740aa1bb3ba9ebe94d173 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,6 +91,9 @@ samba-ad-dc-5:
 samba-ad-dc-6:
   extends: .shared_template
 
+samba-schemaupgrade:
+  extends: .shared_template
+
 samba-ad-dc-backup:
   extends: .shared_template
 

diff --git a/script/autobuild.py b/script/autobuild.py
index 0f95cc50bc88eaaf31adfc1b79e28570be8f62dd..13ea568237ee553e4aa4a441c551e55a593e6a7b 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -56,6 +56,7 @@ builddirs = {
     "samba-systemkrb5": ".",
     "samba-nopython": ".",
     "samba-nopython-py2": ".",
+    "samba-schemaupgrade": ".",
     "ldb": "lib/ldb",
     "tdb": "lib/tdb",
     "talloc": "lib/talloc",
@@ -131,6 +132,8 @@ tasks = {
                  "--exclude-env=rodc "
                  "--exclude-env=ad_dc_default "
                  "--exclude-env=ad_dc_slowtests "
+                 "--exclude-env=schemaupgrade_pair_dc "
+                 "--exclude-env=schemaupgrade_dc "
                  "'",
                  "text/plain"),
                 ("install", "make install", "text/plain"),
@@ -236,6 +239,17 @@ tasks = {
                          "'", "text/plain"),
                         ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
 
+
+    "samba-schemaupgrade": [("random-sleep", "script/random-sleep.sh 1 1", "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=schemaupgrade_dc "
+                         "--include-env=schemaupgrade_pair_dc "
+                         "'", "text/plain"),
+                        ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
     # We split out the ad_dc_ntvfs tests (which are long) so other test do not wait
     # This is currently the longest task, so we don't randomly delay it.
     "samba-ad-dc-ntvfs": [