From 59ee3c864ca360d49196ae4064fe19db01fe6396 Mon Sep 17 00:00:00 2001 From: Aaron Haslett Date: Tue, 2 Apr 2019 10:45:36 +1300 Subject: [PATCH] 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 Reviewed-by: Andrew Bartlett Reviewed-by: Garming Sam --- .gitlab-ci.yml | 3 +++ script/autobuild.py | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e836c6f28d..fcd456f59af 100644 --- 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 0f95cc50bc8..13ea568237e 100755 --- 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": [ -- 2.34.1