summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2016-02-24 17:51:04 (GMT)
committerTomeu Vizoso <tomeu.vizoso@collabora.com>2016-05-12 08:56:14 (GMT)
commit41b09f3518c6f4ade0779259ba79d49619f151a0 (patch)
treee83e119c94fa13570ad4718300c6f0dc5239fec2
parent36612807d24b97729378809c23ba6bb2efa9e4f8 (diff)
downloadtest-definitions-41b09f3518c6f4ade0779259ba79d49619f151a0.tar.gz
test-definitions-41b09f3518c6f4ade0779259ba79d49619f151a0.tar.xz
kernel: Use underscores in variable substitution
lqa fails if the variable name has a - in it, so use _ instead. Also rename device_type to lava_device_type, so we can use it from multinode jobs; lqa will substitute every json variable named 'device_type' otherwise, including the multinode parts we don't want to substitute. Signed-off-by: Daniel Stone <daniels@collabora.com>
-rw-r--r--kernel/boottests/ceti-nfsroot.json4
-rw-r--r--kernel/boottests/yocto-ramdisk.json4
-rw-r--r--kernel/cros_ec/cros-ec-test.json4
-rw-r--r--kernel/profiles.yaml20
-rw-r--r--kernel/rtc/rtc-test.json4
-rw-r--r--kernel/s2r/s2r-test.json4
-rw-r--r--kernel/tegra-emc/tegra-emc.json4
7 files changed, 22 insertions, 22 deletions
diff --git a/kernel/boottests/ceti-nfsroot.json b/kernel/boottests/ceti-nfsroot.json
index 425078b..dfae2cd 100644
--- a/kernel/boottests/ceti-nfsroot.json
+++ b/kernel/boottests/ceti-nfsroot.json
@@ -30,7 +30,7 @@
}
}
],
- "job_name": "kernel nfs boot test on {{device_type}}",
- "device_type": "{{device_type}}",
+ "job_name": "kernel nfs boot test on {{lava_device_type}}",
+ "device_type": "{{lava_device_type}}",
"timeout": 300
}
diff --git a/kernel/boottests/yocto-ramdisk.json b/kernel/boottests/yocto-ramdisk.json
index 19ecca3..1f6736b 100644
--- a/kernel/boottests/yocto-ramdisk.json
+++ b/kernel/boottests/yocto-ramdisk.json
@@ -21,7 +21,7 @@
}
}
],
- "job_name": "Ramdisk kernel boot test on {{device_type}}",
- "device_type": "{{device_type}}",
+ "job_name": "Ramdisk kernel boot test on {{lava_device_type}}",
+ "device_type": "{{lava_device_type}}",
"timeout": 300
}
diff --git a/kernel/cros_ec/cros-ec-test.json b/kernel/cros_ec/cros-ec-test.json
index 9757553..0d85bc3 100644
--- a/kernel/cros_ec/cros-ec-test.json
+++ b/kernel/cros_ec/cros-ec-test.json
@@ -42,7 +42,7 @@
}
}
],
- "device_type": "{{device_type}}",
- "job_name": "cros-ec-test-{{device_type}}",
+ "device_type": "{{lava_device_type}}",
+ "job_name": "cros-ec-test-{{lava_device_type}}",
"timeout": 480
}
diff --git a/kernel/profiles.yaml b/kernel/profiles.yaml
index 370368a..f8fe1f5 100644
--- a/kernel/profiles.yaml
+++ b/kernel/profiles.yaml
@@ -1,51 +1,51 @@
profiles:
- name: beaglebone-black
variables:
- device_type: beaglebone-black
+ lava_device_type: beaglebone-black
fdtfile: am335x-boneblack
arch: armhf
- name: odroid-x2
variables:
- device_type: odroid-x2
+ lava_device_type: odroid-x2
fdtfile: exynos4412-odroidx2
arch: armhf
- name: odroid-xu3
variables:
- device_type: odroid-xu3
+ lava_device_type: odroid-xu3
fdtfile: exynos5422-odroidxu3
arch: armhf
- name: rk3288-rock2-square
variables:
- device_type: rk3288-rock2-square
+ lava_device_type: rk3288-rock2-square
fdtfile: rk3288-rock2-square
arch: armhf
- name: snow
variables:
- device_type: snow
+ lava_device_type: snow
fdtfile: exynos5250-snow
arch: armhf
- name: peach-pi
variables:
- device_type: peach-pi
+ lava_device_type: peach-pi
fdtfile: exynos5800-peach-pi
arch: armhf
- name: jetson-tk1
variables:
- device_type: jetson-tk1
+ lava_device_type: jetson-tk1
fdtfile: tegra124-jetson-tk1
arch: armhf
- name: panda
variables:
- device_type: panda
+ lava_device_type: panda
fdtfile: omap4-panda
arch: armhf
- name: imx6q-sabrelite
variables:
- device_type: imx6q-sabrelite
+ lava_device_type: imx6q-sabrelite
fdtfile: imx6q-sabrelite
arch: armhf
- name: tegra124-nyan-big
variables:
- device_type: tegra124-nyan-big
+ lava_device_type: tegra124-nyan-big
fdtfile: tegra124-nyan-big
arch: armhf
diff --git a/kernel/rtc/rtc-test.json b/kernel/rtc/rtc-test.json
index b26e326..ab4fd58 100644
--- a/kernel/rtc/rtc-test.json
+++ b/kernel/rtc/rtc-test.json
@@ -42,7 +42,7 @@
}
}
],
- "device_type": "{{device_type}}",
- "job_name": "rtc-test-{{device_type}}",
+ "device_type": "{{lava_device_type}}",
+ "job_name": "rtc-test-{{lava_device_type}}",
"timeout": 480
}
diff --git a/kernel/s2r/s2r-test.json b/kernel/s2r/s2r-test.json
index 9e51ec6..7851859 100644
--- a/kernel/s2r/s2r-test.json
+++ b/kernel/s2r/s2r-test.json
@@ -49,7 +49,7 @@
}
}
],
- "device_type": "{{device_type}}",
- "job_name": "s2r-test-{{device_type}}",
+ "device_type": "{{lava_device_type}}",
+ "job_name": "s2r-test-{{lava_device_type}}",
"timeout": 480
}
diff --git a/kernel/tegra-emc/tegra-emc.json b/kernel/tegra-emc/tegra-emc.json
index ad71c58..658fa88 100644
--- a/kernel/tegra-emc/tegra-emc.json
+++ b/kernel/tegra-emc/tegra-emc.json
@@ -41,7 +41,7 @@
}
}
],
- "device_type": "{{device_type}}",
- "job_name": "tegra-emc-{{device_type}}",
+ "device_type": "{{lava_device_type}}",
+ "job_name": "tegra-emc-{{lava_device_type}}",
"timeout": 480
}