move invocation_id check

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dce4af6e0b41bb14edd56021776aa972829c933..d999cf4693fa424f6c9d94a10f0fe16246fb1d1f 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,7 @@ 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:
-  extends: .shared_template