arrange the tests as levels and make the work harder for each one

6 files changed, 21 insertions, 13 deletions

diff --git a/multinode01.yaml b/multinode01.yaml
index 927cc5c..5636f9f 100644
--- a/multinode01.yaml
+++ b/multinode01.yaml
@@ -1,7 +1,7 @@
 metadata:
     format: Lava-Test Test Definition 1.0
-    name: multinode-first-stage
-    description: "First stage MultiNode test commands for Linux Linaro ubuntu Images"
+    name: multinode-basic-level
+    description: "Basic (level 1) MultiNode test commands for Linux Linaro ubuntu Images"
 
 run:
     steps:
diff --git a/multinode02.yaml b/multinode02.yaml
index 962b1f7..e2a2de0 100644
--- a/multinode02.yaml
+++ b/multinode02.yaml
@@ -1,7 +1,7 @@
 metadata:
     format: Lava-Test Test Definition 1.0
-    name: multinode-second-stage
-    description: "Second stage MultiNode test commands for Linux Linaro ubuntu Images"
+    name: multinode-intermediate-level
+    description: "Intermediate (level 2) MultiNode test commands for Linux Linaro ubuntu Images"
 
 run:
     steps:
diff --git a/multinode03.yaml b/multinode03.yaml
index d6f494a..5c30851 100644
--- a/multinode03.yaml
+++ b/multinode03.yaml
@@ -1,12 +1,14 @@
 metadata:
     format: Lava-Test Test Definition 1.0
-    name: multinode-third-stage
-    description: "Third stage MultiNode test commands for Linux Linaro ubuntu Images"
+    name: multinode-advanced-level
+    description: "Advanced (level 3) MultiNode test commands for Linux Linaro ubuntu Images"
 
 install:
     deps:
         - curl
         - realpath
+        - lsb-release
+        - usbutils
 
 run:
     steps:
diff --git a/singlenode01.yaml b/singlenode01.yaml
index 90a4528..99e68bd 100644
--- a/singlenode01.yaml
+++ b/singlenode01.yaml
@@ -1,7 +1,7 @@
 metadata:
     format: Lava-Test Test Definition 1.0
-    name: singlenode-third-stage
-    description: "Third stage single node test commands for Linux Linaro ubuntu Images"
+    name: singlenode-basic-level
+    description: "Basic (level 1) single node test commands for Linux Linaro ubuntu Images"
 
 run:
     steps:
diff --git a/singlenode02.yaml b/singlenode02.yaml
index b18f554..0183a83 100644
--- a/singlenode02.yaml
+++ b/singlenode02.yaml
@@ -1,7 +1,7 @@
 metadata:
     format: Lava-Test Test Definition 1.0
-    name: singlenode-second-stage
-    description: "Second stage single node test commands for Linux Linaro ubuntu Images"
+    name: singlenode-intermediate
+    description: "Intermediate (level 2): single node test commands for Linux Linaro ubuntu Images"
 
 run:
     steps:
@@ -11,7 +11,9 @@ run:
         - lava-test-case linux-linaro-ubuntu-route-ifconfig-up-lo --shell ifconfig lo up
         - lava-test-case linux-linaro-ubuntu-route-dump-b --shell route
         - lava-test-case linux-linaro-ubuntu-route-ifconfig-up --shell ifconfig eth0 up
-        - lava-test-case direct-install --shell apt-get -y install curl
+        - lava-test-case ping-test --shell ping -W1 -c1 multinode.validation.linaro.org
+        - lava-test-case direct-install --shell apt-get -q -y install curl
         - lava-test-case curl-ftp --shell curl -o netperf-2.6.0.tar.gz ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz
         - lava-test-case tar-tgz --shell tar -tzf netperf-2.6.0.tar.gz
+        - lava-test-case remove-tgz --shell rm netperf-2.6.0.tar.gz
         
diff --git a/singlenode03.yaml b/singlenode03.yaml
index 5186daa..56fa0c9 100644
--- a/singlenode03.yaml
+++ b/singlenode03.yaml
@@ -1,13 +1,15 @@
 metadata:
     format: Lava-Test Test Definition 1.0
-    name: singlenode-third-stage
-    description: "Third stage single node test commands for Linux Linaro ubuntu Images"
+    name: singlenode-advanced
+    description: "Advanced (level 3): single node test commands for Linux Linaro ubuntu Images"
 
 install:
     deps:
         - curl
         - realpath
         - ntpdate
+        - lsb-release
+        - usbutils
 
 run:
     steps:
@@ -17,8 +19,10 @@ run:
         - lava-test-case linux-linaro-ubuntu-route-ifconfig-up-lo --shell ifconfig lo up
         - lava-test-case linux-linaro-ubuntu-route-dump-b --shell route
         - lava-test-case linux-linaro-ubuntu-route-ifconfig-up --shell ifconfig eth0 up
+        - lava-test-case ping-test --shell ping -W1 -c1 multinode.validation.linaro.org
         - lava-test-case realpath-check --shell realpath ./check_ip
         - lava-test-case ntpdate-check --shell ntpdate-debian
         - lava-test-case curl-ftp --shell curl -o netperf-2.6.0.tar.gz ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.gz
         - lava-test-case tar-tgz --shell tar -tzf netperf-2.6.0.tar.gz
+        - lava-test-case remove-tgz --shell rm netperf-2.6.0.tar.gz