zephyr-upstream: added more tests

63 tests from zephyr project are enabled to be run on boards in LAVA

Change-Id: I0d5b0706c499cbbb08f1390dccbc43498f4f688a
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

38 files changed, 232 insertions, 1833 deletions

diff --git a/zephyr-upstream/lava-job-definitions/arduino101/task-api-test.yaml b/zephyr-upstream/lava-job-definitions/arduino101/template.yaml
index 7c58d233da..265f72ca2d 100644
--- a/zephyr-upstream/lava-job-definitions/arduino101/task-api-test.yaml
+++ b/zephyr-upstream/lava-job-definitions/arduino101/template.yaml
@@ -1,6 +1,6 @@
 # Zephyr JOB definition for Arduino101
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-task-api-test'
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
 
 timeouts:
   job:
@@ -29,7 +29,7 @@ actions:
     images:
         app:
           image_arg: --alt x86_app --download {app}
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/legacy/kernel/test_task/test/zephyr.bin'
+          url: '$test_url'
 
 - boot:
     method: dfu
@@ -38,18 +38,18 @@ actions:
 
 - test:
     monitors:
-    - name: Test Microkernel Task API
+    - name: '$test_name'
       start: tc_start()
       end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
+      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)\.
       fixupdict:
         PASS: pass
         FAIL: fail
 
 metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
   git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
+  git-commit: $git_commit
diff --git a/zephyr-upstream/lava-job-definitions/frdm-k64f/task-api-test.yaml b/zephyr-upstream/lava-job-definitions/frdm-k64f/template.yaml
index 5f94c17e47..0968f75aff 100644
--- a/zephyr-upstream/lava-job-definitions/frdm-k64f/task-api-test.yaml
+++ b/zephyr-upstream/lava-job-definitions/frdm-k64f/template.yaml
@@ -1,6 +1,6 @@
 # Zephyr JOB definition for frdm-k64f
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-task-api-test'
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
 
 timeouts:
   job:
@@ -21,7 +21,7 @@ actions:
     to: tmpfs
     images:
         zephyr:
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/legacy/kernel/test_task/test/zephyr.bin'
+          url: '$test_url'
 
 - boot:
     method: cmsis-dap
@@ -30,18 +30,18 @@ actions:
 
 - test:
     monitors:
-    - name: Test Microkernel Task API
+    - name: '$test_name'
       start: tc_start()
       end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
+      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)\.
       fixupdict:
         PASS: pass
         FAIL: fail
 
 metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
   git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
+  git-commit: $git_commit
diff --git a/zephyr-upstream/lava-job-definitions/qemu/aes128-cbc-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/aes128-cbc-test.yaml
deleted file mode 100644
index 5b090b1245..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/aes128-cbc-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream crypto-test-ae128-cbc'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/crypto/test_cbc/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test AES128 CBC
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/aes128-ctr-mode-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/aes128-ctr-mode-test.yaml
deleted file mode 100644
index 51fabf84f4..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/aes128-ctr-mode-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream crypto-test-aes128-ctr-mode'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/crypto/test_ctr/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test AES128 CTR Mode
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/aes128-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/aes128-test.yaml
deleted file mode 100644
index c51306edfe..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/aes128-test.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream crypto-test-ae128'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/crypto/test_aes/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test AES128
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/arm-m3-irq-vector-table.yaml b/zephyr-upstream/lava-job-definitions/qemu/arm-m3-irq-vector-table.yaml
deleted file mode 100644
index 35c70a2561..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/arm-m3-irq-vector-table.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-arm-m3-irq-vector-table-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_arm_m3_irq_vector_table/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test ARM M3 IRQ Vector Table
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/atomic-operation-primitives.yaml b/zephyr-upstream/lava-job-definitions/qemu/atomic-operation-primitives.yaml
deleted file mode 100644
index 88719d0301..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/atomic-operation-primitives.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-atomic-operation-primitives-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_atomic/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Atomic Operation Primitives
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/ccm-mode-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/ccm-mode-test.yaml
deleted file mode 100644
index f1813f1b74..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/ccm-mode-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream crypto-test-ccm-mode'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/crypto/test_ccm_mode/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test CCM Mode
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/cmac-mode-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/cmac-mode-test.yaml
deleted file mode 100644
index 2e8358cb51..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/cmac-mode-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream crypto-test-cmac-mode'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/crypto/test_cmac_mode/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test CMAC Mode
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/context-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/context-test.yaml
deleted file mode 100644
index 4fcd6ac0f1..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/context-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-context-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_context/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Nanokernel CPU and Thread Routines
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/critical-section-api-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/critical-section-api-test.yaml
deleted file mode 100644
index 6f532fbd13..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/critical-section-api-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-critical-section-api-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_critical/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel Critical Section API
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/early-sleep-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/early-sleep-test.yaml
deleted file mode 100644
index 5ae9680714..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/early-sleep-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-early-sleep-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_early_sleep/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test fiber sleep functionality
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/errno-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/errno-test.yaml
deleted file mode 100644
index d413811b0a..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/errno-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-errno-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_errno/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test ERRNO
-      start: errno before starting fibers
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/events-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/events-test.yaml
deleted file mode 100644
index b9e88c8ed5..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/events-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-events-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_events/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel Events
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/hmac-prng-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/hmac-prng-test.yaml
deleted file mode 100644
index 9ac6e0ec31..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/hmac-prng-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream crypto-test-hmac-prng'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/crypto/test_prng/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test HMAC PRNG
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/hmac-rfc4231-vectors-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/hmac-rfc4231-vectors-test.yaml
deleted file mode 100644
index 419de5ab79..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/hmac-rfc4231-vectors-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream crypto-test-hmac-rfc4231-vectors'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/crypto/test_hmac/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test HMAC RFC4231 vectors
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/irq-offload-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/irq-offload-test.yaml
deleted file mode 100644
index 5bed9e5533..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/irq-offload-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-irq-offload-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_irq_offload/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test IRQ Offload
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/mailbox-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/mailbox-test.yaml
deleted file mode 100644
index f1526e3c64..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/mailbox-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-mailbox-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_mail/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Mailbox
-      start: Starting mailbox tests
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/mbedtls-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/mbedtls-test.yaml
deleted file mode 100644
index abac6a51b7..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/mbedtls-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream crypto-test-mbedtls'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/crypto/test_mbedtls/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test mbedTLS crypto
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/mem-safe.yaml b/zephyr-upstream/lava-job-definitions/qemu/mem-safe.yaml
deleted file mode 100644
index e87682e478..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/mem-safe.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-mem-safe-access-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_mem_safe/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Safe Memory Access Routines
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/micro-timers-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/micro-timers-test.yaml
deleted file mode 100644
index f343105d1d..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/micro-timers-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-micro-timer-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_timer/microkernel/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel Timers
-      start: Starting timer tests
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/micro-xip-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/micro-xip-test.yaml
deleted file mode 100644
index 63e1016827..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/micro-xip-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-micro-xip-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_xip/microkernel/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel XIP
-      start: Starting XIP tests
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/microkernel-memory-map-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/microkernel-memory-map-test.yaml
deleted file mode 100644
index 9202b3edf7..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/microkernel-memory-map-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-memory-map-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_map/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel Memory Maps
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/microkernel-memory-pool-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/microkernel-memory-pool-test.yaml
deleted file mode 100644
index 829627de04..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/microkernel-memory-pool-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-memory-pool-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_pool/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel Memory Pools
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/microkernel-mutex-api-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/microkernel-mutex-api-test.yaml
deleted file mode 100644
index 6c1123856e..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/microkernel-mutex-api-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-mutex-api-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_mutex/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel Mutex API
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/nano-lifo-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/nano-lifo-test.yaml
deleted file mode 100644
index e3bf62923c..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/nano-lifo-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-nano-lifo-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_lifo/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Nanokernel LIFO
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/nano-timers-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/nano-timers-test.yaml
deleted file mode 100644
index 7315dc94f7..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/nano-timers-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-nano-timer-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_timer/nanokernel/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Nanokernel Timers
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/nano-work-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/nano-work-test.yaml
deleted file mode 100644
index 569f4a2e17..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/nano-work-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-nano-work-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_nano_work/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Nanokernel Work
-      start: Starting sequence test
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/nano-xip-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/nano-xip-test.yaml
deleted file mode 100644
index 4266fbe457..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/nano-xip-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-nano-xip-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_xip/nanokernel/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Nanokernel XIP
-      start: Starting XIP tests
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/pending-tasks-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/pending-tasks-test.yaml
deleted file mode 100644
index 3ca8626384..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/pending-tasks-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-pending-tasks-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_pend/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel Tasks Pending on Nanokernel Objects
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/pipe-tests.yaml b/zephyr-upstream/lava-job-definitions/qemu/pipe-tests.yaml
deleted file mode 100644
index 8e2782a75c..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/pipe-tests.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-pipe-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_pipe/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Pipe
-      start: Starting pipe tests
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/rand32-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/rand32-test.yaml
deleted file mode 100644
index 4d2740ba21..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/rand32-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-rand32-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_rand32/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Random Number Generation
-      start: Starting random number tests
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/ring-buffer-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/ring-buffer-test.yaml
deleted file mode 100644
index 5a8de5d746..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/ring-buffer-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-ring-buffers-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_ring_buf/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Ring Buffers
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/sleep-tests.yaml b/zephyr-upstream/lava-job-definitions/qemu/sleep-tests.yaml
deleted file mode 100644
index c00f55d845..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/sleep-tests.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-sleep-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_sleep/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Nanokernel Sleep and Wakeup APIs
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/sprintf-api-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/sprintf-api-test.yaml
deleted file mode 100644
index d1af6ce753..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/sprintf-api-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-sprintf-api-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_sprintf/microkernel/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel sprintf APIs
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/task-api-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/task-api-test.yaml
deleted file mode 100644
index 9b9903c05e..0000000000
--- a/zephyr-upstream/lava-job-definitions/qemu/task-api-test.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-task-api-test'
-
-timeouts:
-  job:
-    minutes: 6
-  action:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  arch: arm
-  cpu: cortex-m3
-  machine: lm3s6965evb
-  model: 'model=stellaris'
-  serial: '-serial mon:stdio'
-  vga: '-vga none'
-
-actions:
-- deploy:
-    timeout:
-      minutes: 3
-    to: tmpfs
-    type: monitor
-    images:
-        zephyr:
-          image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/legacy/kernel/test_task/test/zephyr.bin'
-
-- boot:
-    method: monitor
-    timeout:
-      minutes: 2
-
-- test:
-    monitors:
-    - name: Test Microkernel Task API
-      start: tc_start()
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
-      fixupdict:
-        PASS: pass
-        FAIL: fail
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
-  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
diff --git a/zephyr-upstream/lava-job-definitions/qemu/ipm-test.yaml b/zephyr-upstream/lava-job-definitions/qemu/template.yaml
index 2ae9cf46f4..c1955e6f48 100644
--- a/zephyr-upstream/lava-job-definitions/qemu/ipm-test.yaml
+++ b/zephyr-upstream/lava-job-definitions/qemu/template.yaml
@@ -1,6 +1,6 @@
 # Zephyr JOB definition for QEMU
-device_type: '${DEVICE_TYPE}'
-job_name: 'zephyr-upstream kernel-ipm-test'
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
 
 timeouts:
   job:
@@ -27,7 +27,7 @@ actions:
     images:
         zephyr:
           image_arg: '-kernel {zephyr}'
-          url: 'http://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/tests/kernel/test_ipm/test/zephyr.bin'
+          url: '$test_url'
 
 - boot:
     method: monitor
@@ -36,18 +36,19 @@ actions:
 
 - test:
     monitors:
-    - name: Test IPM
+    - name: '$test_name'
       start: tc_start()
       end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)
+      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)\.
       fixupdict:
         PASS: pass
         FAIL: fail
 
 metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: ${ZEPHYR_GCC_VARIANT}
-  platform: ${PLATFORM}
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
   git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
-  git-commit: ${GIT_COMMIT}
+  git-commit: $git_commit
+
diff --git a/zephyr-upstream/submit_to_lava.py b/zephyr-upstream/submit_to_lava.py
new file mode 100644
index 0000000000..0121a4f39e
--- /dev/null
+++ b/zephyr-upstream/submit_to_lava.py
@@ -0,0 +1,201 @@
+import argparse
+import os
+import sys
+from string import Template
+
+try:
+    # try python3 first
+    from xmlrpc import client as xmlrpclib
+except ImportError:
+    import xmlrpclib
+
+try:
+    from urllib.parse import urlsplit
+except ImportError:
+    from urlparse import urlsplit
+
+
+class LAVA(object):
+    def __init__(self, url, username, token):
+        self.url = url
+        self.username = username
+        self.token = token
+        self.__proxy__ = None
+
+    @property
+    def proxy(self):
+        if self.__proxy__ is None:
+            url = urlsplit(self.url)
+            endpoint = '%s://%s:%s@%s%s' % (
+                url.scheme,
+                self.username,
+                self.token,
+                url.netloc,
+                url.path
+            )
+            self.__proxy__ = xmlrpclib.ServerProxy(endpoint)
+        return self.__proxy__
+
+
+tests = [
+    "drivers/spi/spi_basic_api/test_spi",
+    "kernel/alert/test_alert_api/test",
+    "kernel/lifo/test_lifo_api/test",
+    "kernel/multilib/test",
+    "kernel/critical/test",
+    "kernel/sprintf/test",
+    "kernel/ipm/test",
+    "kernel/context/test",
+    "kernel/fifo/test_fifo_api/test",
+    "kernel/mem_pool/test_mpool_options/test_mpool_split_defrag",
+    "kernel/mem_pool/test_mpool_options/test_mpool_split_only",
+    "kernel/mem_pool/test_mpool_options/test_mpool_defrag_split",
+    "kernel/mem_pool/test_mpool/test",
+    "kernel/mem_pool/test_mpool_concept/test",
+    "kernel/mem_pool/test_mpool_threadsafe/test",
+    "kernel/mem_pool/test_mpool_api/test",
+    "kernel/timer/timer_monotonic/test",
+    "kernel/timer/timer_api/test",
+    "kernel/msgq/msgq_api/test",
+    "kernel/threads_lifecycle/thread_init/test",
+    "kernel/threads_lifecycle/lifecycle_api/test",
+    "kernel/common/test",
+    "kernel/queue/test",
+    "kernel/libs/test",
+    "kernel/workq/workq_api/test",
+    "kernel/errno/test",
+    "kernel/threads_customdata/cdata_api/test",
+    "kernel/stack/stack_api/test",
+    "kernel/fp_sharing/test_arm",
+    "kernel/profiling/profiling_api/test",
+    "kernel/irq_offload/test",
+    "kernel/stackprot/test",
+    "kernel/systhreads/test",
+    "kernel/mbox/mbox_api/test",
+    "kernel/gen_isr_table/test",
+    "kernel/xip/test",
+    "kernel/semaphore/sema_api/test",
+    "kernel/mem_heap/mheap_api_concept/test",
+    "kernel/mem_slab/test_mslab/test",
+    "kernel/mem_slab/test_mslab_threadsafe/test",
+    "kernel/mem_slab/test_mslab_api/test",
+    "kernel/mem_slab/test_mslab_concept/test",
+    "kernel/threads_scheduling/schedule_api/test",
+    "kernel/mutex/mutex_api/test",
+    "kernel/mutex/mutex/test",
+    "kernel/poll/test",
+    "kernel/pipe/test_pipe_api/test",
+    "kernel/arm_irq_vector_table/test",
+    "kernel/arm_runtime_nmi/test",
+    "net/buf/test",
+    "net/lib/mqtt_packet/test",
+    "net/lib/dns_packet/test",
+    "net/lib/http_header_fields/test",
+    "ztest/test/base/test_verbose_0",
+    "ztest/test/base/test_verbose_1",
+    "ztest/test/base/test_verbose_2",
+    "crypto/test_ctr_prng/test",
+    "crypto/test_aes/test",
+    "crypto/test_ecc_dh/test",
+    "crypto/test_sha256/test",
+    "crypto/test_mbedtls/test",
+    "bluetooth/test_bluetooth/test",
+]
+
+# Templates base path
+template_base_path = 'configs/zephyr-upstream/lava-job-definitions'
+# Snapshots base URL
+snapshots_url = 'https://snapshots.linaro.org/components/kernel/zephyr'
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--board-name",
+                        help="Board name in snapshots URL",
+                        dest="board_name",
+                        required=True)
+    parser.add_argument("--device-type",
+                        help="Device type in LAVA",
+                        dest="device_type",
+                        required=True)
+    parser.add_argument("--build-number",
+                        help="Build number",
+                        dest="build_number",
+                        required=True)
+    parser.add_argument("--branch-name",
+                        help="Branch name for creating snapshots URL",
+                        dest="branch_name",
+                        required=True)
+    parser.add_argument("--lava-user",
+                        help="LAVA user",
+                        dest="lava_user",
+                        default=os.environ.get('LAVA_USER'))
+    parser.add_argument("--lava-token",
+                        help="LAVA token",
+                        dest="lava_token",
+                        default=os.environ.get('LAVA_TOKEN'))
+    parser.add_argument("--lava-server",
+                        help="LAVA server URL",
+                        dest="lava_server",
+                        required=True)
+    parser.add_argument("--gcc-variant",
+                        help="GCC variant",
+                        dest="gcc_variant",
+                        required=True)
+    parser.add_argument("--git-commit",
+                        help="git commit ID",
+                        dest="git_commit",
+                        required=True)
+    parser.add_argument("--build-url",
+                        help="Jenkins build url",
+                        dest="build_url",
+                        required=True)
+
+    args = parser.parse_args()
+
+    test_url_suffix = "/zephyr.bin"
+    template_file_name = "%s/%s/template.yaml" % (template_base_path, args.device_type)
+    test_template = None
+    if os.path.exists(template_file_name):
+        test_template_file = open(template_file_name, "r")
+        test_template = test_template_file.read()
+        test_template_file.close()
+    else:
+        sys.exit(1)
+
+    lava_url_base = "https://%s/" % urlsplit(args.lava_server).netloc
+    lava_url = lava_url_base + "RPC2/"
+    l = LAVA(lava_url, args.lava_user, args.lava_token)
+    test_url_prefix = "%s/%s/%s/%s/%s/tests/" % (
+        snapshots_url, args.branch_name, args.gcc_variant, args.board_name, args.build_number)
+
+    for test in tests:
+        replace_dict = dict(
+            test_name=test,
+            test_url="%s%s%s" % (test_url_prefix, test, test_url_suffix),
+            build_url=args.build_url,
+            gcc_variant=args.gcc_variant,
+            git_commit=args.git_commit,
+            device_type=args.device_type,
+            board_name=args.board_name
+        )
+        if replace_dict['test_name'].endswith("/test"):
+            replace_dict.update(
+                {'test_name': "".join(replace_dict['test_name'].rsplit("/test", 1))}
+            )
+        replace_dict['test_name'] = replace_dict['test_name'].replace("/", "_")
+        template = Template(test_template)
+        lava_job = template.substitute(replace_dict)
+        try:
+            results = l.proxy.scheduler.submit_job(lava_job)
+            print("%s/scheduler/job/" % (lava_url_base, results))
+        except xmlrpclib.ProtocolError as err:
+            print("LAVA submission failed")
+            print("offending job definition:")
+            print(lava_job)
+            print("Error code: %d" % err.errcode)
+            print("Error message: %s" % err.errmsg)
+
+
+if __name__ == "__main__":
+    main()