summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci-private.yml8
-rw-r--r--.gitlab-ci.yml13
-rwxr-xr-xscript/autobuild.py6
3 files changed, 0 insertions, 27 deletions
diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
index 4a6e5036f80..4e83c197b89 100644
--- 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 8dce4af6e0b..c11c9b5c00c 100644
--- 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 b43adcfc33a..30bc64306ff 100755
--- 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": ".",