se: consolidate soca9 tests

We had LTP and PTEST runs for both WIC and TFTP boot,and we don't need
both. As it happens, the submission scripts were not working for LTP
anyway.

Also, the TFTP jobs now use our own WIC disk image to ensure we're
testing a recent u-boot.

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

5 files changed, 18 insertions, 611 deletions

diff --git a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev-ltp.yaml b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev-ltp.yaml
deleted file mode 100644
index 78cda9f7..00000000
--- a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev-ltp.yaml
+++ /dev/null
@@ -1,397 +0,0 @@
-device_type: soca9
-job_name: SE ${MACHINE} TFTP/NFS LTP ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 600
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-- deploy:
-    timeout:
-      minutes: 10
-    to: flasher
-    images:
-      image:
-        url: https://images.validation.linaro.org/people.linaro.org/~remi.duraffort/soca9-disk.img.bz2
-        compression: bz2
-
-- 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:
-    timeout:
-      minutes: 10
-    method: u-boot
-    commands:
-      - run FPGA_INIT
-      - setenv autoload no
-      - dhcp
-      - dhcp
-      - env print
-      - setenv serverip {SERVER_IP}
-      - tftp 0x01000000 {KERNEL}
-      - tftp 0x00000100 {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
-    prompts:
-    - "root@snarc-soca9:"
-- 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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'syscalls'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'math'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'timers'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'fcntl-locktests'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'ipc'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'fsx'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'fs'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'hugetlb'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'io'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'nptl'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'pty'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'containers'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'fs_bind'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'filecaps'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'admin_tools'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'connectors'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        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
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'mm'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-mm-tests
-      timeout:
-        minutes: 120
-
-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-ptest.yaml b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev-ptest.yaml
deleted file mode 100644
index bd32950f..00000000
--- a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev-ptest.yaml
+++ /dev/null
@@ -1,186 +0,0 @@
-device_type: soca9
-job_name: SE ${MACHINE} TFTP/NFS ptest ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 600
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-- deploy:
-    timeout:
-      minutes: 10
-    to: flasher
-    images:
-      image:
-        url: https://images.validation.linaro.org/people.linaro.org/~remi.duraffort/soca9-disk.img.bz2
-        compression: bz2
-
-- 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:
-    timeout:
-      minutes: 10
-    method: u-boot
-    commands:
-      - run FPGA_INIT
-      - setenv autoload no
-      - dhcp
-      - dhcp
-      - env print
-      - setenv serverip {SERVER_IP}
-      - tftp 0x01000000 {KERNEL}
-      - tftp 0x00000100 {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
-    prompts:
-    - "root@snarc-soca9:"
-- 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/tftp-nfs-dev.yaml b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml
index 5823c960..2b6e558c 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml
@@ -14,11 +14,11 @@ visibility: public
 actions:
 - deploy:
     timeout:
-      minutes: 10
+      minutes: 100
     to: flasher
     images:
       image:
-        url: https://images.validation.linaro.org/people.linaro.org/~remi.duraffort/soca9-disk.img.bz2
+        url: ${WIC_IMAGE_URL}
         compression: bz2
 
 - deploy:
diff --git a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml
index aece0be2..92c94103 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml
@@ -14,11 +14,11 @@ visibility: public
 actions:
 - deploy:
     timeout:
-      minutes: 10
+      minutes: 100
     to: flasher
     images:
       image:
-        url: https://images.validation.linaro.org/people.linaro.org/~remi.duraffort/soca9-disk.img.bz2
+        url: ${WIC_IMAGE_URL}
         compression: bz2
 
 - deploy:
diff --git a/schneider-openembedded/submit_for_testing.sh b/schneider-openembedded/submit_for_testing.sh
index 00f52c3d..dc7e3cc7 100755
--- a/schneider-openembedded/submit_for_testing.sh
+++ b/schneider-openembedded/submit_for_testing.sh
@@ -66,29 +66,8 @@ if [ "${DEVICE_TYPE}" == "rzn1d" ]; then
 	  --template-path configs/schneider-openembedded/lava-job-definitions/ \
 	  --template-names tftp-nfs-dev-ltp.yaml
 fi
-if [ "${DEVICE_TYPE}" == "soca9" ]; then
-	python configs/openembedded-lkft/submit_for_testing.py \
-	  --device-type ${DEVICE_TYPE} \
-	  --build-number ${BUILD_NUMBER} \
-	  --lava-server ${LAVA_SERVER} \
-	  --qa-server ${QA_SERVER} \
-	  --qa-server-team ${QA_SERVER_TEAM} \
-	  --qa-server-project ${QA_SERVER_PROJECT} \
-	  --git-commit ${MANIFEST_COMMIT} \
-	  --template-path configs/schneider-openembedded/lava-job-definitions/ \
-	  --template-names tftp-nfs-dev-ltp-1.yaml
-	python configs/openembedded-lkft/submit_for_testing.py \
-	  --device-type ${DEVICE_TYPE} \
-	  --build-number ${BUILD_NUMBER} \
-	  --lava-server ${LAVA_SERVER} \
-	  --qa-server ${QA_SERVER} \
-	  --qa-server-team ${QA_SERVER_TEAM} \
-	  --qa-server-project ${QA_SERVER_PROJECT} \
-	  --git-commit ${MANIFEST_COMMIT} \
-	  --template-path configs/schneider-openembedded/lava-job-definitions/ \
-	  --template-names tftp-nfs-dev-ltp-2.yaml
-fi
-if [ "${DEVICE_TYPE}" == "rzn1d" ] || [ "${DEVICE_TYPE}" == "soca9" ]; then
+
+if [ "${DEVICE_TYPE}" == "rzn1d" ] ; then
 	python configs/openembedded-lkft/submit_for_testing.py \
 	  --device-type ${DEVICE_TYPE} \
 	  --build-number ${BUILD_NUMBER} \
@@ -175,7 +154,18 @@ if [ "${DEVICE_TYPE}" == "soca9" ]; then
 	  --qa-server-project ${QA_SERVER_PROJECT} \
 	  --git-commit ${MANIFEST_COMMIT} \
 	  --template-path configs/schneider-openembedded/lava-job-definitions/ \
-	  --template-names wic-dev-ltp.yaml
+	  --template-names wic-dev-ltp-1.yaml
+
+	python configs/openembedded-lkft/submit_for_testing.py \
+	  --device-type ${DEVICE_TYPE} \
+	  --build-number ${BUILD_NUMBER} \
+	  --lava-server ${LAVA_SERVER} \
+	  --qa-server ${QA_SERVER} \
+	  --qa-server-team ${QA_SERVER_TEAM} \
+	  --qa-server-project ${QA_SERVER_PROJECT} \
+	  --git-commit ${MANIFEST_COMMIT} \
+	  --template-path configs/schneider-openembedded/lava-job-definitions/ \
+	  --template-names wic-dev-ltp-2.yaml
 fi
 
 if [ "${DEVICE_TYPE}" == "soca9" ]; then