pidl/Python: improve generation of error checking in FromPythonToUnionFunction()

[metze/samba/wip.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dce4af6e0b41bb14edd56021776aa972829c933..32a10181bfa5898940f086eef35a2e6cde5e2c03 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,11 +61,10 @@ samba-none-env:
   extends: .shared_template
   # this one takes about 1 hours to finish
 
-samba-none-env-py2:
+samba-nopython:
   extends: .shared_template
-  # this one takes about 1 hours to finish
 
-samba-nopython:
+samba-nopython-py2:
   extends: .shared_template
 
 samba-systemkrb5:
@@ -84,16 +83,9 @@ samba-ad-dc-2:
 samba-ad-dc-backup:
   extends: .shared_template
 
-samba-ad-dc-2-py2:
-  extends: .shared_template
-  # this one takes about 1 hours to finish
-
 samba-libs:
   extends: .shared_template
 
-samba-libs-py2:
-  extends: .shared_template
-
 samba-static:
   extends: .shared_template
 
@@ -103,12 +95,41 @@ 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:
+  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:
+  extends: .private_template
+  # this one takes about 1 hours to finish
+
+samba-nt4:
+  extends: .private_template