remove support for lng 3.14 kernels

Change-Id: Id0483b83d2fbaad644de63d060f3add81dc1fa47
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>

36 files changed, 0 insertions, 898 deletions

diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base-nfs.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base-nfs.yaml
deleted file mode 100644
index 06fdb368b7..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base-nfs.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/exynos5250-arndale.dtb'
-    kernel: '${KERNEL_URL}/zImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7a'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/nohz-isolation.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: 'async_handler gtod_latency hrtimer-prio matrix_mult measurement periodic_cpu_load pi_perf prio-preempt pthread_kill_latency rt-migrate sched_football sched_jitter sched_latency thread_clock'
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base-sdcard.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base-sdcard.yaml
deleted file mode 100644
index 1d23bf95a4..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base-sdcard.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7a'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/nohz-isolation.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: 'async_handler gtod_latency hrtimer-prio matrix_mult measurement periodic_cpu_load pi_perf prio-preempt pthread_kill_latency rt-migrate sched_football sched_jitter sched_latency thread_clock'
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base.yaml
deleted file mode 120000
index 5fa1f3d833..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-base.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-base-sdcard.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base-nfs.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base-nfs.yaml
deleted file mode 100644
index 6eef916eec..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base-nfs.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/exynos5250-arndale.dtb'
-    kernel: '${KERNEL_URL}/zImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7ab'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/nohz-isolation.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: 'async_handler gtod_latency hrtimer-prio matrix_mult measurement periodic_cpu_load pi_perf prio-preempt pthread_kill_latency rt-migrate sched_football sched_jitter sched_latency thread_clock'
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base-sdcard.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base-sdcard.yaml
deleted file mode 100644
index ac8c4a8c71..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base-sdcard.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7ab'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/nohz-isolation.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: 'async_handler gtod_latency hrtimer-prio matrix_mult measurement periodic_cpu_load pi_perf prio-preempt pthread_kill_latency rt-migrate sched_football sched_jitter sched_latency thread_clock'
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base.yaml
deleted file mode 120000
index 58987c8cf3..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-base.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-be-base-sdcard.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark-nfs.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark-nfs.yaml
deleted file mode 100644
index 2857f36aca..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark-nfs.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/exynos5250-arndale.dtb'
-    kernel: '${KERNEL_URL}/zImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7ab'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/lmbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm-menchmark.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/hackbench.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark-sdcard.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark-sdcard.yaml
deleted file mode 100644
index cc48d78043..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark-sdcard.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7ab'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/lmbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm-menchmark.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/hackbench.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark.yaml
deleted file mode 120000
index 9026f2bef7..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-benchmark.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-be-benchmark-sdcard.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic-nfs.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic-nfs.yaml
deleted file mode 100644
index 855cba70b4..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic-nfs.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/exynos5250-arndale.dtb'
-    kernel: '${KERNEL_URL}/zImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7ab'
-- command: lava_test_shell
-  parameters:
-    timeout: 7600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/cyclictest.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic-sdcard.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic-sdcard.yaml
deleted file mode 100644
index 5a0accf61f..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic-sdcard.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7ab'
-- command: lava_test_shell
-  parameters:
-    timeout: 7600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/cyclictest.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic.yaml
deleted file mode 120000
index 1901e5d423..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-cyclic.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-be-cyclic-sdcard.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-nfs.json b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-nfs.json
deleted file mode 100644
index a4fc6da444..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-nfs.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/exynos5250-arndale.dtb",
-        "kernel": "${KERNEL_URL}/zImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lng-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "test_image_prompt": "root@genericarmv7ab"
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "server": "http://${LAVA_SERVER}",
-        "stream": "${BUNDLE_STREAM_NAME}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-nfs.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-nfs.yaml
deleted file mode 100644
index 21eabc0f89..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-nfs.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/exynos5250-arndale.dtb'
-    kernel: '${KERNEL_URL}/zImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7ab'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-sdcard.json b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-sdcard.json
deleted file mode 100644
index 83268ada71..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-sdcard.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lng-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "test_image_prompt": "root@genericarmv7ab"
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "server": "http://${LAVA_SERVER}",
-        "stream": "${BUNDLE_STREAM_NAME}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-sdcard.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-sdcard.yaml
deleted file mode 100644
index 0b420a06c4..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be-sdcard.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7ab'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be.yaml
deleted file mode 120000
index 17ad683827..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-be-sdcard.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark-nfs.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark-nfs.yaml
deleted file mode 100644
index b4dc9b2803..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark-nfs.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/exynos5250-arndale.dtb'
-    kernel: '${KERNEL_URL}/zImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7a'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/lmbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm-menchmark.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/hackbench.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark-sdcard.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark-sdcard.yaml
deleted file mode 100644
index cd65ea765c..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark-sdcard.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7a'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/lmbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm-menchmark.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/hackbench.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark.yaml
deleted file mode 120000
index 300a486000..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-benchmark.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-benchmark-sdcard.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic-nfs.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic-nfs.yaml
deleted file mode 100644
index 22f80173a3..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic-nfs.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/exynos5250-arndale.dtb'
-    kernel: '${KERNEL_URL}/zImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7a'
-- command: lava_test_shell
-  parameters:
-    timeout: 7600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/cyclictest.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic-sdcard.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic-sdcard.yaml
deleted file mode 100644
index 14d34d8369..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic-sdcard.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7a'
-- command: lava_test_shell
-  parameters:
-    timeout: 7600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/cyclictest.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic.yaml
deleted file mode 120000
index 6a6e486990..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-cyclic.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-cyclic-sdcard.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-nfs.json b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-nfs.json
deleted file mode 100644
index f721374ecf..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-nfs.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/exynos5250-arndale.dtb",
-        "kernel": "${KERNEL_URL}/zImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lng-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "test_image_prompt": "root@genericarmv7a"
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "server": "http://${LAVA_SERVER}",
-        "stream": "${BUNDLE_STREAM_NAME}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-nfs.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-nfs.yaml
deleted file mode 100644
index e304582c2e..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-nfs.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/exynos5250-arndale.dtb'
-    kernel: '${KERNEL_URL}/zImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7a'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-sdcard.json b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-sdcard.json
deleted file mode 100644
index 8d597f1742..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-sdcard.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lng-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "test_image_prompt": "root@genericarmv7a"
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "server": "http://${LAVA_SERVER}",
-        "stream": "${BUNDLE_STREAM_NAME}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-sdcard.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-sdcard.yaml
deleted file mode 100644
index b6b914b38e..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template-sdcard.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@genericarmv7a'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 120000
index 11f7083347..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-sdcard.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-base-ramdisk.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-base-ramdisk.yaml
deleted file mode 100644
index 806d09ad27..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-base-ramdisk.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'ipxe'
-    kernel: '${KERNEL_URL}/bzImage-x86-64'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    kernel.build: '${BUILD_NUMBER}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-x86-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@linaro'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/nohz-isolation.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-base.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-base.yaml
deleted file mode 120000
index 0387de4edd..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-base.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-base-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-benchmark-ramdisk.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-benchmark-ramdisk.yaml
deleted file mode 100644
index d47ce74cfe..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-benchmark-ramdisk.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'ipxe'
-    kernel: '${KERNEL_URL}/bzImage-x86-64'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    kernel.build: '${BUILD_NUMBER}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-x86-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@linaro'
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/lmbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kvm-benchmark.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/hackbench.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-benchmark.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-benchmark.yaml
deleted file mode 120000
index 5fa55631a7..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-benchmark.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-benchmark-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-cyclic-ramdisk.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-cyclic-ramdisk.yaml
deleted file mode 100644
index 2e2c063317..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-cyclic-ramdisk.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'ipxe'
-    kernel: '${KERNEL_URL}/bzImage-x86-64'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    kernel.build: '${BUILD_NUMBER}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-x86-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@linaro'
-- command: lava_test_shell
-  parameters:
-    timeout: 7600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/cyclictest.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-cyclic.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-cyclic.yaml
deleted file mode 120000
index 0ea7f78456..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-cyclic.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-cyclic-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-ramdisk.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-ramdisk.yaml
deleted file mode 100644
index 884aab302e..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template-ramdisk.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'ipxe'
-    kernel: '${KERNEL_URL}/bzImage-x86-64'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    kernel.build: '${BUILD_NUMBER}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lng-x86-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    test_image_prompt: 'root@linaro'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template.yaml b/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-lng-v3.14-rt-pre-merge/lava-job-definitions/x86/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file