bootstrap: add the result of bootstrap/template.py --render

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32a10181bfa5898940f086eef35a2e6cde5e2c03..505df7cdbe35e17113c2f99a3f6567ab3df58252 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,14 +19,15 @@ 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
+    - cat /etc/os-release
     - mount
     - df -h
+    - cat /proc/swaps
+    - free -h
+  after_script:
+    - mount
+    - df -h
+    - cat /proc/swaps
     - free -h
   artifacts:
     expire_in: 1 week
@@ -57,9 +58,11 @@ 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:
+  extends: .shared_template
+
 samba-none-env:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
 samba-nopython:
   extends: .shared_template
@@ -76,9 +79,23 @@ 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-3:
+  extends: .shared_template
+
+samba-ad-dc-4:
+  extends: .shared_template
+
+samba-ad-dc-5:
+  extends: .shared_template
+
+samba-ad-dc-6:
+  extends: .shared_template
 
 samba-ad-dc-backup:
   extends: .shared_template
@@ -97,20 +114,13 @@ samba-ctdb:
 
 samba-ad-dc-ntvfs:
   extends: .shared_template
-  # this one takes about 100 mins to finish
-
 
 .private_template:
   extends: .shared_template
   tags:
     - docker
     - private
-  before_script:
-    - uname -a
-    - lsb_release -a
-    - mount
-    - df -h
-    - free -h
+    - samba-ci-private
   only:
     variables:
       # These jobs are only run if the gitlab repo has private runners available.
@@ -119,17 +129,14 @@ samba-ad-dc-ntvfs:
       # settings -> CI/CD -> Environment variables
       - $SUPPORT_PRIVATE_TEST == "yes"
 
-samba:
-  extends: .private_template
-  # this one takes about 4 hours to finish
-
 samba-fileserver:
   extends: .private_template
-  # this one takes about 1 hours to finish
 
-samba-ad-dc:
+samba-ad-dc-1:
   extends: .private_template
-  # this one takes about 1 hours to finish
 
 samba-nt4:
   extends: .private_template
+
+samba-schemaupgrade:
+  extends: .private_template