Remove all LAVA v1 JSON templates

Now that LAVA v1 has been deprecated, all the JSON templates can be
removed.  LAVA v2 uses only the Jinja2 templates.

Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

46 files changed, 0 insertions, 2742 deletions

diff --git a/templates/boot-be/generic-arm-dtb-kernel-ci-boot-be-template.json b/templates/boot-be/generic-arm-dtb-kernel-ci-boot-be-template.json
deleted file mode 100644
index 7481d53..0000000
--- a/templates/boot-be/generic-arm-dtb-kernel-ci-boot-be-template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armeb/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 18000
-}
diff --git a/templates/boot-be/generic-arm64-dtb-kernel-ci-boot-be-template.json b/templates/boot-be/generic-arm64-dtb-kernel-ci-boot-be-template.json
deleted file mode 100644
index 7a46e25..0000000
--- a/templates/boot-be/generic-arm64-dtb-kernel-ci-boot-be-template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/tmp/arm64be/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 18000
-}
diff --git a/templates/boot-kvm-uefi/generic-arm64-boot-kvm-uefi-template.json b/templates/boot-kvm-uefi/generic-arm64-boot-kvm-uefi-template.json
deleted file mode 100644
index e462ba1..0000000
--- a/templates/boot-kvm-uefi/generic-arm64-boot-kvm-uefi-template.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "timeout": 3600,
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "vm_group":
-    {
-        "host":
-        {
-            "device_type": "{device_type}",
-            "role": "host"
-        },
-        "auto_start_vms": false,
-        "vms": [
-        {
-            "device_type": "kvm-aarch64",
-            "role": "guest"
-        }]
-    },
-    "actions": [
-    {
-        "command": "deploy_linaro_kernel",
-        "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-        },
-        "parameters":
-        {
-            "dtb": "{dtb_url}",
-            "kernel": "{kernel_url}",
-            "overlays": ["{modules_url}"],
-            "nfsrootfs": "http://releases.linaro.org/debian/images/developer-arm64/16.07/linaro-jessie-developer-20160722-88.tar.gz",
-            "target_type": "ubuntu",
-            "role": "host"
-        }
-    },
-    {
-        "command": "deploy_linaro_kernel",
-        "parameters":
-        {
-            "kernel": "{kernel_url}",
-            "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz",
-            "firmware": "http://people.linaro.org/~ard.biesheuvel/lava-uefi/QEMU_EFI_g11948471adfa_RELEASE_GCC49_INTELBDS.fd.gz",
-            "role": "guest"
-        }
-    },
-{
-        "command": "lava_test_shell",
-        "parameters":
-        {
-            "testdef_repos": [
-            {
-                "url": "https://raw.githubusercontent.com/kernelci/lava-kernel-tests/master/kvm/kvm-install-qemu-host.yaml"
-            }],
-
-            "timeout": 1800,
-            "role": "host"
-        }
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters":
-        {
-            "testdef_repos": [
-            {
-                "url": "https://raw.githubusercontent.com/kernelci/lava-kernel-tests/master/kvm/kvm-host.yaml"
-            }],
-            "role": "host"
-        }
-    },
-    {
-        "command": "boot_linaro_image",
-        "parameters":
-        {
-            "role": "guest"
-        }
-    },
-    {
-        "command": "submit_results",
-        "parameters":
-        {
-            "server": "LAVA_SERVER",
-            "stream": "BUNDLE_STREAM"
-        }
-    }]
-}
diff --git a/templates/boot-kvm/generic-arm-boot-kvm-template.json b/templates/boot-kvm/generic-arm-boot-kvm-template.json
deleted file mode 100644
index 2c8f8b9..0000000
--- a/templates/boot-kvm/generic-arm-boot-kvm-template.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "timeout": 3600,
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "vm_group":
-    {
-        "host":
-        {
-            "device_type": "{device_type}",
-            "role": "host"
-        },
-        "auto_start_vms": false,
-        "vms": [
-        {
-            "device_type": "kvm-arm",
-            "role": "guest"
-        }]
-    },
-    "actions": [
-    {
-        "command": "deploy_linaro_kernel",
-        "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-        },
-        "parameters":
-        {
-            "dtb": "{dtb_url}",
-            "kernel": "{kernel_url}",
-            "overlays": ["{modules_url}"],
-            "nfsrootfs": "http://releases.linaro.org/debian/images/developer-armhf/16.06/linaro-jessie-developer-20160620-25.tar.gz",
-            "target_type": "ubuntu",
-            "role": "host"
-        }
-    },
-    {
-        "command": "deploy_linaro_kernel",
-        "parameters":
-        {
-            "kernel": "http://storage.kernelci.org/{tree}/{kernel_version}/arm-multi_v7_defconfig+kvm-guest/zImage",
-            "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz",
-            "dtb": "http://storage.kernelci.org/{tree}/{kernel_version}/arm-multi_v7_defconfig+kvm-guest/dtbs/vexpress-v2p-ca15-tc1.dtb",
-            "role": "guest"
-        }
-    },
-{
-        "command": "lava_test_shell",
-        "parameters":
-        {
-            "testdef_repos": [
-            {
-                "url": "https://raw.githubusercontent.com/kernelci/lava-kernel-tests/master/kvm/kvm-install-qemu-host.yaml"
-            }],
-  
-            "timeout": 1800,
-            "role": "host"
-        }
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters":
-        {
-            "testdef_repos": [
-            {
-                "url": "https://raw.githubusercontent.com/kernelci/lava-kernel-tests/master/kvm/kvm-host.yaml"
-            }],
-            "role": "host"
-        }
-    },
-    {
-        "command": "boot_linaro_image",
-        "parameters":
-        {
-            "role": "guest"
-        }
-    },
-    {
-        "command": "submit_results",
-        "parameters":
-        {
-            "server": "LAVA_SERVER",
-            "stream": "BUNDLE_STREAM"
-        }
-    }]
-}
diff --git a/templates/boot-kvm/generic-arm64-boot-kvm-template.json b/templates/boot-kvm/generic-arm64-boot-kvm-template.json
deleted file mode 100644
index b0e0114..0000000
--- a/templates/boot-kvm/generic-arm64-boot-kvm-template.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "timeout": 3600,
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "vm_group":
-    {
-        "host":
-        {
-            "device_type": "{device_type}",
-            "role": "host"
-        },
-        "auto_start_vms": false,
-        "vms": [
-        {
-            "device_type": "kvm-aarch64",
-            "role": "guest"
-        }]
-    },
-    "actions": [
-    {
-        "command": "deploy_linaro_kernel",
-        "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-        },
-        "parameters":
-        {
-            "dtb": "{dtb_url}",
-            "kernel": "{kernel_url}",
-            "overlays": ["{modules_url}"],
-            "nfsrootfs": "http://releases.linaro.org/debian/images/developer-arm64/16.07/linaro-jessie-developer-20160722-88.tar.gz",
-            "target_type": "ubuntu",
-            "role": "host"
-        }
-    },
-    {
-        "command": "deploy_linaro_kernel",
-        "parameters":
-        {
-            "kernel": "{kernel_url}",
-            "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz",
-            "role": "guest"
-        }
-    },
-{
-        "command": "lava_test_shell",
-        "parameters":
-        {
-            "testdef_repos": [
-            {
-                "url": "https://raw.githubusercontent.com/kernelci/lava-kernel-tests/master/kvm/kvm-install-qemu-host.yaml"
-            }],
-
-            "timeout": 1800,
-            "role": "host"
-        }
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters":
-        {
-            "testdef_repos": [
-            {
-                "url": "https://raw.githubusercontent.com/kernelci/lava-kernel-tests/master/kvm/kvm-host.yaml"
-            }],
-            "role": "host"
-        }
-    },
-    {
-        "command": "boot_linaro_image",
-        "parameters":
-        {
-            "role": "guest"
-        }
-    },
-    {
-        "command": "submit_results",
-        "parameters":
-        {
-            "server": "LAVA_SERVER",
-            "stream": "BUNDLE_STREAM"
-        }
-    }]
-}
diff --git a/templates/boot-nfs-mp/generic-arm-dtb-kernel-ci-boot-nfs-mp-template.json b/templates/boot-nfs-mp/generic-arm-dtb-kernel-ci-boot-nfs-mp-template.json
deleted file mode 100644
index 48bfe97..0000000
--- a/templates/boot-nfs-mp/generic-arm-dtb-kernel-ci-boot-nfs-mp-template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.tar.xz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 18000
-}
diff --git a/templates/boot-nfs/generic-arm-dtb-kernel-ci-boot-nfs-template.json b/templates/boot-nfs/generic-arm-dtb-kernel-ci-boot-nfs-template.json
deleted file mode 100644
index 48bfe97..0000000
--- a/templates/boot-nfs/generic-arm-dtb-kernel-ci-boot-nfs-template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.tar.xz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 18000
-}
diff --git a/templates/boot-nfs/generic-arm64-dtb-kernel-ci-boot-nfs-template.json b/templates/boot-nfs/generic-arm64-dtb-kernel-ci-boot-nfs-template.json
deleted file mode 100644
index 764f17f..0000000
--- a/templates/boot-nfs/generic-arm64-dtb-kernel-ci-boot-nfs-template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.tar.xz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 18000
-}
diff --git a/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json b/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json
deleted file mode 100644
index 4824774..0000000
--- a/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz",
-                "bootloadertype": "cfe"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 600
-}
diff --git a/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json b/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
deleted file mode 100644
index a781c1e..0000000
--- a/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 600
-}
diff --git a/templates/boot/generic-arm-kernel-ci-boot-template.json b/templates/boot/generic-arm-kernel-ci-boot-template.json
deleted file mode 100644
index 57fafa5..0000000
--- a/templates/boot/generic-arm-kernel-ci-boot-template.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 600
-}
diff --git a/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json b/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
deleted file mode 100644
index 23d2c5c..0000000
--- a/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 600
-}
diff --git a/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json b/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json
deleted file mode 100644
index c37ca63..0000000
--- a/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "bootloadertype": "uefi",
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 600
-}
diff --git a/templates/boot/generic-arm64-kernel-ci-boot-template.json b/templates/boot/generic-arm64-kernel-ci-boot-template.json
deleted file mode 100644
index f0a13f2..0000000
--- a/templates/boot/generic-arm64-kernel-ci-boot-template.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 600
-}
diff --git a/templates/boot/generic-x86-kernel-ci-boot-template.json b/templates/boot/generic-x86-kernel-ci-boot-template.json
deleted file mode 100644
index 8fd3be6..0000000
--- a/templates/boot/generic-x86-kernel-ci-boot-template.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "bootloadertype": "ipxe",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/x86/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 600
-}
\ No newline at end of file
diff --git a/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json b/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
deleted file mode 100644
index 2a3f4fb..0000000
--- a/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.01/openembedded/aarch64/linaro-image-minimal-genericarmv8-20150123-736.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 600
-}
diff --git a/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json b/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json
deleted file mode 100644
index b9349a3..0000000
--- a/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/ubuntu/images/nano/15.12/linaro-vivid-nano-20151215-714.tar.gz",
-                "target_type": "ubuntu"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "https://github.com/kernelci/lava-kernel-tests.git",
-                        "testdef": "cpufreq-ljt-stress-test/cpufreq-ljt-stress-test.yaml"
-                    }
-                ],
-                "timeout": 3600
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/cyclictest-basic/generic-arm-dtb-kernel-ci-cyclictest-basic-template.json b/templates/cyclictest-basic/generic-arm-dtb-kernel-ci-cyclictest-basic-template.json
deleted file mode 100644
index 3c6f4ba..0000000
--- a/templates/cyclictest-basic/generic-arm-dtb-kernel-ci-cyclictest-basic-template.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.06/openembedded/images/lng-armv7a/linaro-image-lng-genericarmv7a-20150618-335.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "parameters": {
-                            "RTIME": "1800"
-                        },
-                        "testdef": "openembedded/cyclictest-basic.yaml"
-                    }
-                ],
-                "timeout": 1810
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/cyclictest-basic/generic-arm64-uboot-dtb-kernel-ci-cyclictest-basic-template.json b/templates/cyclictest-basic/generic-arm64-uboot-dtb-kernel-ci-cyclictest-basic-template.json
deleted file mode 100644
index 8503ced..0000000
--- a/templates/cyclictest-basic/generic-arm64-uboot-dtb-kernel-ci-cyclictest-basic-template.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://people.linaro.org/~anders.roxell/buildroot-latest-2015.09.02/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "export TIMES=8",
-                    "export INTERVAL=10000",
-                    "export LATENCY=1000000",
-                    "export DURATION=20",
-                    "./common/scripts/cyclictest-basic.sh ${TIMES} ${INTERVAL} ${LATENCY} ${DURATION}"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+result:(?P<result>\\w+)\\s+measurement:(?P<measurement>.+)\\s+units:(?P<units>.+)",
-                "timeout": 1810
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/cyclictest-basic/juno-arm64-dtb-kernel-ci-cyclictest-basic-template.json b/templates/cyclictest-basic/juno-arm64-dtb-kernel-ci-cyclictest-basic-template.json
deleted file mode 100644
index 5bf8c63..0000000
--- a/templates/cyclictest-basic/juno-arm64-dtb-kernel-ci-cyclictest-basic-template.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.06/openembedded/images/lng-armv8/linaro-image-lng-genericarmv8-20150618-754.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "parameters": {
-                            "RTIME": "1800"
-                        },
-                        "testdef": "openembedded/cyclictest-basic.yaml"
-                    }
-                ],
-                "timeout": 1810
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/cyclictest/generic-arm-dtb-kernel-ci-cyclictest-template.json b/templates/cyclictest/generic-arm-dtb-kernel-ci-cyclictest-template.json
deleted file mode 100644
index 45f0309..0000000
--- a/templates/cyclictest/generic-arm-dtb-kernel-ci-cyclictest-template.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "export MAX=15000",
-                    "export AVG=50",
-                    "export RTIME=1800",
-                    "taskset 0x00000002 fping -g 127.0.0.1 127.0.0.10 -t 100 -q -l &> /dev/null &",
-                    "taskset 0x00000002 ./openembedded/scripts/infinite_loop.py $(expr $RTIME - 60) &> /dev/null &",
-                    "taskset 0x00000002 cyclictest -t 1 -p 80 -i 10000 -n -a1 -v -D $(expr $RTIME / 2) > ~/cyclictest_full.log &",
-                    "taskset 0x00000002 cyclictest -t 50 -p 80 -i 10000 -n -a1 -q -D $RTIME > ~/cyclictest_summary.log",
-                    "cat ~/cyclictest_summary.log | ./openembedded/scripts/cyclictest.py $MAX $AVG",
-                    "lava-test-run-attach ~/cyclictest_summary.log text/plain",
-                    "tar -cjf ~/cyclictest_full.log.tbz ~/cyclictest_full.log",
-                    "lava-test-run-attach ~/cyclictest_full.log.tbz application/x-bzip2",
-                    "killall calibrator infinite_loop.py fping"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+result:(?P<result>\\w+)\\s+measurement:(?P<measurement>.+)\\s+units:(?P<units>.+)",
-                "timeout": 1810
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/cyclictest/generic-arm64-uboot-dtb-kernel-ci-cyclictest-template.json b/templates/cyclictest/generic-arm64-uboot-dtb-kernel-ci-cyclictest-template.json
deleted file mode 100644
index 34edafb..0000000
--- a/templates/cyclictest/generic-arm64-uboot-dtb-kernel-ci-cyclictest-template.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "export MAX=15000",
-                    "export AVG=50",
-                    "export RTIME=1800",
-                    "taskset 0x00000002 fping -g 127.0.0.1 127.0.0.10 -t 100 -q -l &> /dev/null &",
-                    "taskset 0x00000002 ./openembedded/scripts/infinite_loop.py $(expr $RTIME - 60) &> /dev/null &",
-                    "taskset 0x00000002 cyclictest -t 1 -p 80 -i 10000 -n -a1 -v -D $(expr $RTIME / 2) > ~/cyclictest_full.log &",
-                    "taskset 0x00000002 cyclictest -t 50 -p 80 -i 10000 -n -a1 -q -D $RTIME > ~/cyclictest_summary.log",
-                    "cat ~/cyclictest_summary.log | ./openembedded/scripts/cyclictest.py $MAX $AVG",
-                    "lava-test-run-attach ~/cyclictest_summary.log text/plain",
-                    "tar -cjf ~/cyclictest_full.log.tbz ~/cyclictest_full.log",
-                    "lava-test-run-attach ~/cyclictest_full.log.tbz application/x-bzip2",
-                    "killall calibrator infinite_loop.py fping"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+result:(?P<result>\\w+)\\s+measurement:(?P<measurement>.+)\\s+units:(?P<units>.+)",
-                "timeout": 1810
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/cyclictest/generic-x86-kernel-ci-cyclictest-template.json b/templates/cyclictest/generic-x86-kernel-ci-cyclictest-template.json
deleted file mode 100644
index 327bad3..0000000
--- a/templates/cyclictest/generic-x86-kernel-ci-cyclictest-template.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "bootloadertype": "ipxe",
-                "overlays": ["{modules_url}"],
-                "kernel": "{kernel_url}",
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/x86/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "export MAX=15000",
-                    "export AVG=50",
-                    "export RTIME=1800",
-                    "taskset 0x00000002 fping -g 127.0.0.1 127.0.0.10 -t 100 -q -l &> /dev/null &",
-                    "taskset 0x00000002 ./openembedded/scripts/infinite_loop.py $(expr $RTIME - 60) &> /dev/null &",
-                    "taskset 0x00000002 cyclictest -t 1 -p 80 -i 10000 -n -a1 -v -D $(expr $RTIME / 2) > ~/cyclictest_full.log &",
-                    "taskset 0x00000002 cyclictest -t 50 -p 80 -i 10000 -n -a1 -q -D $RTIME > ~/cyclictest_summary.log",
-                    "cat ~/cyclictest_summary.log | ./openembedded/scripts/cyclictest.py $MAX $AVG",
-                    "lava-test-run-attach ~/cyclictest_summary.log text/plain",
-                    "tar -cjf ~/cyclictest_full.log.tbz ~/cyclictest_full.log",
-                    "lava-test-run-attach ~/cyclictest_full.log.tbz application/x-bzip2",
-                    "killall calibrator infinite_loop.py fping"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+result:(?P<result>\\w+)\\s+measurement:(?P<measurement>.+)\\s+units:(?P<units>.+)",
-                "timeout": 1810
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/cyclictest/juno-arm64-dtb-kernel-ci-cyclictest-template.json b/templates/cyclictest/juno-arm64-dtb-kernel-ci-cyclictest-template.json
deleted file mode 100644
index e88adae..0000000
--- a/templates/cyclictest/juno-arm64-dtb-kernel-ci-cyclictest-template.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/tests/rootfs.tar.xz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "export MAX=15000",
-                    "export AVG=50",
-                    "export RTIME=1800",
-                    "taskset 0x00000002 fping -g 127.0.0.1 127.0.0.10 -t 100 -q -l &> /dev/null &",
-                    "taskset 0x00000002 ./openembedded/scripts/infinite_loop.py $(expr $RTIME - 60) &> /dev/null &",
-                    "taskset 0x00000002 cyclictest -t 1 -p 80 -i 10000 -n -a1 -v -D $(expr $RTIME / 2) > ~/cyclictest_full.log &",
-                    "taskset 0x00000002 cyclictest -t 50 -p 80 -i 10000 -n -a1 -q -D $RTIME > ~/cyclictest_summary.log",
-                    "cat ~/cyclictest_summary.log | ./openembedded/scripts/cyclictest.py $MAX $AVG",
-                    "lava-test-run-attach ~/cyclictest_summary.log text/plain",
-                    "tar -cjf ~/cyclictest_full.log.tbz ~/cyclictest_full.log",
-                    "lava-test-run-attach ~/cyclictest_full.log.tbz application/x-bzip2",
-                    "killall calibrator infinite_loop.py fping"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+result:(?P<result>\\w+)\\s+measurement:(?P<measurement>.+)\\s+units:(?P<units>.+)",
-                "timeout": 1810
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/hackbench/generic-arm64-uboot-dtb-kernel-ci-hackbench-template.json b/templates/hackbench/generic-arm64-uboot-dtb-kernel-ci-hackbench-template.json
deleted file mode 100644
index a325abe..0000000
--- a/templates/hackbench/generic-arm64-uboot-dtb-kernel-ci-hackbench-template.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "for i in $(seq 1 1000); do timeout 10s hackbench | tee -a hackbench_res.txt; done",
-                    "./common/scripts/min_max_avg_parse.py hackbench_res.txt 'Time:' 'Seconds'"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^(?P<test_case_id>[^:]+):\\s*(?P<measurement>[0-9.]+)\\s+(?P<units>\\w+)\\s+(?P<result>\\w+)",
-                "timeout": 5000
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/hackbench/generic-x86-kernel-ci-hackbench-template.json b/templates/hackbench/generic-x86-kernel-ci-hackbench-template.json
deleted file mode 100644
index 42ae316..0000000
--- a/templates/hackbench/generic-x86-kernel-ci-hackbench-template.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "bootloadertype": "ipxe",
-                "overlays": ["{modules_url}"],
-                "kernel": "{kernel_url}",
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/x86/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "for i in $(seq 1 1000); do timeout 10s hackbench | tee -a hackbench_res.txt; done",
-                    "./common/scripts/min_max_avg_parse.py hackbench_res.txt 'Time:' 'Seconds'"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^(?P<test_case_id>[^:]+):\\s*(?P<measurement>[0-9.]+)\\s+(?P<units>\\w+)\\s+(?P<result>\\w+)",
-                "timeout": 5000
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/hackbench/juno-arm64-dtb-kernel-ci-hackbench-template.json b/templates/hackbench/juno-arm64-dtb-kernel-ci-hackbench-template.json
deleted file mode 100644
index 4f0c40a..0000000
--- a/templates/hackbench/juno-arm64-dtb-kernel-ci-hackbench-template.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/tests/rootfs.tar.xz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "for i in $(seq 1 1000); do timeout 10s hackbench | tee -a hackbench_res.txt; done",
-                    "./common/scripts/min_max_avg_parse.py hackbench_res.txt 'Time:' 'Seconds'"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^(?P<test_case_id>[^:]+):\\s*(?P<measurement>[0-9.]+)\\s+(?P<units>\\w+)\\s+(?P<result>\\w+)",
-                "timeout": 5000
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json b/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json
deleted file mode 100644
index 9eec497..0000000
--- a/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "overlays": ["{modules_url}",
-                             "http://storage.kernelci.org/images/selftests/arm/kselftest.tar.gz"],
-                "kernel": "{kernel_url}",
-                "ramdisk": "http://storage.kernelci.org/images/selftests/arm/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "cd /kselftest",
-                    "./run_kselftest.sh"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]",
-                "timeout": 3000
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/kselftest/generic-arm64-dtb-kernel-ci-kselftest-template.json b/templates/kselftest/generic-arm64-dtb-kernel-ci-kselftest-template.json
deleted file mode 100644
index 1f3dca6..0000000
--- a/templates/kselftest/generic-arm64-dtb-kernel-ci-kselftest-template.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "overlays": ["{modules_url}",
-                             "http://storage.kernelci.org/images/selftests/arm64/kselftest.tar.gz"],
-                "kernel": "{kernel_url}",
-                "ramdisk": "http://storage.kernelci.org/images/selftests/arm64/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "cd /kselftest",
-                    "./run_kselftest.sh"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]",
-                "timeout": 3000
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/kselftest/generic-arm64-kernel-ci-kselftest-template.json b/templates/kselftest/generic-arm64-kernel-ci-kselftest-template.json
deleted file mode 100644
index 46eb579..0000000
--- a/templates/kselftest/generic-arm64-kernel-ci-kselftest-template.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "overlays": ["{modules_url}",
-                             "http://storage.kernelci.org/images/selftests/arm64/kselftest.tar.gz"],
-                "kernel": "{kernel_url}",
-                "ramdisk": "http://storage.kernelci.org/images/selftests/arm64/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "cd /kselftest",
-                    "./run_kselftest.sh"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]",
-                "timeout": 3000
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/kselftest/generic-x86-kernel-ci-kselftest-template.json b/templates/kselftest/generic-x86-kernel-ci-kselftest-template.json
deleted file mode 100644
index 06fc7c6..0000000
--- a/templates/kselftest/generic-x86-kernel-ci-kselftest-template.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "bootloadertype": "ipxe",
-                "overlays": ["{modules_url}",
-                             "http://storage.kernelci.org/images/selftests/x86/kselftest.tar.gz"],
-                "kernel": "{kernel_url}",
-                "ramdisk": "http://storage.kernelci.org/images/selftests/x86/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "cd /kselftest",
-                    "./run_kselftest.sh"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]",
-                "timeout": 3000
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/kselftest/juno-arm64-dtb-kernel-ci-kselftest-template.json b/templates/kselftest/juno-arm64-dtb-kernel-ci-kselftest-template.json
deleted file mode 100644
index 3394637..0000000
--- a/templates/kselftest/juno-arm64-dtb-kernel-ci-kselftest-template.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "bootloadertype": "uefi",
-                "dtb": "{dtb_url}",
-                "overlays": ["{modules_url}",
-                             "http://storage.kernelci.org/images/selftests/arm/kselftest.tar.gz"],
-                "kernel": "{kernel_url}",
-                "ramdisk": "http://storage.kernelci.org/images/selftests/arm/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image"
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "cd /kselftest",
-                    "./run_kselftest.sh"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]",
-                "timeout": 3000
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/lmbench/generic-arm-dtb-kernel-ci-lmbench-template.json b/templates/lmbench/generic-arm-dtb-kernel-ci-lmbench-template.json
deleted file mode 100644
index c38521e..0000000
--- a/templates/lmbench/generic-arm-dtb-kernel-ci-lmbench-template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "./common/scripts/lmbench.sh 2>&1| tee lmbench.log",
-                    "./common/scripts/parse_lmbench.sh lmbench.log ms result_lmbench.log",
-                    "cat result_lmbench.log",
-                    "lava-test-run-attach result_lmbench.log text/plain"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^(?P<test_case_id>[^:]+):\\s*(?P<measurement>[0-9.]+)\\s+(?P<units>\\w+)\\s+(?P<result>\\w+)",
-                "timeout": 1800
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/lmbench/generic-arm64-uboot-dtb-kernel-ci-lmbench-template.json b/templates/lmbench/generic-arm64-uboot-dtb-kernel-ci-lmbench-template.json
deleted file mode 100644
index 69052a2..0000000
--- a/templates/lmbench/generic-arm64-uboot-dtb-kernel-ci-lmbench-template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "./common/scripts/lmbench.sh 2>&1| tee lmbench.log",
-                    "./common/scripts/parse_lmbench.sh lmbench.log ms result_lmbench.log",
-                    "cat result_lmbench.log",
-                    "lava-test-run-attach result_lmbench.log text/plain"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^(?P<test_case_id>[^:]+):\\s*(?P<measurement>[0-9.]+)\\s+(?P<units>\\w+)\\s+(?P<result>\\w+)",
-                "timeout": 1800
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/lmbench/generic-x86-kernel-ci-lmbench-template.json b/templates/lmbench/generic-x86-kernel-ci-lmbench-template.json
deleted file mode 100644
index 8a57c7f..0000000
--- a/templates/lmbench/generic-x86-kernel-ci-lmbench-template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "bootloadertype": "ipxe",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/x86/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "./common/scripts/lmbench.sh 2>&1| tee lmbench.log",
-                    "./common/scripts/parse_lmbench.sh lmbench.log ms result_lmbench.log",
-                    "cat result_lmbench.log",
-                    "lava-test-run-attach result_lmbench.log text/plain"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^(?P<test_case_id>[^:]+):\\s*(?P<measurement>[0-9.]+)\\s+(?P<units>\\w+)\\s+(?P<result>\\w+)",
-                "timeout": 1800
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/lmbench/juno-arm64-dtb-kernel-ci-lmbench-template.json b/templates/lmbench/juno-arm64-dtb-kernel-ci-lmbench-template.json
deleted file mode 100644
index 4440a21..0000000
--- a/templates/lmbench/juno-arm64-dtb-kernel-ci-lmbench-template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/tests/rootfs.tar.xz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "cd ${LAVA_TESTDIR}",
-                    "./common/scripts/lmbench.sh 2>&1| tee lmbench.log",
-                    "./common/scripts/parse_lmbench.sh lmbench.log ms result_lmbench.log",
-                    "cat result_lmbench.log",
-                    "lava-test-run-attach result_lmbench.log text/plain"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^(?P<test_case_id>[^:]+):\\s*(?P<measurement>[0-9.]+)\\s+(?P<units>\\w+)\\s+(?P<result>\\w+)",
-                "timeout": 1800
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1811
-}
diff --git a/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json
deleted file mode 100644
index e4b3c37..0000000
--- a/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.02/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150222-322.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "parameters": {
-                            "TST_CMDFILES": "mm"
-                        },
-                        "testdef": "openembedded/ltp.yaml"
-                    }
-                ],
-                "timeout": 3600
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json
deleted file mode 100644
index aa70092..0000000
--- a/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.02/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150222-741.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "parameters": {
-                            "TST_CMDFILES": "mm"
-                        },
-                        "testdef": "openembedded/ltp.yaml"
-                    }
-                ],
-                "timeout": 3600
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json
deleted file mode 100644
index aa70092..0000000
--- a/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.02/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150222-741.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "parameters": {
-                            "TST_CMDFILES": "mm"
-                        },
-                        "testdef": "openembedded/ltp.yaml"
-                    }
-                ],
-                "timeout": 3600
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/ltp-realtime/generic-arm-dtb-kernel-ci-ltp-realtime-template.json b/templates/ltp-realtime/generic-arm-dtb-kernel-ci-ltp-realtime-template.json
deleted file mode 100644
index 8898406..0000000
--- a/templates/ltp-realtime/generic-arm-dtb-kernel-ci-ltp-realtime-template.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "export LTP_REALTIME_TESTS_TO_RUN='async_handler gtod_latency hrtimer-prio matrix_mult measurement periodic_cpu_load pi_perf prio-preempt prio-wake pthread_kill_latency rt-migrate sched_football sched_jitter sched_latency thread_clock'",
-                    "cd /usr",
-                    "for TEST_TO_RUN in ${LTP_REALTIME_TESTS_TO_RUN} ; do ./testscripts/test_realtime.sh -t func/$TEST_TO_RUN | ${LAVA_TESTDIR}/common/scripts/ltp-realtime2LAVA.py; done"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+measurement:(?P<measurement>[\\d\\.]+)\\s+units:(?P<units>\\w+)\\s+result:(?P<result>\\w+)",
-                "timeout": 1800
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1801
-}
diff --git a/templates/ltp-realtime/generic-arm64-uboot-dtb-kernel-ci-ltp-realtime-template.json b/templates/ltp-realtime/generic-arm64-uboot-dtb-kernel-ci-ltp-realtime-template.json
deleted file mode 100644
index f97245a..0000000
--- a/templates/ltp-realtime/generic-arm64-uboot-dtb-kernel-ci-ltp-realtime-template.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "export LTP_REALTIME_TESTS_TO_RUN='async_handler gtod_latency hrtimer-prio matrix_mult measurement periodic_cpu_load pi_perf prio-preempt prio-wake pthread_kill_latency rt-migrate sched_football sched_jitter sched_latency thread_clock'",
-                    "cd /usr",
-                    "for TEST_TO_RUN in ${LTP_REALTIME_TESTS_TO_RUN} ; do ./testscripts/test_realtime.sh -t func/$TEST_TO_RUN | ${LAVA_TESTDIR}/common/scripts/ltp-realtime2LAVA.py; done"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+measurement:(?P<measurement>[\\d\\.]+)\\s+units:(?P<units>\\w+)\\s+result:(?P<result>\\w+)",
-                "timeout": 1800
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1801
-}
diff --git a/templates/ltp-realtime/generic-x86-kernel-ci-ltp-realtime-template.json b/templates/ltp-realtime/generic-x86-kernel-ci-ltp-realtime-template.json
deleted file mode 100644
index 256e336..0000000
--- a/templates/ltp-realtime/generic-x86-kernel-ci-ltp-realtime-template.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "bootloadertype": "ipxe",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/x86/tests/rootfs.cpio.gz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "export LTP_REALTIME_TESTS_TO_RUN='async_handler gtod_latency hrtimer-prio matrix_mult measurement periodic_cpu_load pi_perf prio-preempt prio-wake pthread_kill_latency rt-migrate sched_football sched_jitter sched_latency thread_clock'",
-                    "cd /usr",
-                    "for TEST_TO_RUN in ${LTP_REALTIME_TESTS_TO_RUN} ; do ./testscripts/test_realtime.sh -t func/$TEST_TO_RUN | ${LAVA_TESTDIR}/common/scripts/ltp-realtime2LAVA.py; done"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+measurement:(?P<measurement>[\\d\\.]+)\\s+units:(?P<units>\\w+)\\s+result:(?P<result>\\w+)",
-                "timeout": 1800
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "low",
-    "timeout": 1801
-}
diff --git a/templates/ltp-realtime/juno-arm64-dtb-kernel-ci-ltp-realtime-template.json b/templates/ltp-realtime/juno-arm64-dtb-kernel-ci-ltp-realtime-template.json
deleted file mode 100644
index 3943534..0000000
--- a/templates/ltp-realtime/juno-arm64-dtb-kernel-ci-ltp-realtime-template.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/tests/rootfs.tar.xz"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "test_image_prompt": "sh-4.3#"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "export LAVA_TESTDIR=/usr/share/linaro-testsuites",
-                    "export LTP_REALTIME_TESTS_TO_RUN='async_handler gtod_latency hrtimer-prio matrix_mult measurement periodic_cpu_load pi_perf prio-preempt prio-wake pthread_kill_latency rt-migrate sched_football sched_jitter sched_latency thread_clock'",
-                    "cd /usr",
-                    "for TEST_TO_RUN in ${LTP_REALTIME_TESTS_TO_RUN} ; do ./testscripts/test_realtime.sh -t func/$TEST_TO_RUN | ${LAVA_TESTDIR}/common/scripts/ltp-realtime2LAVA.py; done"
-                ],
-                "fixupdict": [
-                    "PASS:pass",
-                    "FAIL:fail",
-                    "SKIP:skip"
-                ],
-                "parser": "^test_case_id:(?P<test_case_id>.+)\\s+measurement:(?P<measurement>[\\d\\.]+)\\s+units:(?P<units>\\w+)\\s+result:(?P<result>\\w+)",
-                "timeout": 1800
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 1801
-}
diff --git a/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json
deleted file mode 100644
index 181d252..0000000
--- a/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.02/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150222-322.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "parameters": {
-                            "TST_CMDFILES": "syscalls"
-                        },
-                        "testdef": "openembedded/ltp.yaml"
-                    }
-                ],
-                "timeout": 3600
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json
deleted file mode 100644
index 7ee1b8b..0000000
--- a/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.02/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150222-741.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "parameters": {
-                            "TST_CMDFILES": "syscalls"
-                        },
-                        "testdef": "openembedded/ltp.yaml"
-                    }
-                ],
-                "timeout": 3600
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}
diff --git a/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json
deleted file mode 100644
index 7ee1b8b..0000000
--- a/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "metadata": {
-                "image.type": "{image_type}",
-                "image.url": "{image_url}",
-                "kernel.tree": "{tree}",
-                "kernel.describe": "{kernel_describe}",
-                "kernel.branch": "{kernel_branch}",
-                "arch": "{arch}",
-                "device.tree": "{device_tree}",
-                "kernel.endian": "{endian}",
-                "kernel.defconfig": "{defconfig}",
-                "platform.fastboot": "{fastboot}",
-                "test.plan": "{test_plan}",
-                "test.suite": "{test_suite}",
-                "test.set": "{test_set}",
-                "test.desc": "{test_desc}",
-                "test.type": "{test_type}"
-            },
-            "parameters": {
-                "dtb": "{dtb_url}",
-                "kernel": "{kernel_url}",
-                "overlays": ["{modules_url}"],
-                "nfsrootfs": "http://releases.linaro.org/archive/15.02/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150222-741.rootfs.tar.gz"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "parameters": {
-                            "TST_CMDFILES": "syscalls"
-                        },
-                        "testdef": "openembedded/ltp.yaml"
-                    }
-                ],
-                "timeout": 3600
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "LAVA_SERVER",
-                "stream": "BUNDLE_STREAM"
-            }
-        }
-    ],
-    "device_type": "{device_type}",
-    "job_name": "{job_name}",
-    "logging_level": "DEBUG",
-    "priority": "{priority}",
-    "timeout": 3601
-}