netcmd: Fix passwordsettings --max-pwd-age command

[kai/samba-autobuild/.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37ca0549d81031d325d4544e5c694d8fc48220d7..1e836c6f28defd7c039d7812b7b8865191ab5346 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,14 +2,16 @@
 
 
 variables:
-  SAMBA_BUILD_GITLAB_CI_REGISTRY: registry.gitlab.com
-  SAMBA_BUILD_IMAGES_PROJECT: samba-team/samba
-  SAMBA_BUILD: latest
+  # we run autobuild.py inside a samba CI docker image located on gitlab's registry
+  SAMBA_CI_CONTAINER_REGISTRY: registry.gitlab.com
+  SAMBA_CI_CONTAINER_NAME: samba-team/samba
+  SAMBA_CI_CONTAINER_TAG: latest
+  SAMBA_CI_CONTAINER_IMAGE: $SAMBA_CI_CONTAINER_REGISTRY/$SAMBA_CI_CONTAINER_NAME:$SAMBA_CI_CONTAINER_TAG
   GIT_STRATEGY: fetch
   GIT_DEPTH: "3"
 
 .shared_template:
-  image: $SAMBA_BUILD_GITLAB_CI_REGISTRY/$SAMBA_BUILD_IMAGES_PROJECT:$SAMBA_BUILD
+  image: $SAMBA_CI_CONTAINER_IMAGE
   stage: build
   tags:
     - docker
@@ -17,12 +19,6 @@ variables:
   before_script:
     - uname -a
     - lsb_release -a
-    - echo "Build starting (preparing swap)..."
-    - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then
-        sudo dd if=/dev/zero of=/samba-swap bs=1M count=6144;
-        sudo mkswap /samba-swap;
-        sudo swapon /samba-swap;
-      fi
     - mount
     - df -h
     - free -h
@@ -40,6 +36,9 @@ variables:
       - runner_system_failure
       - stuck_or_timeout_failure
   script:
+    # gitlab predefines CI_JOB_NAME for each job. The gitlab job usually matches the
+    # autobuild name, which means we can define a default template that runs most autobuild jobs
+    - echo "Running cmd script/autobuild.py $CI_JOB_NAME --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
     - script/autobuild.py $CI_JOB_NAME    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 others:
@@ -52,17 +51,19 @@ others:
     - script/autobuild.py tdb              --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
     - script/autobuild.py tevent           --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
-samba-none-env:
+samba:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
-samba-none-env-py2:
+samba-none-env:
   extends: .shared_template
   # this one takes about 1 hours to finish
 
 samba-nopython:
   extends: .shared_template
 
+samba-nopython-py2:
+  extends: .shared_template
+
 samba-systemkrb5:
   extends: .shared_template
 
@@ -72,21 +73,28 @@ samba-xc:
 samba-o3:
   extends: .shared_template
 
+samba-ad-member:
+  extends: .shared_template
+
 samba-ad-dc-2:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
-samba-ad-dc-backup:
+samba-ad-dc-3:
   extends: .shared_template
 
-samba-ad-dc-2-py2:
+samba-ad-dc-4:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
-samba-libs:
+samba-ad-dc-5:
+  extends: .shared_template
+
+samba-ad-dc-6:
   extends: .shared_template
 
-samba-libs-py2:
+samba-ad-dc-backup:
+  extends: .shared_template
+
+samba-libs:
   extends: .shared_template
 
 samba-static:
@@ -98,12 +106,36 @@ ctdb:
 samba-ctdb:
   extends: .shared_template
 
-samba-buildpy2-only:
-  extends: .shared_template
-
 samba-ad-dc-ntvfs:
   extends: .shared_template
   # this one takes about 100 mins to finish
 
-samba-ad-dc-ntvfs-py2:
+
+.private_template:
   extends: .shared_template
+  tags:
+    - docker
+    - private
+  before_script:
+    - uname -a
+    - lsb_release -a
+    - mount
+    - df -h
+    - free -h
+  only:
+    variables:
+      # These jobs are only run if the gitlab repo has private runners available.
+      # To enable private jobs, you must add the following var and value to
+      # your gitlab repo by navigating to:
+      # settings -> CI/CD -> Environment variables
+      - $SUPPORT_PRIVATE_TEST == "yes"
+
+samba-fileserver:
+  extends: .private_template
+  # this one takes about 1 hours to finish
+
+samba-ad-dc-1:
+  extends: .private_template
+
+samba-nt4:
+  extends: .private_template