diff options
| author | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-07-05 13:28:10 +0100 |
|---|---|---|
| committer | Matt Hart <github@blacklabsystems.com> | 2018-07-05 13:38:07 +0100 |
| commit | 20d9dee0ba2676b6e33eff25dbd08d363d467581 (patch) | |
| tree | 59202a8943fb51f80e72d6ee19c7800ac4d88e42 /lava-v2-jobs-from-api.py | |
| parent | 5215064fc6e3876ab3c5a09579fb6a144625fe1c (diff) | |
lava-v2-jobs-from-api.py: fix buildroot URL for boot tests
Fix logic in determining the initrd to only use the Debian Stretch
Tests rootfs for v4l2 and igt test plans. The bug caused all test
plans to use it except kselftest.
Also remove superfluous '/' in the Debian rootfs URLs.
Fixes: e221ae4b5958 ("Add IGT test plan")
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'lava-v2-jobs-from-api.py')
| -rwxr-xr-x | lava-v2-jobs-from-api.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lava-v2-jobs-from-api.py b/lava-v2-jobs-from-api.py index 21605b9..e8d38e3 100755 --- a/lava-v2-jobs-from-api.py +++ b/lava-v2-jobs-from-api.py @@ -44,9 +44,9 @@ ROOTFS_URL = 'http://storage.kernelci.org/images/rootfs/buildroot/kci-2018.05' INITRD_URL = '/'.join([ROOTFS_URL, '{}', 'base', 'rootfs.cpio.gz']) NFSROOTFS_URL = '/'.join([ROOTFS_URL, '{}', 'base', 'rootfs.tar.xz']) KSELFTEST_INITRD_URL = '/'.join([ROOTFS_URL, '{}', 'tests', 'rootfs.cpio.gz']) -DEBIAN_ROOTFS_URL = 'http://storage.kernelci.org/images/rootfs/debian/stretch/20180627.0/' +DEBIAN_ROOTFS_URL = 'http://storage.kernelci.org/images/rootfs/debian/stretch/20180627.0' DEBIAN_INITRD_URL = '/'.join([DEBIAN_ROOTFS_URL, '{}', 'rootfs.cpio.gz']) -DEBIANTESTS_ROOTFS_URL = 'http://storage.kernelci.org/images/rootfs/debian/stretchtests/20180627.0/' +DEBIANTESTS_ROOTFS_URL = 'http://storage.kernelci.org/images/rootfs/debian/stretchtests/20180627.0' DEBIANTESTS_INITRD_URL = '/'.join([DEBIANTESTS_ROOTFS_URL, '{}', 'rootfs.cpio.gz']) def get_builds(api, token, config): @@ -156,10 +156,10 @@ def get_job_params(config, template, opts, device, build, defconfig, plan): if 'kselftest' in plan: initrd_url = KSELFTEST_INITRD_URL.format(initrd_arch) - elif 'v4l2' or 'igt' in plan: + elif plan in ['v4l2', 'igt']: initrd_url = DEBIANTESTS_INITRD_URL.format(debian_initrd_arch) rootfs_prompt = "/ #" - elif 'cros-ec' in plan: + elif plan in ['cros-ec']: initrd_url = DEBIAN_INITRD_URL.format(debian_initrd_arch) rootfs_prompt = "/ #" else: |