summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Araujo <luis.araujo@collabora.co.uk>2015-07-08 10:20:54 (GMT)
committerLuis Araujo <luis.araujo@collabora.co.uk>2015-07-08 10:20:54 (GMT)
commit7495acf6605fe1b2e6fad33e97b5134d96b5f2e1 (patch)
treee1e0fdac4b0046457995dac1ede5ae23208515a8
parent989a8a3481c5289fd9de375cfaac46bd35b7132a (diff)
downloadtest-definitions-7495acf6605fe1b2e6fad33e97b5134d96b5f2e1.tar.gz
test-definitions-7495acf6605fe1b2e6fad33e97b5134d96b5f2e1.tar.xz
Update json templates for new lqa template engine
This commits updates the json job templates and the kernel profiles file to use the new templating rules (jinja2) of lqa.
-rw-r--r--kernel/boottests/ceti-nfsroot.json6
-rw-r--r--kernel/boottests/yocto-ramdisk.json6
-rw-r--r--kernel/cros_ec/cros-ec-test.json6
-rw-r--r--kernel/profiles.yaml16
-rw-r--r--kernel/rtc/rtc-test.json6
-rw-r--r--kernel/s2r/s2r-test.json6
-rw-r--r--kernel/tegra-emc/tegra-emc.json6
7 files changed, 26 insertions, 26 deletions
diff --git a/kernel/boottests/ceti-nfsroot.json b/kernel/boottests/ceti-nfsroot.json
index bbae135..425078b 100644
--- a/kernel/boottests/ceti-nfsroot.json
+++ b/kernel/boottests/ceti-nfsroot.json
@@ -26,11 +26,11 @@
"command": "submit_results",
"parameters": {
"server": "https://lava.collabora.co.uk/RPC2/",
- "stream": "{{bundle-stream}}"
+ "stream": "{{bundle_stream}}"
}
}
],
- "job_name": "kernel nfs boot test on {{device-type}}",
- "device_type": "{{device-type}}",
+ "job_name": "kernel nfs boot test on {{device_type}}",
+ "device_type": "{{device_type}}",
"timeout": 300
}
diff --git a/kernel/boottests/yocto-ramdisk.json b/kernel/boottests/yocto-ramdisk.json
index ae1b633..19ecca3 100644
--- a/kernel/boottests/yocto-ramdisk.json
+++ b/kernel/boottests/yocto-ramdisk.json
@@ -17,11 +17,11 @@
"command": "submit_results",
"parameters": {
"server": "https://lava.collabora.co.uk/RPC2/",
- "stream": "{{bundle-stream}}"
+ "stream": "{{bundle_stream}}"
}
}
],
- "job_name": "Ramdisk kernel boot test on {{device-type}}",
- "device_type": "{{device-type}}",
+ "job_name": "Ramdisk kernel boot test on {{device_type}}",
+ "device_type": "{{device_type}}",
"timeout": 300
}
diff --git a/kernel/cros_ec/cros-ec-test.json b/kernel/cros_ec/cros-ec-test.json
index dd80e30..9757553 100644
--- a/kernel/cros_ec/cros-ec-test.json
+++ b/kernel/cros_ec/cros-ec-test.json
@@ -38,11 +38,11 @@
"command": "submit_results",
"parameters": {
"server": "https://lava.collabora.co.uk/RPC2/",
- "stream": "{{bundle-stream}}"
+ "stream": "{{bundle_stream}}"
}
}
],
- "device_type": "{{device-type}}",
- "job_name": "cros-ec-test-{{device-type}}",
+ "device_type": "{{device_type}}",
+ "job_name": "cros-ec-test-{{device_type}}",
"timeout": 480
}
diff --git a/kernel/profiles.yaml b/kernel/profiles.yaml
index ace478d..e4820f3 100644
--- a/kernel/profiles.yaml
+++ b/kernel/profiles.yaml
@@ -1,41 +1,41 @@
profiles:
- name: odroid-x2
variables:
- device-type: odroid-x2
+ device_type: odroid-x2
fdtfile: exynos4412-odroidx2
arch: armhf
- name: odroid-xu3
variables:
- device-type: odroid-xu3
+ device_type: odroid-xu3
fdtfile: exynos5422-odroidxu3
arch: armhf
- name: snow
variables:
- device-type: snow
+ device_type: snow
fdtfile: exynos5250-snow
arch: armhf
- name: peach-pi
variables:
- device-type: peach-pi
+ device_type: peach-pi
fdtfile: exynos5800-peach-pi
arch: armhf
- name: jetson-tk1
variables:
- device-type: jetson-tk1
+ device_type: jetson-tk1
fdtfile: tegra124-jetson-tk1
arch: armhf
- name: panda
variables:
- device-type: panda
+ device_type: panda
fdtfile: omap4-panda
arch: armhf
- name: imx6q-sabrelite
variables:
- device-type: imx6q-sabrelite
+ device_type: imx6q-sabrelite
fdtfile: imx6q-sabrelite
arch: armhf
- name: tegra124-nyan-big
variables:
- device-type: tegra124-nyan-big
+ 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 39e1066..b26e326 100644
--- a/kernel/rtc/rtc-test.json
+++ b/kernel/rtc/rtc-test.json
@@ -38,11 +38,11 @@
"command": "submit_results",
"parameters": {
"server": "https://lava.collabora.co.uk/RPC2/",
- "stream": "{{bundle-stream}}"
+ "stream": "{{bundle_stream}}"
}
}
],
- "device_type": "{{device-type}}",
- "job_name": "rtc-test-{{device-type}}",
+ "device_type": "{{device_type}}",
+ "job_name": "rtc-test-{{device_type}}",
"timeout": 480
}
diff --git a/kernel/s2r/s2r-test.json b/kernel/s2r/s2r-test.json
index 6b132cb..9e51ec6 100644
--- a/kernel/s2r/s2r-test.json
+++ b/kernel/s2r/s2r-test.json
@@ -45,11 +45,11 @@
"command": "submit_results",
"parameters": {
"server": "https://lava.collabora.co.uk/RPC2/",
- "stream": "{{bundle-stream}}"
+ "stream": "{{bundle_stream}}"
}
}
],
- "device_type": "{{device-type}}",
- "job_name": "s2r-test-{{device-type}}",
+ "device_type": "{{device_type}}",
+ "job_name": "s2r-test-{{device_type}}",
"timeout": 480
}
diff --git a/kernel/tegra-emc/tegra-emc.json b/kernel/tegra-emc/tegra-emc.json
index 4ab7a1c..ad71c58 100644
--- a/kernel/tegra-emc/tegra-emc.json
+++ b/kernel/tegra-emc/tegra-emc.json
@@ -37,11 +37,11 @@
"command": "submit_results",
"parameters": {
"server": "https://lava.collabora.co.uk/RPC2/",
- "stream": "{{bundle-stream}}"
+ "stream": "{{bundle_stream}}"
}
}
],
- "device_type": "{{device-type}}",
- "job_name": "tegra-emc-{{device-type}}",
+ "device_type": "{{device_type}}",
+ "job_name": "tegra-emc-{{device_type}}",
"timeout": 480
}