mbl: align mbl-smoke and Jenkinslinaro-20180521-001

The mbl-smoke plan and the Jenkins template.yaml were looking very different.

Align the test definitions between the two to help keep them in sync.

However, LAVA still can't break out all of the tests involved in
mbl_auto.sh, so LAVA continues to use the wrapper script and the Test
Plan calls out all the tests individually.

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

1 files changed, 80 insertions, 20 deletions

diff --git a/plans/mbl/mbl-smoke.yaml b/plans/mbl/mbl-smoke.yaml
index 31458de..947fdce 100644
--- a/plans/mbl/mbl-smoke.yaml
+++ b/plans/mbl/mbl-smoke.yaml
@@ -15,54 +15,114 @@ metadata:
 
 tests:
   automated:
-    - path: automated/linux/v4l2/v4l2-compliance.yaml
-      timeout: 1800
-      repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
-    - path: automated/linux/optee/optee-xtest.yaml
-      timeout: 1800
-      repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
     - path: automated/linux/mbl/mbl_accel_present.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_accel_present
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_audio_present.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_audio_present
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_btle_present.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_btle_present
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_btle_scan.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_btle_scan
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_pressure_present.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_pressure_present
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_pressure_temp.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_pressure_temp
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_pressure_value.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_pressure_value
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_magn_present.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_magn_present
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_wifi_present.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_wifi_present
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_gyro_present.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_gyro_present
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_docker_kernel-optional.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_docker_kernel-optional
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_docker_kernel-mandatory.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_docker_kernel-mandatory
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_docker_mounts.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_docker_mounts
+      from: git
+      branch: linaro-mbl
     - path: automated/linux/mbl/mbl_docker_interface.yaml
-      timeout: 1800
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: mbl_docker_interface
+      from: git
+      branch: linaro-mbl
+    - path: automated/linux/badblocks/badblocks.yaml
+      repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: badblocks
+      from: git
+      branch: linaro-mbl
+    - path: automated/linux/memtester/memtester.yaml
+      repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: memtester
+      from: git
+      branch: linaro-mbl
+    - path: automated/linux/v4l2/v4l2-compliance.yaml
+      repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: v4l2-compliance
+      from: git
+      branch: linaro-mbl
+    - path: automated/linux/optee/optee-xtest.yaml
+      repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions
+      history: false
+      name: optee-xtest
+      from: git
+      branch: linaro-mbl
   manual:
     - path: manual/generic/serial-console.yaml
       repository: https://git.linaro.org/landing-teams/working/mbl/test-definitions