sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

selftest: split schemaupgrade testenv out

Browse Source 
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>
This commit is contained in:
Aaron Haslett 2019-04-02 10:45:36 +13:00 committed by Andrew Bartlett
parent 5d8895f347
commit 59ee3c864c
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -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

14
script/autobuild.py
View File

@ -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": [