autobuild: Convert old py3 tasks to py2

Now that we are building with python3 by default we need to
convert the old python3 test tasks to python2 (e.g. reverse how
we used do it)

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/script/autobuild.py b/script/autobuild.py
index 5dd4d3a8df6740c933bc4004deebdf29d4468a8c..6948ab64bde07db363b82de84ab8a865bb93b8c6 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -36,21 +36,21 @@ cleanup_list = []
 builddirs = {
     "ctdb": "ctdb",
     "samba": ".",
-    "samba-py3": ".",
+    "samba-py2": ".",
     "samba-nt4": ".",
-    "samba-nt4-py3": ".",
+    "samba-nt4-py2": ".",
     "samba-fileserver": ".",
     "samba-xc": ".",
     "samba-o3": ".",
     "samba-ctdb": ".",
     "samba-libs": ".",
-    "samba-libs-py3": ".",
+    "samba-libs-py2": ".",
     "samba-static": ".",
     "samba-none-env": ".",
     "samba-ad-dc": ".",
-    "samba-ad-dc-py3": ".",
+    "samba-ad-dc-py2": ".",
     "samba-ad-dc-2": ".",
-    "samba-ad-dc-2-py3": ".",
+    "samba-ad-dc-2-py2": ".",
     "samba-systemkrb5": ".",
     "samba-nopython": ".",
     "samba-buildpy2-only": ".",
@@ -81,7 +81,7 @@ samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bu
 if os.environ.get("AUTOBUILD_NO_EXTRA_PYTHON", "0") == "1":
     extra_python = ""
 else:
-    extra_python = "--extra-python=/usr/bin/python3"
+    extra_python = "--extra-python=/usr/bin/python2"
 
 tasks = {
     "ctdb": [("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
@@ -481,7 +481,7 @@ class builder(object):
         if self.py3:
             self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "%s" % extra_python)
             # The trailing space is important
-            self.cmd = self.cmd.replace("${PY3_ONLY}", "python3 ")
+            self.cmd = self.cmd.replace("${PY3_ONLY}", "python2 ")
         else:
             self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "")
             self.cmd = self.cmd.replace("${PY3_ONLY}", "")
@@ -518,7 +518,7 @@ class buildlist(object):
             os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
 
         for n in tasknames:
-            if n not in tasks and n.endswith("-py3"):
+            if n not in tasks and n.endswith("-py2"):
                 b = builder(n,
                             tasks[n[:-4]],
                             cp=n is not "pidl",