From 05389bcbf854eaad1e299d5bea7d68806f7b72ba Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 16 Aug 2018 13:48:21 +1200 Subject: [PATCH] autobuild: Allow automatic handling of autobuild tasks ending in -py3 This will allow splitting up of the python2 and python3 tests without duplication of this already complex file. Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sat Aug 25 11:53:15 CEST 2018 on sn-devel-144 --- script/autobuild.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/script/autobuild.py b/script/autobuild.py index 8ffa6d44697..5fac8d312d2 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -404,8 +404,9 @@ def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True): class builder(object): '''handle build of one directory''' - def __init__(self, name, sequence, cp=True): + def __init__(self, name, sequence, cp=True, py3=False): self.name = name + self.py3 = py3 self.dir = builddirs[name] self.tag = self.name.replace('/', '_') @@ -474,7 +475,13 @@ class buildlist(object): os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1' for n in tasknames: - b = builder(n, tasks[n], cp=n is not "pidl") + if n not in tasknames and n.endswith("-py3"): + b = builder(n, + tasks[n[:-4]], + cp=n is not "pidl", + py3=True) + else: + b = builder(n, tasks[n], cp=n is not "pidl") self.tlist.append(b) if options.retry: rebase_remote = "rebaseon"