aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--.travis.yml1
-rwxr-xr-xscript/autobuild.py12
3 files changed, 20 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e3b11271a9..aac810cb992 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,14 @@ build_samba_nt4:
# this one takes about 1 hours to finish
- python script/autobuild.py samba-nt4 --verbose --tail --testbase /tmp/samba-testbase
+build_samba_ad_dc:
+ stage: build
+ tags:
+ - autobuild
+ script:
+ # this one takes about 1 hours to finish
+ - python script/autobuild.py samba-ad-dc --verbose --tail --testbase /tmp/samba-testbase
+
build_samba_none_env:
stage: build
tags:
diff --git a/.travis.yml b/.travis.yml
index 7c092660707..acd6f484100 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ env:
- TASK=samba-nopython
- TASK=samba-systemkrb5
- TASK=samba-nt4
+ - TASK=samba-ad-dc
- TASK=ldb
- TASK=tdb
- TASK=talloc
diff --git a/script/autobuild.py b/script/autobuild.py
index 7712d10ddfc..0294afaae3e 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -34,6 +34,7 @@ builddirs = {
"samba-static" : ".",
"samba-test-only" : ".",
"samba-none-env" : ".",
+ "samba-ad-dc" : ".",
"samba-systemkrb5" : ".",
"samba-nopython" : ".",
"ldb" : "lib/ldb",
@@ -56,6 +57,7 @@ defaulttasks = [ "ctdb",
"samba-libs",
"samba-static",
"samba-none-env",
+ "samba-ad-dc",
"samba-systemkrb5",
"samba-nopython",
"ldb",
@@ -98,7 +100,8 @@ tasks = {
("test", "make test FAIL_IMMEDIATELY=1 "
"TESTS='--exclude-env=none "
"--exclude-env=nt4_dc "
- "--exclude-env=nt4_member'", "text/plain"),
+ "--exclude-env=nt4_member "
+ "--exclude-env=ad_dc ", "text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain") ],
@@ -111,6 +114,13 @@ tasks = {
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "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" : [ ("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=ad_dc'", "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") ],