se: merge LTP and PTEST yamls

Now we're using WIC images, there's enough disk space for the two test
suites to be combined.

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

4 files changed, 25 insertions, 420 deletions

diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp-ptest.yaml
index c0aa33e7..f8492412 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp-ptest.yaml
@@ -1,5 +1,5 @@
 device_type: rzn1d
-job_name: SE ${MACHINE} WIC dev LTP ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} WIC dev LTP/PTEST ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -7,7 +7,7 @@ timeouts:
   action:
     minutes: 70
   connection:
-    minutes: 2
+    minutes: 20
 priority: medium
 visibility: public
 
@@ -38,7 +38,7 @@ actions:
     namespace: dfu
     method: dfu
     timeout:
-      minutes: 10
+      minutes: 20
 
 - command:
     namespace: test
@@ -399,6 +399,16 @@ actions:
       name: ltp-connectors-tests
       timeout:
         minutes: 120
+    - path: automated/linux/ptest/ptest.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: linux-ptest
+      from: git
+      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/rzn1d/wic-dev-ptest.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ptest.yaml
deleted file mode 100644
index 027d6538..00000000
--- a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ptest.yaml
+++ /dev/null
@@ -1,232 +0,0 @@
-device_type: rzn1d
-job_name: SE ${MACHINE} WIC dev ptest ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 600
-  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:"
-    transfer_overlay:
-      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
-      unpack_command: tar --touch -C / -xzf
-
-- 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: ping -c 3 github.com
-
-- test:
-    namespace: 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/ptest/ptest.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      name: linux-ptest
-      from: git
-      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}
-  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-ltp.yaml b/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-ptest.yaml
index 4fa20a4f..989089aa 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-ptest.yaml
@@ -1,5 +1,5 @@
 device_type: soca9
-job_name: SE ${MACHINE} WIC dev LTP ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} WIC dev LTP/PTEST ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -7,7 +7,7 @@ timeouts:
   action:
     minutes: 70
   connection:
-    minutes: 2
+    minutes: 20
 priority: medium
 visibility: public
 
@@ -376,6 +376,16 @@ actions:
       name: ltp-mm-tests
       timeout:
         minutes: 120
+    - path: automated/linux/ptest/ptest.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      name: linux-ptest
+      from: git
+      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/wic-dev-ptest.yaml b/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ptest.yaml
deleted file mode 100644
index 850590f4..00000000
--- a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ptest.yaml
+++ /dev/null
@@ -1,183 +0,0 @@
-device_type: soca9
-job_name: SE ${MACHINE} WIC dev ptest ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 600
-  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: 100
-    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: 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/ptest/ptest.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      name: linux-ptest
-      from: git
-      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}
-  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