[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Mon Mar 23 14:47:02 UTC 2020
The branch, master has been updated
via 9bdc5a67428 autobuild: Merge samba-simpleserver into samba-nt4
via 88c4305ffb2 selftest: Run smb2.compound_find against filesrever only, not nt4_dc and ad_dc
via 7a44bd1c422 autobuild: Merge the samba-ktest-heimdal and samba-fileserver jobs
via fb2918bb048 .gitlab-ci.yml: Move the short samba-xc job into "others"
via 607c9ab307d build: Require --without-ad-dc for --without-ads
from 4337c144bcb s3: Remove tevent_wait code. The last user was fsp->deferred_close.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9bdc5a674288a25d4aafda5cb105d57e5c5636f0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Mar 22 08:15:30 2020 +1300
autobuild: Merge samba-simpleserver into samba-nt4
This saves CI resources (20mins build time) at the expense of making
the samba-nt4 job take 45min (5 min longer).
The new maximum job time is 1:15 by samba-o3 on the different hosts.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Mon Mar 23 14:45:59 UTC 2020 on sn-devel-184
commit 88c4305ffb208895df2899610a8b9310d3836e2d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Mar 22 08:29:33 2020 +1300
selftest: Run smb2.compound_find against filesrever only, not nt4_dc and ad_dc
This is a slow test of SMB2 protocol features, it needs not to be repeated. It only
got run against both by accident at the original merge and then extended to
run on the [compount_find] share (with smbd:find async delay usec = 10000)
but really does not need to be run three times.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7a44bd1c422d7e20aa0e81fcc2d40a83b6414d1f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 12 16:07:01 2020 +1300
autobuild: Merge the samba-ktest-heimdal and samba-fileserver jobs
This avoids a full compile of Samba just to test Kerberos with a system Heimdal
while still providing an environment to test other fileserver features.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit fb2918bb048349e6793a17f2f6c35f96e033ab0f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 12 13:43:45 2020 +1300
.gitlab-ci.yml: Move the short samba-xc job into "others"
This job is over in 8mins total and much of that is spent setting up.
It can safely be combined with the others in "others"
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 607c9ab307db36aee0604d209a13b45d28c63d9b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jul 24 16:22:12 2019 +1200
build: Require --without-ad-dc for --without-ads
Building an AD DC while setting --without-ads makes no sense and just wastes compile time on our build hosts.
To allow samba-nt4 to build --without-ad-dc we set rpc.spoolss.notify
(which is built on the NTVFS fileserver for the callbacks) to run in
the ad_member environment rather than nt4_dc and ad_dc.
This is also just more realistic in any case.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 25 +++++++------------------
script/autobuild.py | 29 +++++------------------------
source3/selftest/tests.py | 7 ++++---
source3/wscript | 3 +++
4 files changed, 19 insertions(+), 45 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8275959118..06890ee9c99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,12 +105,13 @@ include:
others:
extends: .shared_template
script:
- - script/autobuild.py ldb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py pidl $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py replace $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py talloc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py tdb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py tevent $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py ldb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py pidl $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py replace $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py talloc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py tdb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py tevent $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py samba-xc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
samba:
extends: .shared_template
@@ -124,9 +125,6 @@ samba-nopython:
samba-nopython-py2:
extends: .shared_template
-samba-xc:
- extends: .shared_template
-
samba-admem:
extends: .shared_template
@@ -186,15 +184,9 @@ samba-ad-dc-4-mitkrb5:
samba-ad-dc-backup:
extends: .private_template
-samba-simpleserver:
- extends: .private_template
-
samba-fileserver:
extends: .private_template
-samba-ktest-heimdal:
- extends: .private_template
-
samba-ad-dc-1:
extends: .private_template
@@ -220,7 +212,6 @@ pages:
- samba-mitkrb5
- samba-nopython
- samba-nopython-py2
- - samba-xc
- samba-admem
- samba-ad-dc-2
- samba-ad-dc-3
@@ -236,9 +227,7 @@ pages:
- samba-admem-mit
- samba-ad-dc-4-mitkrb5
- samba-ad-dc-backup
- - samba-simpleserver
- samba-fileserver
- - samba-ktest-heimdal
- samba-ad-dc-1
- samba-nt4
- samba-schemaupgrade
diff --git a/script/autobuild.py b/script/autobuild.py
index dc46bcdd129..3889d6ed620 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -296,12 +296,13 @@ tasks = {
"samba-nt4": [
("random-sleep", random_sleep(300, 900)),
- ("configure", "./configure.developer --without-ads --with-selftest-prefix=./bin/ab" + samba_configure_params),
+ ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json --with-selftest-prefix=./bin/ab" + samba_configure_params),
("make", "make -j"),
("test", make_test(include_envs=[
"nt4_dc",
"nt4_dc_schannel",
"nt4_member",
+ "simpleserver",
])),
("lcov", LCOV_CMD),
("install", "make install"),
@@ -309,35 +310,15 @@ tasks = {
("clean", "make clean"),
],
- "samba-simpleserver": [
- ("random-sleep", random_sleep(300, 900)),
- ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json --with-selftest-prefix=./bin/ab" + samba_configure_params),
- ("make", "make -j"),
- ("test", make_test(include_envs=[
- "simpleserver",
- ])),
- ("lcov", LCOV_CMD),
- ("check-clean-tree", "script/clean-source-tree.sh"),
- ],
-
"samba-fileserver": [
("random-sleep", random_sleep(300, 900)),
- ("configure", "./configure.developer --without-ad-dc --with-selftest-prefix=./bin/ab" + samba_configure_params),
+ ("configure", "./configure.developer --without-ad-dc --with-system-heimdalkrb5 --with-selftest-prefix=./bin/ab" + samba_configure_params),
("make", "make -j"),
("test", make_test(include_envs=[
"fileserver",
"maptoguest",
- ])),
- ("lcov", LCOV_CMD),
- ("check-clean-tree", "script/clean-source-tree.sh"),
- ],
-
- "samba-ktest-heimdal": [
- ("random-sleep", random_sleep(300, 900)),
- ("configure", "./configure.developer --without-ad-dc --with-system-heimdalkrb5 --with-selftest-prefix=./bin/ab" + samba_configure_params),
- ("make", "make -j"),
- ("test", make_test(include_envs=[
- "ktest",
+ "ktest", # ktest is also tested in samba and samba-mitkrb5
+ # but is tested here against a system Heimdal
])),
("lcov", LCOV_CMD),
("check-clean-tree", "script/clean-source-tree.sh"),
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 208c89cb071..a3f60aa4b0c 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -710,9 +710,8 @@ for t in tests:
elif t == "vfs.acl_xattr":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
elif t == "smb2.compound_find":
- plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER/compound_find -U$USERNAME%$PASSWORD')
- plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
- plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
+ plansmbtorture4testsuite(t, "fileserver", '//$SERVER/compound_find -U$USERNAME%$PASSWORD')
+ plansmbtorture4testsuite(t, "fileserver", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
elif t == "rpc.samr.users.privileges":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=torture:nt4_dc=true')
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
@@ -745,6 +744,8 @@ for t in tests:
elif t == "rpc.samba3.pipes_supported_interfaces":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+ elif t == "rpc.spoolss.notify":
+ plansmbtorture4testsuite(t, "ad_member", '//$SERVER_IP/tmp -U$DC_USERNAME%$DC_PASSWORD')
else:
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
diff --git a/source3/wscript b/source3/wscript
index 6d5bd22ca49..48194f261a4 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -810,6 +810,9 @@ msg.msg_accrightslen = sizeof(fd);
forced_shared_modules.extend(TO_LIST('idmap_ad idmap_rfc2307'))
elif Options.options.with_ads == False:
Logs.info("Building without Active Directory support (--without-ads).")
+ if not Options.options.without_ad_dc:
+ conf.fatal("Building --without-ads requires also "
+ "building --without-ad-dc.")
else:
if not use_ads_krb5:
Logs.warn("Active Directory support not available: krb5 libs don't have all required features")
--
Samba Shared Repository
More information about the samba-cvs
mailing list