diff options
| author | Matt Hart <matthew.hart@linaro.org> | 2017-11-06 16:17:52 +0000 |
|---|---|---|
| committer | Matt Hart <matthew.hart@linaro.org> | 2017-11-06 16:17:52 +0000 |
| commit | 4437f6b541b70c8564bbef8ffca272872c730310 (patch) | |
| tree | 222e90e0997c93224f564ac93a29ec2fe02efd23 /lava-v2-jobs-from-api.py | |
| parent | 336f2da2c797c842a8951da11ea7f72098251a2c (diff) | |
Fix rpi3, blacklists on v2, and dont boot test kselftest configs
The rpi3 has been blacklisted to as many old kernels as I could
find, and the console setting is now overriden using context.
V2 blacklisting was not working, it was being checked against the
tree name not git describe.
And do not boot test kselftest config.
Diffstat (limited to 'lava-v2-jobs-from-api.py')
| -rwxr-xr-x | lava-v2-jobs-from-api.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lava-v2-jobs-from-api.py b/lava-v2-jobs-from-api.py index 30720e4..069d080 100755 --- a/lava-v2-jobs-from-api.py +++ b/lava-v2-jobs-from-api.py @@ -69,7 +69,6 @@ def main(args): git_describe = args.get('describe') tree = args.get('tree') expected = int(args.get('defconfigs')) - kernel = tree headers = { "Authorization": token, } @@ -165,17 +164,17 @@ def main(args): elif "LPAE" in defconfig and not lpae: print "LPAE is not support on %s" % device_type continue - elif any([x for x in device['kernel_blacklist'] if x in kernel]): - print "kernel %s is blacklisted for device %s" % (kernel, device_type) + elif any([x for x in device['kernel_blacklist'] if x in git_describe]): + print "git_describe %s is blacklisted for device %s" % (git_describe, device_type) continue - elif any([x for x in device['nfs_blacklist'] if x in kernel]) \ + elif any([x for x in device['nfs_blacklist'] if x in git_describe]) \ and plan in ['boot-nfs', 'boot-nfs-mp']: - print "kernel %s is blacklisted for NFS on device %s" % (kernel, device_type) + print "git_describe %s is blacklisted for NFS on device %s" % (git_describe, device_type) continue elif 'be_blacklist' in device \ - and any([x for x in device['be_blacklist'] if x in kernel]) \ + and any([x for x in device['be_blacklist'] if x in git_describe]) \ and plan in ['boot-be']: - print "kernel %s is blacklisted for BE on device %s" % (kernel, device_type) + print "git_describe %s is blacklisted for BE on device %s" % (git_describe, device_type) continue elif (arch_defconfig not in plan_defconfigs) and (plan != "boot"): print "defconfig %s not in test plan %s" % (arch_defconfig, plan) @@ -184,6 +183,8 @@ def main(args): print "device_type %s is not in targets %s" % (device_type, targets) elif arch == 'x86' and dtb == 'x86-32' and 'i386' not in arch_defconfig: print "%s is not a 32-bit x86 build, skipping for 32-bit device %s" % (defconfig, device_type) + elif 'kselftest' in defconfig and plan != 'kselftest': + print "Skipping kselftest defconfig because plan was not kselftest" else: for template in device['templates']: short_template_file = plan + '/' + str(template) @@ -194,6 +195,7 @@ def main(args): nfsrootfs_url = None initrd_url = None callback_name = 'lava/boot' if 'boot' in plan else 'lava/test' + context = device['context'] if 'context' in device else None if dtb_full.endswith('.dtb'): dtb_url = base_url + "dtbs/" + dtb_full platform = dtb[:-4] @@ -266,7 +268,8 @@ def main(args): 'callback': args.get('callback'), 'api': api, 'lab_name': lab_name, - 'callback_name': callback_name + 'callback_name': callback_name, + 'context': context, } jobs.append(job) else: |