mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
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 <abartlet@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sat Aug 25 11:53:15 CEST 2018 on sn-devel-144
This commit is contained in:
parent
3d2baa9c95
commit
05389bcbf8
@ -404,8 +404,9 @@ def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
|
|||||||
class builder(object):
|
class builder(object):
|
||||||
'''handle build of one directory'''
|
'''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.name = name
|
||||||
|
self.py3 = py3
|
||||||
self.dir = builddirs[name]
|
self.dir = builddirs[name]
|
||||||
|
|
||||||
self.tag = self.name.replace('/', '_')
|
self.tag = self.name.replace('/', '_')
|
||||||
@ -474,7 +475,13 @@ class buildlist(object):
|
|||||||
os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
|
os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
|
||||||
|
|
||||||
for n in tasknames:
|
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)
|
self.tlist.append(b)
|
||||||
if options.retry:
|
if options.retry:
|
||||||
rebase_remote = "rebaseon"
|
rebase_remote = "rebaseon"
|
||||||
|
Loading…
Reference in New Issue
Block a user