linux-linaro-stable-lsk*: TC2: optimize test plan

1) Align with lsk-v3.10, split lsk-v3.14 ltp tests
2) Move ltp tests to the bottom
3) Move IKS tests on lsk-3.10 to the bottom

Change-Id: I3ecdf5100a003195ec5ab872f61d41c830ad69f3
Signed-off-by: Chase Qi <chase.qi@linaro.org>

2 files changed, 44 insertions, 44 deletions

diff --git a/linux-linaro-stable-lsk/lava-job-definitions/vexpress-tc2/template.json b/linux-linaro-stable-lsk/lava-job-definitions/vexpress-tc2/template.json
index 7b3e6e1..99fb4be 100644
--- a/linux-linaro-stable-lsk/lava-job-definitions/vexpress-tc2/template.json
+++ b/linux-linaro-stable-lsk/lava-job-definitions/vexpress-tc2/template.json
@@ -129,7 +129,7 @@
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/iks-smoke-test.yaml"
+            "testdef": "ubuntu/pwrmgmt.yaml"
           }
         ],
         "timeout": 1200
@@ -141,7 +141,31 @@
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bL_iks_tests.yaml"
+            "testdef": "ubuntu/smoke-tests-basic.yaml"
+          }
+        ],
+        "timeout": 1200
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "ubuntu/network-tests-basic.yaml"
+          }
+        ],
+        "timeout": 1200
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "ubuntu/mmtests.yaml"
           }
         ],
         "timeout": 3600
@@ -393,31 +417,7 @@
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/network-tests-basic.yaml"
+            "testdef": "common/iks-smoke-test.yaml"
           }
         ],
         "timeout": 1200
@@ -429,7 +429,7 @@
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
+            "testdef": "ubuntu/bL_iks_tests.yaml"
           }
         ],
         "timeout": 3600
diff --git a/linux-linaro-stable-lsk/lava-job-definitions/vexpress-tc2/template.yaml b/linux-linaro-stable-lsk/lava-job-definitions/vexpress-tc2/template.yaml
index 5262ff9..32e6b1f 100644
--- a/linux-linaro-stable-lsk/lava-job-definitions/vexpress-tc2/template.yaml
+++ b/linux-linaro-stable-lsk/lava-job-definitions/vexpress-tc2/template.yaml
@@ -82,13 +82,25 @@ actions:
   parameters:
     testdef_repos:
     - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/iks-smoke-test.yaml
+      testdef: ubuntu/pwrmgmt.yaml
     timeout: 1200
 - command: lava_test_shell
   parameters:
     testdef_repos:
     - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bL_iks_tests.yaml
+      testdef: ubuntu/smoke-tests-basic.yaml
+    timeout: 1200
+- command: lava_test_shell
+  parameters:
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: ubuntu/network-tests-basic.yaml
+    timeout: 1200
+- command: lava_test_shell
+  parameters:
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: ubuntu/mmtests.yaml
     timeout: 3600
 - command: lava_test_shell
   parameters:
@@ -222,25 +234,13 @@ actions:
   parameters:
     testdef_repos:
     - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/network-tests-basic.yaml
+      testdef: common/iks-smoke-test.yaml
     timeout: 1200
 - command: lava_test_shell
   parameters:
     testdef_repos:
     - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
+      testdef: ubuntu/bL_iks_tests.yaml
     timeout: 3600
 - command: submit_results
   parameters: