se: consolidate test yamls

When having multiple jobs in one YAML, we need to use separate namespaces
for each section and each test definition should have a unique name when
the test is run several times in one YAML.

The soca9 and lces2 tests are sync'd here, along with making dip-image,
dip-image-dev and dip-image-edge more closely aligned.

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

7 files changed, 667 insertions, 849 deletions

diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-dev.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-dev.yaml
index fc059792..ec1a5726 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-dev.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-dev.yaml
@@ -1,5 +1,5 @@
 device_type: rzn1d
-job_name: SE ${MACHINE} dip-image-dev nfs,wic ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-dev (nfs,wic) ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -7,7 +7,7 @@ timeouts:
   action:
     minutes: 70
   connection:
-    minutes: 2
+    minutes: 20
 priority: medium
 visibility: public
 
@@ -48,69 +48,9 @@ actions:
     name: set_boot_to_qspi
 
 
-###################
-# dip-image-dev.wic
-###################
-- deploy:
-    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
-
+###############
+# TFTP/NFS
+###############
 - deploy:
     namespace: test-nfs
     timeout:
@@ -143,9 +83,10 @@ actions:
       - "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:'
+      login_prompt: "login:"
       username: root
     prompts:
+    - "root@snarc-soca9:"
     - "root@rzn1-snarc:"
 
 - test:
@@ -153,125 +94,137 @@ actions:
     timeout:
       minutes: 10
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-tftp
       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: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: ping -c 3 github.com
+      - command: which docker
 
 - test:
     namespace: test-nfs
     timeout:
-      minutes: 60
+      minutes: 10
     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
+    - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
+      from: git
+      path: lava-test-shell/smoke-tests-basic.yaml
+      name: smoke-tests-tftp
 
-    - 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
+    - path: automated/linux/meminfo/meminfo.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: meminfo-tftp
+      from: git
+      branch: master
 
-    - 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
+    - path: automated/linux/badblocks/badblocks.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: badblocks-tftp
+      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-tftp
+      from: git
+      branch: master
+      parameters:
+        SKIP_INSTALL: True
 
-    - 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
+###################
+# dip-image-dev.wic
+###################
+- deploy:
+    namespace: test-wic
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
 
-    - 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
+- boot:
+    namespace: test-wic
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    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@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+- test:
+    namespace: test-wic
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds-wic
+      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: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+
+##################
+# Functional Tests
+##################
+- test:
+    namespace: test-wic
+    timeout:
+      minutes: 100
+    definitions:
+
     - 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
@@ -280,6 +233,7 @@ actions:
       branch: master
       parameters:
         SKIP_INSTALL: True
+
     - path: automated/linux/memtester/memtester.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-edge.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-edge.yaml
index 51f7da81..7eda9b1c 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-edge.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image-edge.yaml
@@ -1,5 +1,5 @@
 device_type: rzn1d
-job_name: SE ${MACHINE} dip-image-edge wic,ubi ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-edge (wic,ubi) ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -48,28 +48,25 @@ actions:
     name: set_boot_to_qspi
 
 
-###############
-# dip-image.wic
-###############
+####################
+# dip-image-edge.wic
+####################
 - deploy:
-    namespace: flasher-wic
+    namespace: test-wic
     timeout:
       minutes: 100
     to: flasher
     images:
       image:
-        url: ${WIC_EDGE_IMG_URL}
+        url: ${WIC_EDGE_IMAGE_URL}
         compression: bz2
 
-- deploy:
-    namespace: test-wic
-    to: overlay
 
 - boot:
     namespace: test-wic
     connection-namespace: dfu-firmware
     timeout:
-      minutes: 100
+      minutes: 10
     method: u-boot
     commands:
     - mmc rescan
@@ -78,19 +75,20 @@ actions:
     - setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M
     - bootz 80008000 - 80f00000
     auto_login:
-      login_prompt: 'login:'
+      login_prompt: "login:"
       username: root
       password_prompt: "Password:"
       password: "P@ssword-1"
     prompts:
+    - "root@snarc-soca9:"
     - "root@rzn1-snarc:"
 
 - test:
     namespace: test-wic
     timeout:
-      minutes: 10
+      minutes: 30
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-wic
       prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
@@ -100,21 +98,21 @@ actions:
       - command: cat /proc/meminfo
       - command: cat /proc/cpuinfo
       - command: free -h
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - 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
+    namespace: test-ubi
     to: tmpfs
     images:
       n_fs1:
@@ -122,10 +120,10 @@ actions:
         url: ${UBI_EDGE_IMAGE_URL}
 
 - command:
-    namespace: dfu-ubi
+    namespace: test-ubi
     name: set_boot_to_nand
 - boot:
-    namespace: dfu-ubi
+    namespace: test-ubi
     method: dfu
     timeout:
       minutes: 10
@@ -135,22 +133,22 @@ actions:
 
 - boot:
     namespace: test-ubi
-    connection-namespace: dfu-ubi
+    connection-namespace: test-ubi
     timeout:
       minutes: 20
     method: u-boot
     commands:
       - run linux_bestla
     auto_login:
-      login_prompt: 'login:'
+      login_prompt: "login:"
       username: root
       password_prompt: "Password:"
       password: "P@ssword-1"
       login_commands:
-      - P@ssword-1
-      - azertAZERT12345
-      - azertAZERT12345
-      - azertAZERT12345
+      - "P@ssword-1"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
     prompts:
     - "Current password: "
     - "New password: "
@@ -159,11 +157,11 @@ actions:
 
 - test:
     namespace: test-ubi
-    connection-namespace: dfu-ubi
+    connection-namespace: test-ubi
     timeout:
       minutes: 60
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-ubi
       prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
@@ -172,6 +170,10 @@ actions:
       - command: cat /proc/meminfo
       - command: cat /proc/cpuinfo
       - command: free -h
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
       - command: ifconfig -a
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/dip-image.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image.yaml
index 1c215a79..21839b08 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/dip-image.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/dip-image.yaml
@@ -1,5 +1,5 @@
 device_type: rzn1d
-job_name: SE ${MACHINE} dip-image u-boot,nfs,wic,ubi ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image (u-boot,nfs,wic,ubi) ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -7,7 +7,7 @@ timeouts:
   action:
     minutes: 70
   connection:
-    minutes: 2
+    minutes: 20
 priority: medium
 visibility: public
 
@@ -53,17 +53,14 @@ actions:
 ###############
 - deploy:
     namespace: test-uboot
-    to: overlay
-
-- deploy:
-    namespace: test-uboot
     timeout:
       minutes: 5
     to: tftp
-    os: oe
     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:
     namespace: test-uboot
     connection-namespace: dfu-firmware
@@ -72,50 +69,52 @@ actions:
     method: bootloader
     bootloader: u-boot
     commands: []
-    prompts: [=>]
+    prompts: ["=>"]
+
+# Run some U-Boot tests
 - test:
     namespace: test-uboot
     timeout:
       minutes: 5
     interactive:
-    - name: basic-cmds
-      prompts: ['=> ', '/ # ']
+    - name: uboot-tests
+      prompts: ["=> ", "/ # "]
       script:
       - command: echo "u-boot echo test"
         name: echo
         successes:
-        - message: u-boot echo test
+        - message: "u-boot echo test"
       - command: version
         name: version
         successes:
-        - message: U-Boot
+        - message: "U-Boot"
       - command: help test
         name: help
         successes:
-        - message: test - minimal test like /bin/sh
+        - 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
+        - message: "test_var=test123"
     - name: memory-test
-      prompts: ['=> ', '/ # ']
+      prompts: ["=> ", "/ # "]
       script:
       # memory test
       # base - print or set address offset
       - command: base
         name: print-default-base-address-offset
         successes:
-        - message: 'Base Address: 0x'
+        - message: "Base Address: 0x"
       - command: base 80000000
         name: set-address-offset-0x80000000
         successes:
-        - message: 'Base Address: 0x80000000'
+        - message: "Base Address: 0x80000000"
       - command: base
         name: check-address-offset-0x80000000
         successes:
-        - message: 'Base Address: 0x80000000'
+        - message: "Base Address: 0x80000000"
       # crc32 - checksum calculation
       - command: mw.b 00000000 aa 400
       - command: crc32 80000000 400
@@ -128,48 +127,48 @@ actions:
       - command: md 100000 10
         name: mw-md-100000
         successes:
-        - message: aabbccdd
+        - message: "aabbccdd"
       # md - memory display
       # cp - memory copy
       - command: cp 100000 200000 10
       - command: md 200000 10
         name: cp-md-200000
         successes:
-        - message: aabbccdd
+        - 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
+        - message: "Total of 16 word\\(s\\) were the same"
     - name: dhcp-cmds
-      prompts: ['=> ', '/ # ']
+      prompts: ["=> ", "/ # "]
       script:
       # dhcp
       - command: setenv autoload no ; dhcp ; dhcp
         name: dhcp
         successes:
-        - message: DHCP client bound to address
+        - message: "DHCP client bound to address"
     - name: ping-cmds
-      prompts: ['=> ', '/ # ']
+      prompts: ["=> ", "/ # "]
       script:
       # ping
       - command: ping {SERVER_IP}
         name: ping
         successes:
-        - message: is alive
+        - message: "is alive"
     - name: tftp-cmds
-      prompts: ['=> ', '/ # ']
+      prompts: ["=> ", "/ # "]
       script:
       # TFTP
       - command: setenv serverip {SERVER_IP} ; tftp {KERNEL_ADDR} {KERNEL}
         name: tftp
         successes:
-        - message: Bytes transferred = 6752784
+        - message: "Bytes transferred = 6752784"
       - command: crc32 {KERNEL_ADDR} 670a10
         successes:
         - message: ==> ca050911
     - name: nand-commands
-      prompts: ['=> ', '/ # ']
+      prompts: ["=> ", "/ # "]
       script:
       # nand
       - command: nand info
@@ -178,10 +177,6 @@ actions:
         - message: nand0, sector size 128 KiB
 
 
-
-
-
-
 ###############
 # TFTP/NFS
 ###############
@@ -217,11 +212,12 @@ actions:
       - "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:'
+      login_prompt: "login:"
       username: root
       password_prompt: "Password:"
       password: "P@ssword-1"
     prompts:
+    - "root@snarc-soca9:"
     - "root@rzn1-snarc:"
 
 - test:
@@ -229,7 +225,7 @@ actions:
     timeout:
       minutes: 10
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-tftp
       prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
@@ -238,6 +234,10 @@ actions:
       - command: cat /proc/meminfo
       - command: cat /proc/cpuinfo
       - command: free -h
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: ping -c 3 github.com
       - command: which docker
@@ -245,32 +245,26 @@ actions:
 - test:
     namespace: test-nfs
     timeout:
-      minutes: 5
+      minutes: 10
     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
+      name: smoke-tests-tftp
+
     - path: automated/linux/meminfo/meminfo.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
-      name: meminfo
+      name: meminfo-tftp
       from: git
       branch: master
 
 
-
-
-
-
-
-
-
 ###############
 # dip-image.wic
 ###############
 - deploy:
-    namespace: flasher-wic
+    namespace: test-wic
     timeout:
       minutes: 100
     to: flasher
@@ -279,15 +273,12 @@ actions:
         url: ${WIC_IMAGE_URL}
         compression: bz2
 
-- deploy:
-    namespace: test-wic
-    to: overlay
 
 - boot:
     namespace: test-wic
     connection-namespace: dfu-firmware
     timeout:
-      minutes: 100
+      minutes: 10
     method: u-boot
     commands:
     - mmc rescan
@@ -296,11 +287,12 @@ actions:
     - setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M
     - bootz 80008000 - 80f00000
     auto_login:
-      login_prompt: 'login:'
+      login_prompt: "login:"
       username: root
       password_prompt: "Password:"
       password: "P@ssword-1"
     prompts:
+    - "root@snarc-soca9:"
     - "root@rzn1-snarc:"
 
 - test:
@@ -308,7 +300,7 @@ actions:
     timeout:
       minutes: 10
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-wic
       prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
@@ -318,6 +310,10 @@ actions:
       - command: cat /proc/meminfo
       - command: cat /proc/cpuinfo
       - command: free -h
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
       - command: ifconfig -a
@@ -325,14 +321,11 @@ actions:
       - command: which docker
 
 
-
-
-
 ###############
 # dip-image.ubi
 ###############
 - deploy:
-    namespace: dfu-ubi
+    namespace: test-ubi
     to: tmpfs
     images:
       n_fs1:
@@ -340,10 +333,10 @@ actions:
         url: ${UBI_IMAGE_URL}
 
 - command:
-    namespace: dfu-ubi
+    namespace: test-ubi
     name: set_boot_to_nand
 - boot:
-    namespace: dfu-ubi
+    namespace: test-ubi
     method: dfu
     timeout:
       minutes: 10
@@ -353,22 +346,22 @@ actions:
 
 - boot:
     namespace: test-ubi
-    connection-namespace: dfu-ubi
+    connection-namespace: test-ubi
     timeout:
       minutes: 20
     method: u-boot
     commands:
       - run linux_bestla
     auto_login:
-      login_prompt: 'login:'
+      login_prompt: "login:"
       username: root
       password_prompt: "Password:"
       password: "P@ssword-1"
       login_commands:
-      - P@ssword-1
-      - azertAZERT12345
-      - azertAZERT12345
-      - azertAZERT12345
+      - "P@ssword-1"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
     prompts:
     - "Current password: "
     - "New password: "
@@ -377,11 +370,11 @@ actions:
 
 - test:
     namespace: test-ubi
-    connection-namespace: dfu-ubi
+    connection-namespace: test-ubi
     timeout:
       minutes: 60
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-ubi
       prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
@@ -390,6 +383,10 @@ actions:
       - command: cat /proc/meminfo
       - command: cat /proc/cpuinfo
       - command: free -h
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
       - command: ifconfig -a
@@ -397,6 +394,117 @@ actions:
       - command: which docker
 
 
+##################
+# Reboot/Poweroff Tests
+##################
+- test:
+    namespace: test-reboot
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: reboot-cmds-1
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc", "=> "]
+      script:
+      - command: reboot ; sleep 10
+
+# Trigger 2nd boot
+- boot:
+    namespace: test-reboot
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_bestla
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: azertAZERT12345
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+
+- test:
+    namespace: test-reboot
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: check-1st-reboot
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: echo "We came back from a reboot"
+
+
+# Reboot the board a 2nd time
+- test:
+    namespace: test-reboot-2
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: reboot-cmds-2
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc", "=> "]
+      script:
+      - command: reboot ; sleep 10
+
+# Trigger a new boot
+- boot:
+    namespace: test-reboot-2
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_bestla
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: "azertAZERT12345"
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+
+- test:
+    namespace: test-reboot-2
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: check-2nd-reboot
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc", "=> "]
+      script:
+      - command: echo "We came back from the 2nd reboot"
+
+# Test poweroff
+- test:
+    namespace: test-poweroff
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: poweroff-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc", "=> "]
+      script:
+      - command: poweroff ; sleep 10
+
+# Check we are in u-boot after poweroff
+- test:
+    namespace: test-poweroff
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: check-poweroff
+      prompts: ["=> "]
+      script:
+      - command: version
+        successes:
+        - message: "U-Boot"
+
 metadata:
   machine: ${MACHINE}
   manifest branch: ${MANIFEST_BRANCH}
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml
index f8492412..036d686f 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml
@@ -1,5 +1,5 @@
 device_type: rzn1d
-job_name: SE ${MACHINE} WIC dev LTP/PTEST ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-dev (LTP/PTEST) ${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,25 +34,25 @@ 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: 20
+      minutes: 10
 
 - command:
     namespace: test
     name: set_boot_to_qspi
 
-- deploy:
-    namespace: test
-    to: overlay
 
+###################
+# dip-image-dev.wic
+###################
 - deploy:
-    namespace: dfu
+    namespace: test-wic
     timeout:
       minutes: 100
     to: flasher
@@ -58,15 +61,12 @@ actions:
         url: ${WIC_DEV_IMAGE_URL}
         compression: bz2
 
-- deploy:
-    namespace: test
-    to: overlay
 
 - boot:
-    namespace: test
-    connection-namespace: dfu
+    namespace: test-wic
+    connection-namespace: dfu-firmware
     timeout:
-      minutes: 100
+      minutes: 10
     method: u-boot
     commands:
     - mmc rescan
@@ -75,20 +75,21 @@ actions:
     - setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M
     - bootz 80008000 - 80f00000
     auto_login:
-      login_prompt: 'login:'
+      login_prompt: "login:"
       username: root
     prompts:
+    - "root@snarc-soca9:"
     - "root@rzn1-snarc:"
     transfer_overlay:
       download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
       unpack_command: tar --touch -C / -xzf
 
 - test:
-    namespace: test
+    namespace: test-wic
     timeout:
       minutes: 10
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-wic
       prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
@@ -96,114 +97,33 @@ actions:
       - command: mount
       - command: ps aux --sort -rss
       - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
       - command: free -h
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: ping -c 3 github.com
+      - command: which docker
 
+##################
+# Functional Tests
+##################
 - test:
-    namespace: test
+    namespace: test-wic
     timeout:
       minutes: 600
     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/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -215,8 +135,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-syscalls-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -228,8 +147,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-math-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -241,8 +159,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-timers-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -254,8 +171,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-fcntl-locktests-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -267,8 +183,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-ipc-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -280,8 +195,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-fsx-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -293,8 +207,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-fs-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -306,8 +219,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-hugetlb-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -319,8 +231,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-io-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -332,8 +243,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-nptl-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -345,8 +255,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-pty-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -358,8 +267,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-fs_bind-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -371,8 +279,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-filecaps-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -384,8 +291,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-admin_tools-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -397,8 +303,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-connectors-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ptest/ptest.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -407,8 +312,6 @@ actions:
       params:
         exclude: 'bluez5 bzip2 containerd e2fsprogs libxml2 parted python strace'
         EXCLUDE: 'bluez5 bzip2 containerd e2fsprogs libxml2 parted python strace'
-      timeout:
-        minutes: 160
 
 metadata:
   machine: ${MACHINE}
diff --git a/schneider-openembedded/lava-job-definitions/soca9/dip-image-dev.yaml b/schneider-openembedded/lava-job-definitions/soca9/dip-image-dev.yaml
index a13aa680..56914496 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/dip-image-dev.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/dip-image-dev.yaml
@@ -1,6 +1,5 @@
-# All tests using dip-image-dev.wic.bz2 are included here
 device_type: soca9
-job_name: SE ${MACHINE} dip-image-dev-wic ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-dev (nfs,wic) ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -8,24 +7,27 @@ timeouts:
   action:
     minutes: 70
   connection:
-    minutes: 2
+    minutes: 20
 priority: medium
 visibility: public
 
 actions:
 
-# Deploy dip-image-dev.wic.bz2 to the SDcard
+##################
+# Deploy WIC image
+##################
 - deploy:
     timeout:
-      minutes: 100
+      minutes: 20
     to: flasher
     images:
       image:
-        url: ${WIC_IMAGE_URL}
+        url: ${WIC_DEV_IMAGE_URL}
         compression: bz2
 
-# TFTP/NFS test
-# Deply the kernel/dtb/rootfs used for TFT/NFS booting
+###############
+# TFTP/NFS
+###############
 - deploy:
     timeout:
       minutes: 5
@@ -40,7 +42,6 @@ actions:
       url: ${NFSROOTFS_DEV_URL}
       compression: bz2
 
-# Boot the TFTP/NFS deployment
 - boot:
     timeout:
       minutes: 20
@@ -57,17 +58,17 @@ actions:
       - "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:'
+      login_prompt: "login:"
       username: root
     prompts:
     - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
 
-# Run some basic commands on the TFTP/NFS deployment
 - test:
     timeout:
       minutes: 10
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-tftp
       prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
@@ -76,113 +77,109 @@ actions:
       - command: cat /proc/meminfo
       - command: cat /proc/cpuinfo
       - command: free -h
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: ping -c 3 github.com
+      - command: which docker
 
-# Run some LAVA tests on the TFTP/NFS deployment
 - test:
     timeout:
-      minutes: 60
+      minutes: 10
     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
+    - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
+      from: git
+      path: lava-test-shell/smoke-tests-basic.yaml
+      name: smoke-tests-tftp
 
-    - 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
+    - path: automated/linux/meminfo/meminfo.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: meminfo-tftp
+      from: git
+      branch: master
 
-    - 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
+    - path: automated/linux/badblocks/badblocks.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: badblocks-tftp
+      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-tftp
+      from: git
+      branch: master
+      parameters:
+        SKIP_INSTALL: True
+
+
+
+###################
+# dip-image-dev.wic
+###################
+# 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
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    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-wic
+      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: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+
+##################
+# Functional Tests
+##################
+- test:
+    timeout:
+      minutes: 100
+    definitions:
 
-    - 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
@@ -191,6 +188,7 @@ actions:
       branch: master
       parameters:
         SKIP_INSTALL: True
+
     - path: automated/linux/memtester/memtester.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -236,8 +234,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
@@ -250,8 +246,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
@@ -263,8 +257,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
@@ -275,166 +267,7 @@ actions:
         SKIP_INSTALL: 'true'
         DEVICE: "sda mmcblk0"
       name: device-read-perf
-      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}
diff --git a/schneider-openembedded/lava-job-definitions/soca9/dip-image.yaml b/schneider-openembedded/lava-job-definitions/soca9/dip-image.yaml
index b48fae05..31acaf64 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/dip-image.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/dip-image.yaml
@@ -1,6 +1,5 @@
-# All tests using dip-image.wic.bz2 are included here
 device_type: soca9
-job_name: SE ${MACHINE} dip-image-wic ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image (u-boot,nfs,wic,ubi) ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -8,12 +7,15 @@ timeouts:
   action:
     minutes: 70
   connection:
-    minutes: 2
+    minutes: 20
 priority: medium
 visibility: public
 
 actions:
 
+##################
+# Deploy WIC image
+##################
 - deploy:
     timeout:
       minutes: 20
@@ -23,8 +25,10 @@ actions:
         url: ${WIC_IMAGE_URL}
         compression: bz2
 
-# Deploy the dip-image WIC SDcard image
-# This is common to all the test deployments in this YAML
+
+###############
+# u-boot
+###############
 - deploy:
     timeout:
       minutes: 5
@@ -34,21 +38,20 @@ actions:
       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
     method: bootloader
     bootloader: u-boot
     commands: []
-    prompts: ['=>']
+    prompts: ["=>"]
 
 # Run some U-Boot tests
 - test:
     timeout:
       minutes: 5
     interactive:
-    - name: basic-cmds
+    - name: uboot-tests
       prompts: ["=> ", "/ # "]
       script:
       - command: echo "u-boot echo test"
@@ -145,8 +148,10 @@ actions:
         successes:
         - message: "return code 0"
 
+
+###############
 # TFTP/NFS
-# Deploy the kernel/dtb/rootfs used for TFTP/NFS boot
+###############
 - deploy:
     timeout:
       minutes: 5
@@ -158,49 +163,47 @@ actions:
     dtb:
       url: ${DTB_URL}
     nfsrootfs:
-      url: ${NFSROOTFS_DEV_URL}
+      url: ${NFSROOTFS_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}'
+      - 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:'
+      login_prompt: "login:"
       username: root
-      password_prompt: 'Password:'
-      password: P@ssword-1
+      password_prompt: "Password:"
+      password: "P@ssword-1"
       login_commands:
-      - P@ssword-1
-      - azertAZERT12345
-      - azertAZERT12345
-      - azertAZERT12345
+      - "P@ssword-1"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
     prompts:
-    - 'Current password: '
-    - 'New password: '
-    - 'Retype new password: '
-    - 'root@snarc-soca9:'
+    - "Current password: "
+    - "New password: "
+    - "Retype new password: "
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
 
-# 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]
+    - name: basic-cmds-tftp
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
       - command: cat /proc/device-tree/model ; echo ""
@@ -208,25 +211,34 @@ actions:
       - command: cat /proc/meminfo
       - command: cat /proc/cpuinfo
       - command: free -h
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: ping -c 3 github.com
+      - command: which docker
 
 - test:
     timeout:
-      minutes: 5
+      minutes: 10
     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
+      name: smoke-tests-tftp
+
     - path: automated/linux/meminfo/meminfo.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
-      name: meminfo
+      name: meminfo-tftp
       from: git
       branch: master
 
-# SDcard boot
+
+###############
+# dip-image.wic
+###############
 # We already flashed the SDcard WIC image in the deploy step at the begging of this test run
 - boot:
     timeout:
@@ -235,28 +247,28 @@ actions:
     commands:
     - run linux_sd
     auto_login:
-      login_prompt: 'login:'
+      login_prompt: "login:"
       username: root
-      password_prompt: 'Password:'
-      password: P@ssword-1
+      password_prompt: "Password:"
+      password: "P@ssword-1"
       login_commands:
-      - P@ssword-1
-      - azertAZERT12345
-      - azertAZERT12345
-      - azertAZERT12345
+      - "P@ssword-1"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
     prompts:
-    - 'Current password: '
-    - 'New password: '
-    - 'Retype new password: '
-    - 'root@snarc-soca9:'
+    - "Current password: "
+    - "New password: "
+    - "Retype new password: "
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
 
-# Run tests on SDcard boot
 - test:
     timeout:
       minutes: 10
     interactive:
-    - name: basic-cmds
-      prompts: [root@snarc-soca9, root@rzn1-snarc]
+    - name: basic-cmds-wic
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
       - command: cat /proc/device-tree/model ; echo ""
@@ -265,11 +277,111 @@ actions:
       - command: cat /proc/meminfo
       - command: cat /proc/cpuinfo
       - command: free -h
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: udhcpc -i eth1 -n || udhcpc -i eth0 -n
       - command: ifconfig -a
       - command: ping -c 3 github.com
+      - command: which docker
+
+
+##################
+# Reboot/Poweroff Tests
+##################
+- test:
+    timeout:
+      minutes: 5
+    interactive:
+    - name: reboot-cmds-1
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc", "=> "]
+      script:
+      - command: reboot ; sleep 10
+
+# Trigger 2nd boot
+- boot:
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: azertAZERT12345
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+
+- test:
+    timeout:
+      minutes: 5
+    interactive:
+    - name: check-1st-reboot
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: echo "We came back from a reboot"
+
+
+# Reboot the board a 2nd time
+- test:
+    timeout:
+      minutes: 5
+    interactive:
+    - name: reboot-cmds-2
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc", "=> "]
+      script:
+      - command: reboot ; sleep 10
+
+# Trigger a new boot
+- boot:
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: "azertAZERT12345"
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+
+- test:
+    timeout:
+      minutes: 5
+    interactive:
+    - name: check-2nd-reboot
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc", "=> "]
+      script:
+      - command: echo "We came back from the 2nd reboot"
+
+# Test poweroff
+- test:
+    timeout:
+      minutes: 5
+    interactive:
+    - name: poweroff-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc", "=> "]
+      script:
+      - command: poweroff ; sleep 10
 
+# Check we are in u-boot after poweroff
+- test:
+    timeout:
+      minutes: 5
+    interactive:
+    - name: check-poweroff
+      prompts: ["=> "]
+      script:
+      - command: version
+        successes:
+        - message: "U-Boot"
 
 metadata:
   machine: ${MACHINE}
diff --git a/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml b/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml
index 989089aa..192ebac2 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml
@@ -1,5 +1,5 @@
 device_type: soca9
-job_name: SE ${MACHINE} WIC dev LTP/PTEST ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} dip-image-dev (LTP/PTEST) ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -13,6 +13,9 @@ visibility: public
 
 actions:
 
+###################
+# dip-image-dev.wic
+###################
 - deploy:
     timeout:
       minutes: 100
@@ -21,17 +24,20 @@ actions:
       image:
         url: ${WIC_DEV_IMAGE_URL}
         compression: bz2
+
+
 - boot:
     timeout:
-      minutes: 100
+      minutes: 10
     method: u-boot
     commands:
     - run linux_sd
     auto_login:
-      login_prompt: 'login:'
+      login_prompt: "login:"
       username: root
     prompts:
     - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
     transfer_overlay:
       download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
       unpack_command: tar --touch -C / -xzf
@@ -40,7 +46,7 @@ actions:
     timeout:
       minutes: 10
     interactive:
-    - name: basic-cmds
+    - name: basic-cmds-wic
       prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
       script:
       - command: uname -a
@@ -48,113 +54,32 @@ actions:
       - command: mount
       - command: ps aux --sort -rss
       - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
       - command: free -h
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
       - command: ifconfig -a
       - command: ping -c 3 github.com
+      - command: which docker
 
+##################
+# Functional Tests
+##################
 - test:
     timeout:
       minutes: 600
     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/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -166,8 +91,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-syscalls-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -179,8 +103,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-math-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -192,8 +115,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-timers-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -205,8 +127,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-fcntl-locktests-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -218,8 +139,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-ipc-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -231,8 +151,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-fsx-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -244,8 +163,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-fs-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -257,8 +175,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-hugetlb-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -270,8 +187,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-io-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -283,8 +199,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-nptl-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -296,8 +211,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-pty-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -309,8 +223,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-containers-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -322,8 +235,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-fs_bind-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -335,8 +247,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-filecaps-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -348,8 +259,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-admin_tools-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -361,8 +271,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-connectors-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ltp/ltp.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -374,8 +283,7 @@ actions:
         BOARD: rzn1d
         TIMEOUT_MULTIPLIER: 3
       name: ltp-mm-tests
-      timeout:
-        minutes: 120
+
     - path: automated/linux/ptest/ptest.yaml
       repository: https://git.linaro.org/qa/test-definitions.git
       history: false
@@ -384,8 +292,6 @@ actions:
       params:
         exclude: 'bluez5 bzip2 containerd e2fsprogs libxml2 parted python strace'
         EXCLUDE: 'bluez5 bzip2 containerd e2fsprogs libxml2 parted python strace'
-      timeout:
-        minutes: 160
 
 metadata:
   machine: ${MACHINE}