gitlab-ci: Run several AD tests with MIT KDC

This will avoid introducing regressions in either client or server code.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62a3c7fcb5d4bc15ab606c4fab0ce5efc58a4c61..66f92f4436a637158fc71f9d3a2e13551bf0d995 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,9 +119,6 @@ samba-nopython:
 samba-nopython-py2:
   extends: .shared_template
 
-samba-systemkrb5:
-  extends: .shared_template
-
 samba-xc:
   extends: .shared_template
 
@@ -158,6 +155,12 @@ samba-ctdb:
 samba-ad-dc-ntvfs:
   extends: .shared_template
 
+samba-ad-member-mitkrb5:
+  extends: .shared_template
+
+samba-ad-dc-4-mitkrb5:
+  extends: .shared_template
+
 .private_template:
   extends: .shared_template
   tags:
@@ -189,6 +192,9 @@ samba-nt4:
 samba-schemaupgrade:
   extends: .private_template
 
+samba-ad-dc-1-mitkrb5:
+  extends: .private_template
+
 # 'pages' is a special job which can publish artifacts in `public` dir to gitlab pages
 pages:
   image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-${SAMBA_CI_CONTAINER_IMAGE}:${SAMBA_CI_CONTAINER_TAG}
@@ -199,14 +205,17 @@ pages:
   dependencies:  # tell gitlab to download artifacts for these jobs
     - samba
     - samba-ad-dc-1
+    - samba-ad-dc-1-mitkrb5
     - samba-ad-dc-2
     - samba-ad-dc-3
     - samba-ad-dc-4
+    - samba-ad-dc-4-mitkrb5
     - samba-ad-dc-5
     - samba-ad-dc-6
     - samba-ad-dc-backup
     - samba-ad-dc-ntvfs
     - samba-ad-member
+    - samba-ad-member-mitkrb5
     - samba-ctdb
     - samba-fileserver
     - samba-libs
@@ -216,7 +225,6 @@ pages:
     - samba-nt4
     - samba-schemaupgrade
     - samba-static
-    - samba-systemkrb5
     - samba-xc
     # - ctdb  # TODO
     - others

diff --git a/script/autobuild.py b/script/autobuild.py
index 29e6234ded943ebb64077a02bcc52e527e69a010..e4a36aab34e568f226f8ec873a853280ba25d8e5 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -125,6 +125,7 @@ builddirs = {
     "samba-nt4": ".",
     "samba-fileserver": ".",
     "samba-ad-member": ".",
+    "samba-ad-member-mitkrb5": ".",
     "samba-xc": ".",
     "samba-o3": ".",
     "samba-ctdb": ".",
@@ -132,14 +133,15 @@ builddirs = {
     "samba-static": ".",
     "samba-none-env": ".",
     "samba-ad-dc-1": ".",
+    "samba-ad-dc-1-mitkrb5": ".",
     "samba-ad-dc-2": ".",
     "samba-ad-dc-3": ".",
     "samba-ad-dc-4": ".",
+    "samba-ad-dc-4-mitkrb5": ".",
     "samba-ad-dc-5": ".",
     "samba-ad-dc-6": ".",
     "samba-ad-dc-ntvfs": ".",
     "samba-ad-dc-backup": ".",
-    "samba-systemkrb5": ".",
     "samba-nopython": ".",
     "samba-nopython-py2": ".",
     "samba-schemaupgrade": ".",
@@ -427,6 +429,47 @@ tasks = {
         ("check-clean-tree", "script/clean-source-tree.sh"),
         ],
 
+    "samba-ad-member-mitkrb5": [
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --with-system-mitkrb5 --with-experimental-mit-ad-dc" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "ad_member",
+            "ad_member_idmap_rid",
+            "ad_member_idmap_ad",
+            "ad_member_rfc2307",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ],
+
+    "samba-ad-dc-1-mitkrb5": [
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --with-system-mitkrb5 --with-experimental-mit-ad-dc" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "ad_dc",
+            "ad_dc_no_nss",
+            "ad_dc_no_ntlm",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ],
+
+    "samba-ad-dc-4-mitkrb5": [
+        ("random-sleep", random_sleep(1, 1)),
+        ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --with-system-mitkrb5 --with-experimental-mit-ad-dc" + samba_configure_params),
+        ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "fl2000dc",
+            "fl2003dc",
+            "fl2008dc",
+            "fl2008r2dc",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ],
+
     "samba-test-only": [
         ("configure", "./configure.developer --with-selftest-prefix=./bin/ab  --abi-check-disable" + samba_configure_params),
         ("make", "make -j"),
@@ -538,19 +581,6 @@ tasks = {
         ("nonshared-make", "make -j"),
         ],
 
-    "samba-systemkrb5": [
-        ("random-sleep", random_sleep(900, 1500)),
-        ("configure", "./configure.developer " + samba_configure_params + " --with-system-mitkrb5 --with-experimental-mit-ad-dc"),
-        ("make", "make -j"),
-        # we currently cannot run a full make test, a limited list of tests could be run
-        # via "make test TESTS=sometests"
-        ("test", make_test(include_envs=["ktest"])),
-        ("lcov", LCOV_CMD),
-        ("install", "make install"),
-        ("check-clean-tree", "script/clean-source-tree.sh"),
-        ("clean", "make clean"),
-        ],
-
     # Test Samba without python still builds.  When this test fails
     # due to more use of Python, the expectations is that the newly
     # failing part of the code should be disabled when

diff --git a/selftest/knownfail.d/net_ads_mit b/selftest/knownfail.d/net_ads_mit
new file mode 100644 (file)
index 0000000..3646314
--- /dev/null
+++ b/selftest/knownfail.d/net_ads_mit
@@ -0,0 +1 @@
+^samba4.blackbox.net_ads.changetrustpw