autobuild: Drop py2 autobuild jobs

Samba v4.11 will no longer support python2, so let's drop the autobuild
jobs. This will save some gitlab/sn-devel time and money, as it's less
work for CI to do.

Note that this highlights some previous inconsistencies:
- samba-none-env-py2 was being built for gitlab but not sn-devel.
- samba-nt4-py2 was being built for sn-devel but not gitlab

I've left samba-buildpy2-only for now, which will be addressed in a
subsequent patch.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
index 4a6e5036f80edef9d1f7af00bc201436de060d16..4e83c197b8929dd853a6dddf5fd37a48eec237fb 100644 (file)
--- a/.gitlab-ci-private.yml
+++ b/.gitlab-ci-private.yml
@@ -18,10 +18,6 @@ samba:
   extends: .private_template
   # this one takes about 4 hours to finish
 
-samba-py2:
-  extends: .private_template
-  # this one takes about 4 hours to finish
-
 samba-fileserver:
   extends: .private_template
   # this one takes about 1 hours to finish
@@ -30,9 +26,5 @@ samba-ad-dc:
   extends: .private_template
   # this one takes about 1 hours to finish
 
-samba-ad-dc-py2:
-  extends: .private_template
-  # this one takes about 1 hours to finish
-
 samba-nt4:
   extends: .private_template

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dce4af6e0b41bb14edd56021776aa972829c933..c11c9b5c00c4ac0ebff234f899a868718949672e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,10 +61,6 @@ samba-none-env:
   extends: .shared_template
   # this one takes about 1 hours to finish
 
-samba-none-env-py2:
-  extends: .shared_template
-  # this one takes about 1 hours to finish
-
 samba-nopython:
   extends: .shared_template
 
@@ -84,16 +80,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
 
@@ -110,5 +99,3 @@ samba-ad-dc-ntvfs:
   extends: .shared_template
   # this one takes about 100 mins to finish
 
-samba-ad-dc-ntvfs-py2:
-  extends: .shared_template

diff --git a/script/autobuild.py b/script/autobuild.py
index b43adcfc33aac1fe98fafaf5ed272cbe168ea5d2..30bc64306ffd5992d217f2ef9ead8f871065cecd 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -36,23 +36,17 @@ cleanup_list = []
 builddirs = {
     "ctdb": "ctdb",
     "samba": ".",
-    "samba-py2": ".",
     "samba-nt4": ".",
-    "samba-nt4-py2": ".",
     "samba-fileserver": ".",
     "samba-xc": ".",
     "samba-o3": ".",
     "samba-ctdb": ".",
     "samba-libs": ".",
-    "samba-libs-py2": ".",
     "samba-static": ".",
     "samba-none-env": ".",
     "samba-ad-dc": ".",
-    "samba-ad-dc-py2": ".",
     "samba-ad-dc-ntvfs": ".",
-    "samba-ad-dc-ntvfs-py2": ".",
     "samba-ad-dc-2": ".",
-    "samba-ad-dc-2-py2": ".",
     "samba-ad-dc-backup": ".",
     "samba-systemkrb5": ".",
     "samba-nopython": ".",