diff options
| author | Matt Hart <matthew.hart@linaro.org> | 2017-07-27 16:57:18 +0100 |
|---|---|---|
| committer | Matt Hart <matthew.hart@linaro.org> | 2017-07-27 16:57:18 +0100 |
| commit | 6d4195e2cb7607d9bb03a0a83e9e9451d4a1c820 (patch) | |
| tree | ec9368f812b290584be29ab38b065acd31b82150 /lava-v2-jobs-from-api.py | |
| parent | e52a8b63d486435b6f34bb5d111a4c3de65b471b (diff) | |
Remove v1 boots for v2 supported devices to avoid conflicts
Add NFS boot types
Add boot-be templates for BIG_ENDIAN defconfigs
Diffstat (limited to 'lava-v2-jobs-from-api.py')
| -rwxr-xr-x | lava-v2-jobs-from-api.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/lava-v2-jobs-from-api.py b/lava-v2-jobs-from-api.py index 84f6832..351f738 100755 --- a/lava-v2-jobs-from-api.py +++ b/lava-v2-jobs-from-api.py @@ -182,6 +182,8 @@ def main(args): if os.path.exists(template_file) and template_file.endswith('.jinja2'): job_name = tree + '-' + branch + '-' + git_describe + '-' + arch + '-' + defconfig[:100] + '-' + dtb + '-' + device_type + '-' + plan base_url = "%s/%s/%s/%s/%s/%s/" % (storage, build['job'], build['git_branch'], build['kernel'], arch, defconfig) + nfsrootfs_url = None + initrd_url = None if dtb_full.endswith('.dtb'): dtb_url = base_url + "dtbs/" + dtb_full platform = dtb[:-4] @@ -194,19 +196,21 @@ def main(args): if 'BIG_ENDIAN' in defconfig and plan == 'boot-be': endian = 'big' initrd_arch = arch - if arch not in ARCHS: - if arch == 'arm64' and endian == 'big': - initrd_arch = 'arm64be' - if arch == 'arm': - if endian == 'big': - initrd_arch = 'armeb' - else: - initrd_arch = 'armel' + if arch == 'arm64' and endian == 'big': + initrd_arch = 'arm64be' + if arch == 'arm': + if endian == 'big': + initrd_arch = 'armeb' + else: + initrd_arch = 'armel' if 'kselftest' in plan: initrd_url = KSELFTEST_INITRD_URL.format(initrd_arch) else: initrd_url = INITRD_URL.format(initrd_arch) - nfsrootfs_url = NFSROOTFS_URL.format(initrd_arch) if 'nfs' in plan else None + if 'nfs' in plan: + nfsrootfs_url = NFSROOTFS_URL.format(initrd_arch) + initrd_url = None + platform = platform + "_rootfs:nfs" if build['modules']: modules_url = urlparse.urljoin(base_url, build['modules']) else: |