se: YAML consolodation

Re-org the job submission YAMLs for Schneider.

Use the new facility in LAVA to allow multiple deployments and boots in
one job. Group the test YAMLs with common image variants, eg. dip-image,
dip-image-dev and dip-image-edge, as well as a specific YAML for the
LTP/PTEST job that runs for a long time.

Change-Id: I944b9660d42872525cfcd8286412c94c74f28ffc
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

17 files changed, 897 insertions, 1211 deletions

diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs-dev.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-dev.yaml
index 008b0842..fc059792 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs-dev.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-dev.yaml
@@ -1,5 +1,5 @@
 device_type: rzn1d
-job_name: SE ${MACHINE} TFTP/NFS Dev ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-dev nfs,wic ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -13,8 +13,11 @@ visibility: public
 
 actions:
 
+####################
+# Deploy QSPI images
+####################
 - deploy:
-    namespace: dfu
+    namespace: dfu-firmware
     to: tmpfs
     images:
       sf_fsbl:
@@ -31,11 +34,11 @@ actions:
         url: ${UBOOT_ITB_URL}
 
 - command:
-    namespace: dfu
+    namespace: dfu-firmware
     name: set_boot_to_nand
 
 - boot:
-    namespace: dfu
+    namespace: dfu-firmware
     method: dfu
     timeout:
       minutes: 10
@@ -44,12 +47,72 @@ actions:
     namespace: test
     name: set_boot_to_qspi
 
+
+###################
+# dip-image-dev.wic
+###################
 - deploy:
-    namespace: test
+    namespace: flasher-wic
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+
+- deploy:
+    namespace: test-wic
+    to: overlay
+
+- boot:
+    namespace: test-wic
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 100
+    method: u-boot
+    commands:
+    - mmc rescan
+    - fatload mmc 0:1 80008000 zimage-rzn1-snarc.bin
+    - if test -e mmc 0:1 zImage-rzn1d400-snarc-bestla.dtb; then fatload mmc 0:1 80f00000 zImage-rzn1d400-snarc-bestla.dtb; else fatload mmc 0:1 80f00000 rzn1d400-snarc-bestla.dtb; fi;
+    - setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M
+    - bootz 80008000 - 80f00000
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - "root@rzn1-snarc:"
+
+- test:
+    namespace: test-wic
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: docker run hello-world
+
+
+########################
+# dip-image-dev TFTP/NFS
+########################
+- deploy:
+    namespace: test-nfs
     to: overlay
 
 - deploy:
-    namespace: test
+    namespace: test-nfs
     timeout:
       minutes: 5
     to: tftp
@@ -64,8 +127,8 @@ actions:
       compression: bz2
 
 - boot:
-    namespace: test
-    connection-namespace: dfu
+    namespace: test-nfs
+    connection-namespace: dfu-firmware
     timeout:
       minutes: 20
     method: u-boot
@@ -86,7 +149,7 @@ actions:
     - "root@rzn1-snarc:"
 
 - test:
-    namespace: test
+    namespace: test-nfs
     timeout:
       minutes: 10
     interactive:
@@ -102,7 +165,7 @@ actions:
       - command: ping -c 3 github.com
 
 - test:
-    namespace: test
+    namespace: test-nfs
     timeout:
       minutes: 60
     definitions:
@@ -117,6 +180,7 @@ actions:
             - uname -a
       name: uname-test
       path: inline/uname-test.yaml
+
     - from: inline
       repository:
         metadata:
@@ -128,6 +192,7 @@ actions:
             - ps aux --sort -rss
       name: ps-inline-test
       path: inline/ps-inline-test.yaml
+
     - from: inline
       repository:
         metadata:
@@ -139,6 +204,7 @@ actions:
             - cat /proc/meminfo
       name: meminfo-inline-test
       path: inline/meminfo-inline-test.yaml
+
     - from: inline
       repository:
         metadata:
@@ -150,6 +216,7 @@ actions:
             - free -h
       name: free-inline-test
       path: inline/free-inline-test.yaml
+
     - from: inline
       repository:
         metadata:
@@ -258,8 +325,6 @@ actions:
         UART1: /dev/ttyS1
         YKUSHPORT: 1
       name: uart-loopback-forward
-      timeout:
-        minutes: 15
 
     - path: automated/linux/uart-loopback/uart-loopback.yaml
       repository: https://github.com/omnium21/test-definitions.git
@@ -272,8 +337,6 @@ actions:
         UART1: /dev/ttyUSB0
         YKUSHPORT: 1
       name: uart-loopback-reverse
-      timeout:
-        minutes: 15
 
     - path: automated/linux/block-device/block-device.yaml
       repository: https://github.com/omnium21/test-definitions.git
@@ -285,8 +348,6 @@ actions:
         DEVICE: /dev/sda
         YKUSHPORT: 2
       name: block-device-sda
-      timeout:
-        minutes: 30
 
     - path: automated/linux/device-read-perf/device-read-perf.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
@@ -297,8 +358,6 @@ actions:
         SKIP_INSTALL: 'true'
         DEVICE: "sda mmcblk0"
       name: device-read-perf
-      timeout:
-        minutes: 15
 
     - path: automated/linux/docker/docker.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
@@ -309,6 +368,7 @@ actions:
       parameters:
         IMAGE: "hello-world"
         SKIP_INSTALL: True
+
     - path: automated/linux/docker/docker.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -318,6 +378,7 @@ actions:
       parameters:
         IMAGE: "arm32v7/ubuntu"
         SKIP_INSTALL: True
+
     - path: automated/linux/optee/optee-xtest.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/wic-edge.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-edge.yaml
index f7b071a1..51f7da81 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/wic-edge.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-edge.yaml
@@ -1,5 +1,5 @@
 device_type: rzn1d
-job_name: SE ${MACHINE} WIC edge ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-edge wic,ubi ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -13,8 +13,11 @@ visibility: public
 
 actions:
 
+####################
+# Deploy QSPI images
+####################
 - deploy:
-    namespace: dfu
+    namespace: dfu-firmware
     to: tmpfs
     images:
       sf_fsbl:
@@ -31,11 +34,11 @@ actions:
         url: ${UBOOT_ITB_URL}
 
 - command:
-    namespace: dfu
+    namespace: dfu-firmware
     name: set_boot_to_nand
 
 - boot:
-    namespace: dfu
+    namespace: dfu-firmware
     method: dfu
     timeout:
       minutes: 10
@@ -44,27 +47,27 @@ actions:
     namespace: test
     name: set_boot_to_qspi
 
-- deploy:
-    namespace: test
-    to: overlay
 
+###############
+# dip-image.wic
+###############
 - deploy:
-    namespace: dfu
+    namespace: flasher-wic
     timeout:
       minutes: 100
     to: flasher
     images:
       image:
-        url: ${WIC_EDGE_IMAGE_URL}
+        url: ${WIC_EDGE_IMG_URL}
         compression: bz2
 
 - deploy:
-    namespace: test
+    namespace: test-wic
     to: overlay
 
 - boot:
-    namespace: test
-    connection-namespace: dfu
+    namespace: test-wic
+    connection-namespace: dfu-firmware
     timeout:
       minutes: 100
     method: u-boot
@@ -83,7 +86,7 @@ actions:
     - "root@rzn1-snarc:"
 
 - test:
-    namespace: test
+    namespace: test-wic
     timeout:
       minutes: 10
     interactive:
@@ -95,11 +98,89 @@ actions:
       - command: mount
       - command: ps aux --sort -rss
       - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+      - command: umount /tmp/sdcard
+      - command: mount -t tmpfs tmpfs /tmp/sdcard
+      - command: systemctl start docker
+      - command: docker run hello-world
+
+####################
+# dip-image-edge.ubi
+####################
+- deploy:
+    namespace: dfu-ubi
+    to: tmpfs
+    images:
+      n_fs1:
+        image_arg: --alt n_fs1 --download {n_fs1}
+        url: ${UBI_EDGE_IMAGE_URL}
+
+- command:
+    namespace: dfu-ubi
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-ubi
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test-ubi
+    name: set_boot_to_qspi
+
+- boot:
+    namespace: test-ubi
+    connection-namespace: dfu-ubi
+    timeout:
+      minutes: 20
+    method: u-boot
+    commands:
+      - run linux_bestla
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      password_prompt: "Password:"
+      password: "P@ssword-1"
+      login_commands:
+      - P@ssword-1
+      - azertAZERT12345
+      - azertAZERT12345
+      - azertAZERT12345
+    prompts:
+    - "Current password: "
+    - "New password: "
+    - "Retype new password: "
+    - "root@rzn1-snarc:"
+
+- test:
+    namespace: test-ubi
+    connection-namespace: dfu-ubi
+    timeout:
+      minutes: 60
+    interactive:
+    - name: basic-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
       - command: free -h
       - command: ifconfig -a
       - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
       - command: ifconfig -a
       - command: ping -c 3 github.com
+      - command: which docker
+      - command: systemctl stop docker
+      - command: umount /tmp/sdcard
+      - command: mount -t tmpfs tmpfs /tmp/sdcard
+      - command: systemctl start docker
       - command: docker run hello-world
 
 metadata:
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/dip-image.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image.yaml
new file mode 100644
index 00000000..1c215a79
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image.yaml
@@ -0,0 +1,414 @@
+device_type: rzn1d
+job_name: SE ${MACHINE} dip-image u-boot,nfs,wic,ubi ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 100
+  action:
+    minutes: 70
+  connection:
+    minutes: 2
+priority: medium
+visibility: public
+
+actions:
+
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw:
+        image_arg: --alt sf_trustedfw --download {sf_trustedfw}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    name: set_boot_to_nand
+
+- boot:
+    namespace: dfu-firmware
+    method: dfu
+    timeout:
+      minutes: 10
+
+- command:
+    namespace: test
+    name: set_boot_to_qspi
+
+
+###############
+# u-boot
+###############
+- deploy:
+    namespace: test-uboot
+    to: overlay
+
+- deploy:
+    namespace: test-uboot
+    timeout:
+      minutes: 5
+    to: tftp
+    os: oe
+    kernel:
+      url: https://releases.linaro.org/members/schneider/openembedded/2019.09-warrior/soca9/zImage--4.19.72+git0+7549a49ae5-r0-snarc-soca9-20191003145415.bin
+      type: zimage
+- boot:
+    namespace: test-uboot
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 20
+    method: bootloader
+    bootloader: u-boot
+    commands: []
+    prompts: [=>]
+- test:
+    namespace: test-uboot
+    timeout:
+      minutes: 5
+    interactive:
+    - name: basic-cmds
+      prompts: ['=> ', '/ # ']
+      script:
+      - command: echo "u-boot echo test"
+        name: echo
+        successes:
+        - message: u-boot echo test
+      - command: version
+        name: version
+        successes:
+        - message: U-Boot
+      - command: help test
+        name: help
+        successes:
+        - message: test - minimal test like /bin/sh
+      # saveenv and printenv
+      - command: setenv test_var test123
+      - command: printenv
+        name: setenv-and-printenv
+        successes:
+        - message: test_var=test123
+    - name: memory-test
+      prompts: ['=> ', '/ # ']
+      script:
+      # memory test
+      # base - print or set address offset
+      - command: base
+        name: print-default-base-address-offset
+        successes:
+        - message: 'Base Address: 0x'
+      - command: base 80000000
+        name: set-address-offset-0x80000000
+        successes:
+        - message: 'Base Address: 0x80000000'
+      - command: base
+        name: check-address-offset-0x80000000
+        successes:
+        - message: 'Base Address: 0x80000000'
+      # crc32 - checksum calculation
+      - command: mw.b 00000000 aa 400
+      - command: crc32 80000000 400
+        name: compute-CRC32-checksum
+        successes:
+        - message: crc32 for 80000000 ... 800003ff ==> 3c6f327d
+      # mw - memory write
+      # md - memory display
+      - command: mw 100000 aabbccdd 10
+      - command: md 100000 10
+        name: mw-md-100000
+        successes:
+        - message: aabbccdd
+      # md - memory display
+      # cp - memory copy
+      - command: cp 100000 200000 10
+      - command: md 200000 10
+        name: cp-md-200000
+        successes:
+        - message: aabbccdd
+      # cmp - memory compare
+      - command: cmp 100000 200000 10
+        name: cmp-100000-200000-10
+        successes:
+        - message: Total of 16 word\(s\) were the same
+    - name: dhcp-cmds
+      prompts: ['=> ', '/ # ']
+      script:
+      # dhcp
+      - command: setenv autoload no ; dhcp ; dhcp
+        name: dhcp
+        successes:
+        - message: DHCP client bound to address
+    - name: ping-cmds
+      prompts: ['=> ', '/ # ']
+      script:
+      # ping
+      - command: ping {SERVER_IP}
+        name: ping
+        successes:
+        - message: is alive
+    - name: tftp-cmds
+      prompts: ['=> ', '/ # ']
+      script:
+      # TFTP
+      - command: setenv serverip {SERVER_IP} ; tftp {KERNEL_ADDR} {KERNEL}
+        name: tftp
+        successes:
+        - message: Bytes transferred = 6752784
+      - command: crc32 {KERNEL_ADDR} 670a10
+        successes:
+        - message: ==> ca050911
+    - name: nand-commands
+      prompts: ['=> ', '/ # ']
+      script:
+      # nand
+      - command: nand info
+        name: nand-info
+        successes:
+        - message: nand0, sector size 128 KiB
+
+
+
+
+
+
+###############
+# TFTP/NFS
+###############
+- deploy:
+    namespace: test-nfs
+    timeout:
+      minutes: 5
+    to: tftp
+    os: oe
+    kernel:
+      url: ${KERNEL_ZIMAGE_URL}
+      type: zimage
+    dtb:
+      url: ${DTB_URL}
+    nfsrootfs:
+      url: ${NFSROOTFS_URL}
+      compression: bz2
+
+- boot:
+    namespace: test-nfs
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 20
+    method: u-boot
+    commands:
+      - setenv autoload no
+      - dhcp
+      - dhcp
+      - env print
+      - setenv serverip {SERVER_IP}
+      - tftp {KERNEL_ADDR} {KERNEL}
+      - tftp {DTB_ADDR} {DTB}
+      - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp'"
+      - '{BOOTX}'
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      password_prompt: "Password:"
+      password: "P@ssword-1"
+    prompts:
+    - "root@rzn1-snarc:"
+
+- test:
+    namespace: test-nfs
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+- test:
+    namespace: test-nfs
+    timeout:
+      minutes: 5
+    definitions:
+    - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
+      from: git
+      path: lava-test-shell/smoke-tests-basic.yaml
+      name: smoke-tests
+    - path: automated/linux/meminfo/meminfo.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: meminfo
+      from: git
+      branch: master
+
+
+
+
+
+
+
+
+
+###############
+# dip-image.wic
+###############
+- deploy:
+    namespace: flasher-wic
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_IMAGE_URL}
+        compression: bz2
+
+- deploy:
+    namespace: test-wic
+    to: overlay
+
+- boot:
+    namespace: test-wic
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 100
+    method: u-boot
+    commands:
+    - mmc rescan
+    - fatload mmc 0:1 80008000 zimage-rzn1-snarc.bin
+    - if test -e mmc 0:1 zImage-rzn1d400-snarc-bestla.dtb; then fatload mmc 0:1 80f00000 zImage-rzn1d400-snarc-bestla.dtb; else fatload mmc 0:1 80f00000 rzn1d400-snarc-bestla.dtb; fi;
+    - setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M
+    - bootz 80008000 - 80f00000
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      password_prompt: "Password:"
+      password: "P@ssword-1"
+    prompts:
+    - "root@rzn1-snarc:"
+
+- test:
+    namespace: test-wic
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+
+
+
+
+###############
+# dip-image.ubi
+###############
+- deploy:
+    namespace: dfu-ubi
+    to: tmpfs
+    images:
+      n_fs1:
+        image_arg: --alt n_fs1 --download {n_fs1}
+        url: ${UBI_IMAGE_URL}
+
+- command:
+    namespace: dfu-ubi
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-ubi
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test-ubi
+    name: set_boot_to_qspi
+
+- boot:
+    namespace: test-ubi
+    connection-namespace: dfu-ubi
+    timeout:
+      minutes: 20
+    method: u-boot
+    commands:
+      - run linux_bestla
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      password_prompt: "Password:"
+      password: "P@ssword-1"
+      login_commands:
+      - P@ssword-1
+      - azertAZERT12345
+      - azertAZERT12345
+      - azertAZERT12345
+    prompts:
+    - "Current password: "
+    - "New password: "
+    - "Retype new password: "
+    - "root@rzn1-snarc:"
+
+- test:
+    namespace: test-ubi
+    connection-namespace: dfu-ubi
+    timeout:
+      minutes: 60
+    interactive:
+    - name: basic-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${PUBLISH_SERVER}${PUB_DEST}
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: ryan.harkin@linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp-ptest.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml
index f8492412..f8492412 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp-ptest.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs.yaml
deleted file mode 100644
index daeaa9aa..00000000
--- a/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-device_type: rzn1d
-job_name: SE ${MACHINE} TFTP/NFS ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    namespace: dfu
-    to: tmpfs
-    images:
-      sf_fsbl:
-        image_arg: --alt sf_fsbl --download {sf_fsbl}
-        url: ${FSBL_URL}
-      sf_trustedfw:
-        image_arg: --alt sf_trustedfw --download {sf_trustedfw}
-        url: ${OPTEE_ITB_URL}
-      sf_uboot0:
-        image_arg: --alt sf_uboot0 --download {sf_uboot0}
-        url: ${UBOOT_ITB_URL}
-      sf_uboot1:
-        image_arg: --alt sf_uboot1 --download {sf_uboot1}
-        url: ${UBOOT_ITB_URL}
-
-- command:
-    namespace: dfu
-    name: set_boot_to_nand
-
-- boot:
-    namespace: dfu
-    method: dfu
-    timeout:
-      minutes: 10
-
-- command:
-    namespace: test
-    name: set_boot_to_qspi
-
-- deploy:
-    namespace: test
-    to: overlay
-
-- deploy:
-    namespace: test
-    timeout:
-      minutes: 5
-    to: tftp
-    os: oe
-    kernel:
-      url: ${KERNEL_ZIMAGE_URL}
-      type: zimage
-    dtb:
-      url: ${DTB_URL}
-    nfsrootfs:
-      url: ${NFSROOTFS_URL}
-      compression: bz2
-
-- boot:
-    namespace: test
-    connection-namespace: dfu
-    timeout:
-      minutes: 20
-    method: u-boot
-    commands:
-      - setenv autoload no
-      - dhcp
-      - dhcp
-      - env print
-      - setenv serverip {SERVER_IP}
-      - tftp {KERNEL_ADDR} {KERNEL}
-      - tftp {DTB_ADDR} {DTB}
-      - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp'"
-      - '{BOOTX}'
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-      password_prompt: "Password:"
-      password: "P@ssword-1"
-    prompts:
-    - "root@rzn1-snarc:"
-
-- test:
-    namespace: test
-    timeout:
-      minutes: 10
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-
-- test:
-    namespace: test
-    timeout:
-      minutes: 5
-    definitions:
-    - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
-      from: git
-      path: lava-test-shell/smoke-tests-basic.yaml
-      name: smoke-tests
-    - path: automated/linux/meminfo/meminfo.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      name: meminfo
-      from: git
-      branch: master
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/ubi-edge.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/ubi-edge.yaml
deleted file mode 100644
index 0c2cda6c..00000000
--- a/schneider-openembedded/lava-job-definitions/rzn1d/ubi-edge.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-device_type: rzn1d
-job_name: SE ${MACHINE} UBI edge ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    namespace: dfu
-    to: tmpfs
-    images:
-      sf_fsbl:
-        image_arg: --alt sf_fsbl --download {sf_fsbl}
-        url: ${FSBL_URL}
-      sf_trustedfw:
-        image_arg: --alt sf_trustedfw --download {sf_trustedfw}
-        url: ${OPTEE_ITB_URL}
-      sf_uboot0:
-        image_arg: --alt sf_uboot0 --download {sf_uboot0}
-        url: ${UBOOT_ITB_URL}
-      sf_uboot1:
-        image_arg: --alt sf_uboot1 --download {sf_uboot1}
-        url: ${UBOOT_ITB_URL}
-      n_fs1:
-        image_arg: --alt n_fs1 --download {n_fs1}
-        url: ${UBI_EDGE_IMAGE_URL}
-
-- command:
-    namespace: dfu
-    name: set_boot_to_nand
-
-- boot:
-    namespace: dfu
-    method: dfu
-    timeout:
-      minutes: 10
-
-- command:
-    namespace: test
-    name: set_boot_to_qspi
-
-- deploy:
-    namespace: test
-    to: overlay
-
-- boot:
-    namespace: test
-    connection-namespace: dfu
-    timeout:
-      minutes: 20
-    method: u-boot
-    commands:
-      - run linux_bestla
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-      password_prompt: "Password:"
-      password: "P@ssword-1"
-      login_commands:
-      - P@ssword-1
-      - azertAZERT12345
-      - azertAZERT12345
-      - azertAZERT12345
-    prompts:
-    - "Current password: "
-    - "New password: "
-    - "Retype new password: "
-    - "root@rzn1-snarc:"
-
-- test:
-    namespace: test
-    timeout:
-      minutes: 60
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-      - command: systemctl stop docker
-      - command: umount /tmp/sdcard
-      - command: mount -t tmpfs tmpfs /tmp/sdcard
-      - command: systemctl start docker
-      - command: docker run hello-world
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/ubi.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/ubi.yaml
deleted file mode 100644
index 808344c8..00000000
--- a/schneider-openembedded/lava-job-definitions/rzn1d/ubi.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-device_type: rzn1d
-job_name: SE ${MACHINE} UBI ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    namespace: dfu
-    to: tmpfs
-    images:
-      sf_fsbl:
-        image_arg: --alt sf_fsbl --download {sf_fsbl}
-        url: ${FSBL_URL}
-      sf_trustedfw:
-        image_arg: --alt sf_trustedfw --download {sf_trustedfw}
-        url: ${OPTEE_ITB_URL}
-      sf_uboot0:
-        image_arg: --alt sf_uboot0 --download {sf_uboot0}
-        url: ${UBOOT_ITB_URL}
-      sf_uboot1:
-        image_arg: --alt sf_uboot1 --download {sf_uboot1}
-        url: ${UBOOT_ITB_URL}
-      n_fs1:
-        image_arg: --alt n_fs1 --download {n_fs1}
-        url: ${UBI_IMAGE_URL}
-
-- command:
-    namespace: dfu
-    name: set_boot_to_nand
-
-- boot:
-    namespace: dfu
-    method: dfu
-    timeout:
-      minutes: 10
-
-- command:
-    namespace: test
-    name: set_boot_to_qspi
-
-- deploy:
-    namespace: test
-    to: overlay
-
-- boot:
-    namespace: test
-    connection-namespace: dfu
-    timeout:
-      minutes: 20
-    method: u-boot
-    commands:
-      - run linux_bestla
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-      password_prompt: "Password:"
-      password: "P@ssword-1"
-      login_commands:
-      - P@ssword-1
-      - azertAZERT12345
-      - azertAZERT12345
-      - azertAZERT12345
-    prompts:
-    - "Current password: "
-    - "New password: "
-    - "Retype new password: "
-    - "root@rzn1-snarc:"
-
-- test:
-    namespace: test
-    timeout:
-      minutes: 60
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/uboot.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/uboot.yaml
deleted file mode 100644
index dbd8f0a2..00000000
--- a/schneider-openembedded/lava-job-definitions/rzn1d/uboot.yaml
+++ /dev/null
@@ -1,189 +0,0 @@
-device_type: rzn1d
-job_name: SE ${MACHINE} U-Boot ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    namespace: dfu
-    to: tmpfs
-    images:
-      sf_fsbl:
-        image_arg: --alt sf_fsbl --download {sf_fsbl}
-        url: ${FSBL_URL}
-      sf_trustedfw:
-        image_arg: --alt sf_trustedfw --download {sf_trustedfw}
-        url: ${OPTEE_ITB_URL}
-      sf_uboot0:
-        image_arg: --alt sf_uboot0 --download {sf_uboot0}
-        url: ${UBOOT_ITB_URL}
-      sf_uboot1:
-        image_arg: --alt sf_uboot1 --download {sf_uboot1}
-        url: ${UBOOT_ITB_URL}
-
-- command:
-    namespace: dfu
-    name: set_boot_to_nand
-
-- boot:
-    namespace: dfu
-    method: dfu
-    timeout:
-      minutes: 10
-
-- command:
-    namespace: test
-    name: set_boot_to_qspi
-
-- deploy:
-    namespace: test
-    to: overlay
-
-- deploy:
-    namespace: test
-    timeout:
-      minutes: 5
-    to: tftp
-    os: oe
-    kernel:
-      url: https://releases.linaro.org/members/schneider/openembedded/2019.09-warrior/soca9/zImage--4.19.72+git0+7549a49ae5-r0-snarc-soca9-20191003145415.bin
-      type: zimage
-
-- boot:
-    namespace: test
-    connection-namespace: dfu
-    timeout:
-      minutes: 20
-    method: bootloader
-    bootloader: u-boot
-    commands: []
-    prompts: ['=>']
-
-- test:
-    namespace: test
-    timeout:
-      minutes: 5
-    interactive:
-    - name: basic-cmds
-      prompts: ["=> ", "/ # "]
-      script:
-      - command: echo "u-boot echo test"
-        name: echo
-        successes:
-        - message: "u-boot echo test"
-      - command: version
-        name: version
-        successes:
-        - message: "U-Boot"
-      - command: help test
-        name: help
-        successes:
-        - message: "test - minimal test like /bin/sh"
-      # saveenv and printenv
-      - command: setenv test_var test123
-      - command: printenv
-        name: setenv-and-printenv
-        successes:
-        - message: "test_var=test123"
-    - name: memory-test
-      prompts: ["=> ", "/ # "]
-      script:
-      # memory test
-      # base - print or set address offset
-      - command: base
-        name: print-default-base-address-offset
-        successes:
-        - message: "Base Address: 0x"
-      - command: base 80000000
-        name: set-address-offset-0x80000000
-        successes:
-        - message: "Base Address: 0x80000000"
-      - command: base
-        name: check-address-offset-0x80000000
-        successes:
-        - message: "Base Address: 0x80000000"
-      # crc32 - checksum calculation
-      - command: mw.b 00000000 aa 400
-      - command: crc32 80000000 400
-        name: compute-CRC32-checksum
-        successes:
-        - message: "crc32 for 80000000 ... 800003ff ==> 3c6f327d"
-      # mw - memory write
-      # md - memory display
-      - command: mw 100000 aabbccdd 10
-      - command: md 100000 10
-        name: mw-md-100000
-        successes:
-        - message: "aabbccdd"
-      # md - memory display
-      # cp - memory copy
-      - command: cp 100000 200000 10
-      - command: md 200000 10
-        name: cp-md-200000
-        successes:
-        - message: "aabbccdd"
-      # cmp - memory compare
-      - command: cmp 100000 200000 10
-        name: cmp-100000-200000-10
-        successes:
-        - message: "Total of 16 word\\(s\\) were the same"
-    - name: dhcp-cmds
-      prompts: ["=> ", "/ # "]
-      script:
-      # dhcp
-      - command: setenv autoload no ; dhcp ; dhcp
-        name: dhcp
-        successes:
-        - message: "DHCP client bound to address"
-    - name: ping-cmds
-      prompts: ["=> ", "/ # "]
-      script:
-      # ping
-      - command: ping {SERVER_IP}
-        name: ping
-        successes:
-        - message: "is alive"
-    - name: tftp-cmds
-      prompts: ["=> ", "/ # "]
-      script:
-      # TFTP
-      - command: setenv serverip {SERVER_IP} ; tftp {KERNEL_ADDR} {KERNEL}
-        name: tftp
-        successes:
-        - message: "Bytes transferred = 6752784"
-      - command: crc32 {KERNEL_ADDR} 670a10
-        successes:
-        - message: "==> ca050911"
-    - name: nand-commands
-      prompts: ["=> ", "/ # "]
-      script:
-      # nand
-      - command: nand info
-        name: nand-info
-        successes:
-        - message: "nand0, sector size 128 KiB"
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev.yaml
deleted file mode 100644
index 4aa84e31..00000000
--- a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-device_type: rzn1d
-job_name: SE ${MACHINE} WIC dev ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    namespace: dfu
-    to: tmpfs
-    images:
-      sf_fsbl:
-        image_arg: --alt sf_fsbl --download {sf_fsbl}
-        url: ${FSBL_URL}
-      sf_trustedfw:
-        image_arg: --alt sf_trustedfw --download {sf_trustedfw}
-        url: ${OPTEE_ITB_URL}
-      sf_uboot0:
-        image_arg: --alt sf_uboot0 --download {sf_uboot0}
-        url: ${UBOOT_ITB_URL}
-      sf_uboot1:
-        image_arg: --alt sf_uboot1 --download {sf_uboot1}
-        url: ${UBOOT_ITB_URL}
-
-- command:
-    namespace: dfu
-    name: set_boot_to_nand
-
-- boot:
-    namespace: dfu
-    method: dfu
-    timeout:
-      minutes: 10
-
-- command:
-    namespace: test
-    name: set_boot_to_qspi
-
-- deploy:
-    namespace: test
-    to: overlay
-
-- deploy:
-    namespace: dfu
-    timeout:
-      minutes: 100
-    to: flasher
-    images:
-      image:
-        url: ${WIC_DEV_IMAGE_URL}
-        compression: bz2
-
-- deploy:
-    namespace: test
-    to: overlay
-
-- boot:
-    namespace: test
-    connection-namespace: dfu
-    timeout:
-      minutes: 100
-    method: u-boot
-    commands:
-    - mmc rescan
-    - fatload mmc 0:1 80008000 zimage-rzn1-snarc.bin
-    - if test -e mmc 0:1 zImage-rzn1d400-snarc-bestla.dtb; then fatload mmc 0:1 80f00000 zImage-rzn1d400-snarc-bestla.dtb; else fatload mmc 0:1 80f00000 rzn1d400-snarc-bestla.dtb; fi;
-    - setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M
-    - bootz 80008000 - 80f00000
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-    prompts:
-    - "root@rzn1-snarc:"
-
-- test:
-    namespace: test
-    timeout:
-      minutes: 10
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: mount
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-      - command: docker run hello-world
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/wic.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/wic.yaml
deleted file mode 100644
index 76efeedd..00000000
--- a/schneider-openembedded/lava-job-definitions/rzn1d/wic.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-device_type: rzn1d
-job_name: SE ${MACHINE} WIC ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    namespace: dfu
-    to: tmpfs
-    images:
-      sf_fsbl:
-        image_arg: --alt sf_fsbl --download {sf_fsbl}
-        url: ${FSBL_URL}
-      sf_trustedfw:
-        image_arg: --alt sf_trustedfw --download {sf_trustedfw}
-        url: ${OPTEE_ITB_URL}
-      sf_uboot0:
-        image_arg: --alt sf_uboot0 --download {sf_uboot0}
-        url: ${UBOOT_ITB_URL}
-      sf_uboot1:
-        image_arg: --alt sf_uboot1 --download {sf_uboot1}
-        url: ${UBOOT_ITB_URL}
-
-- command:
-    namespace: dfu
-    name: set_boot_to_nand
-
-- boot:
-    namespace: dfu
-    method: dfu
-    timeout:
-      minutes: 10
-
-- command:
-    namespace: test
-    name: set_boot_to_qspi
-
-- deploy:
-    namespace: test
-    to: overlay
-
-- deploy:
-    namespace: dfu
-    timeout:
-      minutes: 100
-    to: flasher
-    images:
-      image:
-        url: ${WIC_IMAGE_URL}
-        compression: bz2
-
-- deploy:
-    namespace: test
-    to: overlay
-
-- boot:
-    namespace: test
-    connection-namespace: dfu
-    timeout:
-      minutes: 100
-    method: u-boot
-    commands:
-    - mmc rescan
-    - fatload mmc 0:1 80008000 zimage-rzn1-snarc.bin
-    - if test -e mmc 0:1 zImage-rzn1d400-snarc-bestla.dtb; then fatload mmc 0:1 80f00000 zImage-rzn1d400-snarc-bestla.dtb; else fatload mmc 0:1 80f00000 rzn1d400-snarc-bestla.dtb; fi;
-    - setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M
-    - bootz 80008000 - 80f00000
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-      password_prompt: "Password:"
-      password: "P@ssword-1"
-    prompts:
-    - "root@rzn1-snarc:"
-
-- test:
-    namespace: test
-    timeout:
-      minutes: 10
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: mount
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml b/schneider-openembedded/lava-job-definitions/soca9/dip-image-dev.yaml
index c29ae5da..a13aa680 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/dip-image-dev.yaml
@@ -1,5 +1,6 @@
+# All tests using dip-image-dev.wic.bz2 are included here
 device_type: soca9
-job_name: SE ${MACHINE} TFTP/NFS Dev ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-dev-wic ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -13,6 +14,7 @@ visibility: public
 
 actions:
 
+# Deploy dip-image-dev.wic.bz2 to the SDcard
 - deploy:
     timeout:
       minutes: 100
@@ -22,6 +24,8 @@ actions:
         url: ${WIC_IMAGE_URL}
         compression: bz2
 
+# TFTP/NFS test
+# Deply the kernel/dtb/rootfs used for TFT/NFS booting
 - deploy:
     timeout:
       minutes: 5
@@ -36,6 +40,7 @@ actions:
       url: ${NFSROOTFS_DEV_URL}
       compression: bz2
 
+# Boot the TFTP/NFS deployment
 - boot:
     timeout:
       minutes: 20
@@ -57,6 +62,7 @@ actions:
     prompts:
     - "root@snarc-soca9:"
 
+# Run some basic commands on the TFTP/NFS deployment
 - test:
     timeout:
       minutes: 10
@@ -68,10 +74,12 @@ actions:
       - command: cat /proc/device-tree/model ; echo ""
       - command: ps aux --sort -rss
       - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
       - command: free -h
       - command: ifconfig -a
       - command: ping -c 3 github.com
 
+# Run some LAVA tests on the TFTP/NFS deployment
 - test:
     timeout:
       minutes: 60
@@ -270,6 +278,164 @@ actions:
       timeout:
         minutes: 15
 
+
+
+# Boot from SDcard
+- boot:
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+# Run some basic test commands while booting from SDcard
+- test:
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+
+
+# Run some LAVA tests while booted from SDcard
+- test:
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: uname-test
+          description: "uname test"
+        run:
+          steps:
+            - uname -a
+      name: uname-test
+      path: inline/uname-test.yaml
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: ps-inline-test
+          description: "ps-inline test"
+        run:
+          steps:
+            - ps aux --sort -rss
+      name: ps-inline-test
+      path: inline/ps-inline-test.yaml
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: meminfo-inline-test
+          description: "meminfo-inline test"
+        run:
+          steps:
+            - cat /proc/meminfo
+      name: meminfo-inline-test
+      path: inline/meminfo-inline-test.yaml
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: free-inline-test
+          description: "free-inline test"
+        run:
+          steps:
+            - free -h
+      name: free-inline-test
+      path: inline/free-inline-test.yaml
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: ifconfig-test
+          description: "ifconfig test"
+        run:
+          steps:
+            - ifconfig -a
+      name: ifconfig-test
+      path: inline/ifconfig-test.yaml
+
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: ping-github
+          description: Ping public GitHub webserver
+        run:
+          steps:
+          - ping -c 3 github.com
+      name: ping-github
+      path: inline/ping-github.yaml
+
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: resolved-test
+          description: resolved test
+        run:
+          steps:
+          - systemctl --no-pager status systemd-resolved
+          - systemctl --no-pager restart systemd-resolved
+          - systemctl --no-pager status systemd-resolved
+      name: resolved-test
+      path: inline/resolved-test.yaml
+
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: memstat-test
+          description: "memstat test"
+        run:
+          steps:
+            - memstat
+      name: memstat-test
+      path: inline/memstat-test.yaml
+    - path: automated/linux/meminfo/meminfo.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: meminfo
+      from: git
+      branch: master
+    - path: automated/linux/badblocks/badblocks.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: badblocks
+      from: git
+      branch: master
+      parameters:
+        SKIP_INSTALL: True
+    - path: automated/linux/memtester/memtester.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: memtester
+      from: git
+      branch: master
+      parameters:
+        SKIP_INSTALL: True
+
 metadata:
   machine: ${MACHINE}
   manifest branch: ${MANIFEST_BRANCH}
diff --git a/schneider-openembedded/lava-job-definitions/soca9/uboot.yaml b/schneider-openembedded/lava-job-definitions/soca9/dip-image.yaml
index 573d9af6..b48fae05 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/uboot.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/dip-image.yaml
@@ -1,10 +1,14 @@
+# All tests using dip-image.wic.bz2 are included here
 device_type: soca9
-job_name: SE ${MACHINE} U-Boot ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-wic ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
-    minutes: 10
-
+    minutes: 100
+  action:
+    minutes: 70
+  connection:
+    minutes: 2
 priority: medium
 visibility: public
 
@@ -12,21 +16,25 @@ actions:
 
 - deploy:
     timeout:
-      minutes: 10
+      minutes: 20
     to: flasher
     images:
       image:
         url: ${WIC_IMAGE_URL}
         compression: bz2
 
+# Deploy the dip-image WIC SDcard image
+# This is common to all the test deployments in this YAML
 - deploy:
     timeout:
       minutes: 5
     to: tftp
     kernel:
+      # This is a known kernel image used for CRC checks only
       url: https://releases.linaro.org/members/schneider/openembedded/2019.09-warrior/soca9/zImage--4.19.72+git0+7549a49ae5-r0-snarc-soca9-20191003145415.bin
       type: zimage
 
+# Boot into U-Boot
 - boot:
     timeout:
       minutes: 20
@@ -35,6 +43,7 @@ actions:
     commands: []
     prompts: ['=>']
 
+# Run some U-Boot tests
 - test:
     timeout:
       minutes: 5
@@ -136,6 +145,132 @@ actions:
         successes:
         - message: "return code 0"
 
+# TFTP/NFS
+# Deploy the kernel/dtb/rootfs used for TFTP/NFS boot
+- deploy:
+    timeout:
+      minutes: 5
+    to: tftp
+    os: oe
+    kernel:
+      url: ${KERNEL_ZIMAGE_URL}
+      type: zimage
+    dtb:
+      url: ${DTB_URL}
+    nfsrootfs:
+      url: ${NFSROOTFS_DEV_URL}
+      compression: bz2
+
+# Boot via TFTP/NFS
+- boot:
+    timeout:
+      minutes: 20
+    method: u-boot
+    commands:
+    - run FPGA_INIT
+    - setenv autoload no
+    - dhcp
+    - dhcp
+    - env print
+    - setenv serverip {SERVER_IP}
+    - tftp {KERNEL_ADDR} {KERNEL}
+    - tftp {DTB_ADDR} {DTB}
+    - setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3
+      rootwait coherent_pool=2M ip=dhcp'
+    - '{BOOTX}'
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      password_prompt: 'Password:'
+      password: P@ssword-1
+      login_commands:
+      - P@ssword-1
+      - azertAZERT12345
+      - azertAZERT12345
+      - azertAZERT12345
+    prompts:
+    - 'Current password: '
+    - 'New password: '
+    - 'Retype new password: '
+    - 'root@snarc-soca9:'
+
+# Run some tests in the Linux kernel when booted with TFTP/NFS
+- test:
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds
+      prompts: [root@snarc-soca9, root@rzn1-snarc]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+
+- test:
+    timeout:
+      minutes: 5
+    definitions:
+    - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
+      from: git
+      path: lava-test-shell/smoke-tests-basic.yaml
+      name: smoke-tests
+    - path: automated/linux/meminfo/meminfo.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: meminfo
+      from: git
+      branch: master
+
+# SDcard boot
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      password_prompt: 'Password:'
+      password: P@ssword-1
+      login_commands:
+      - P@ssword-1
+      - azertAZERT12345
+      - azertAZERT12345
+      - azertAZERT12345
+    prompts:
+    - 'Current password: '
+    - 'New password: '
+    - 'Retype new password: '
+    - 'root@snarc-soca9:'
+
+# Run tests on SDcard boot
+- test:
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds
+      prompts: [root@snarc-soca9, root@rzn1-snarc]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+
+
 metadata:
   machine: ${MACHINE}
   manifest branch: ${MANIFEST_BRANCH}
diff --git a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-ptest.yaml b/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml
index 989089aa..989089aa 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-ptest.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml
diff --git a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml
deleted file mode 100644
index 4deeb590..00000000
--- a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-device_type: soca9
-job_name: SE ${MACHINE} TFTP/NFS ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    timeout:
-      minutes: 100
-    to: flasher
-    images:
-      image:
-        url: ${WIC_IMAGE_URL}
-        compression: bz2
-
-- deploy:
-    timeout:
-      minutes: 5
-    to: tftp
-    os: oe
-    kernel:
-      url: ${KERNEL_ZIMAGE_URL}
-      type: zimage
-    dtb:
-      url: ${DTB_URL}
-    nfsrootfs:
-      url: ${NFSROOTFS_URL}
-      compression: bz2
-
-- boot:
-    timeout:
-      minutes: 20
-    method: u-boot
-    commands:
-      - run FPGA_INIT
-      - setenv autoload no
-      - dhcp
-      - dhcp
-      - env print
-      - setenv serverip {SERVER_IP}
-      - tftp {KERNEL_ADDR} {KERNEL}
-      - tftp {DTB_ADDR} {DTB}
-      - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp'"
-      - '{BOOTX}'
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-      password_prompt: "Password:"
-      password: "P@ssword-1"
-      login_commands:
-      - P@ssword-1
-      - azertAZERT12345
-      - azertAZERT12345
-      - azertAZERT12345
-    prompts:
-    - "Current password: "
-    - "New password: "
-    - "Retype new password: "
-    - "root@snarc-soca9:"
-
-- test:
-    timeout:
-      minutes: 10
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-
-- test:
-    timeout:
-      minutes: 5
-    definitions:
-    - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
-      from: git
-      path: lava-test-shell/smoke-tests-basic.yaml
-      name: smoke-tests
-    - path: automated/linux/meminfo/meminfo.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      name: meminfo
-      from: git
-      branch: master
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/soca9/wic-dev.yaml b/schneider-openembedded/lava-job-definitions/soca9/wic-dev.yaml
deleted file mode 100644
index 921cfbeb..00000000
--- a/schneider-openembedded/lava-job-definitions/soca9/wic-dev.yaml
+++ /dev/null
@@ -1,189 +0,0 @@
-device_type: soca9
-job_name: SE ${MACHINE} WIC dev ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    timeout:
-      minutes: 100
-    to: flasher
-    images:
-      image:
-        url: ${WIC_DEV_IMAGE_URL}
-        compression: bz2
-- boot:
-    timeout:
-      minutes: 10
-    method: u-boot
-    commands:
-    - run linux_sd
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-    prompts:
-    - "root@snarc-soca9:"
-    transfer_overlay:
-      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
-      unpack_command: tar --touch -C / -xzf
-
-- test:
-    timeout:
-      minutes: 10
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: mount
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-
-- test:
-    timeout:
-      minutes: 60
-    definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: uname-test
-          description: "uname test"
-        run:
-          steps:
-            - uname -a
-      name: uname-test
-      path: inline/uname-test.yaml
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: ps-inline-test
-          description: "ps-inline test"
-        run:
-          steps:
-            - ps aux --sort -rss
-      name: ps-inline-test
-      path: inline/ps-inline-test.yaml
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: meminfo-inline-test
-          description: "meminfo-inline test"
-        run:
-          steps:
-            - cat /proc/meminfo
-      name: meminfo-inline-test
-      path: inline/meminfo-inline-test.yaml
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: free-inline-test
-          description: "free-inline test"
-        run:
-          steps:
-            - free -h
-      name: free-inline-test
-      path: inline/free-inline-test.yaml
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: ifconfig-test
-          description: "ifconfig test"
-        run:
-          steps:
-            - ifconfig -a
-      name: ifconfig-test
-      path: inline/ifconfig-test.yaml
-
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: ping-github
-          description: Ping public GitHub webserver
-        run:
-          steps:
-          - ping -c 3 github.com
-      name: ping-github
-      path: inline/ping-github.yaml
-
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: resolved-test
-          description: resolved test
-        run:
-          steps:
-          - systemctl --no-pager status systemd-resolved
-          - systemctl --no-pager restart systemd-resolved
-          - systemctl --no-pager status systemd-resolved
-      name: resolved-test
-      path: inline/resolved-test.yaml
-
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: memstat-test
-          description: "memstat test"
-        run:
-          steps:
-            - memstat
-      name: memstat-test
-      path: inline/memstat-test.yaml
-    - path: automated/linux/meminfo/meminfo.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      name: meminfo
-      from: git
-      branch: master
-    - path: automated/linux/badblocks/badblocks.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      name: badblocks
-      from: git
-      branch: master
-      parameters:
-        SKIP_INSTALL: True
-    - path: automated/linux/memtester/memtester.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      name: memtester
-      from: git
-      branch: master
-      parameters:
-        SKIP_INSTALL: True
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/soca9/wic.yaml b/schneider-openembedded/lava-job-definitions/soca9/wic.yaml
deleted file mode 100644
index 41be903b..00000000
--- a/schneider-openembedded/lava-job-definitions/soca9/wic.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-device_type: soca9
-job_name: SE ${MACHINE} WIC ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 100
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    timeout:
-      minutes: 100
-    to: flasher
-    os: oe
-    images:
-      image:
-        url: ${WIC_IMAGE_URL}
-        compression: bz2
-- boot:
-    timeout:
-      minutes: 10
-    method: u-boot
-    commands:
-    - run linux_sd
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-      password_prompt: "Password:"
-      password: "P@ssword-1"
-      login_commands:
-      - P@ssword-1
-      - azertAZERT12345
-      - azertAZERT12345
-      - azertAZERT12345
-    prompts:
-    - "Current password: "
-    - "New password: "
-    - "Retype new password: "
-    - "root@snarc-soca9:"
-
-- test:
-    timeout:
-      minutes: 10
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: mount
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/submit_for_testing.sh b/schneider-openembedded/submit_for_testing.sh
index de6260fa..bee4e297 100755
--- a/schneider-openembedded/submit_for_testing.sh
+++ b/schneider-openembedded/submit_for_testing.sh
@@ -10,21 +10,16 @@ popd
 export RESIZE_ROOTFS=${RESIZE_ROOTFS:-}
 
 templates_common=(\
-	uboot.yaml \
-	tftp-nfs.yaml \
-	tftp-nfs-dev.yaml \
-	wic.yaml \
-	wic-dev.yaml \
-	wic-dev-ltp-ptest.yaml \
+	dip-image.yaml \
+	dip-image-dev.yaml \
+	ltp-ptest.yaml \
 )
 
 templates_soca9=(\
 )
 
 templates_rzn1d=(\
-	ubi.yaml \
-	ubi-edge.yaml \
-	wic-edge.yaml \
+	dip-image-edge.yaml \
 )
 
 if [ "${DEVICE_TYPE}" == "rzn1d" ]; then