commit eb10d3a315cc7d2b38c6b72cdef3552c2200c227
author Yongqin Liu <yongqin.liu@linaro.org> Fri Jun 23 21:13:58 2017 +0800
committer Yongqin Liu <yongqin.liu@linaro.org> Fri Jun 23 21:13:58 2017 +0800
tree 38e7122450f527d67cd569b05800639b6a2528ff
parent 93fea0ee9fdfd4ecc88cef27c708af6082532e75

template-xtest files: some update for xtest

remove the xtest from normal hikey test template,
and some update on the xtest template file

Change-Id: Iec923917a62e07b4d864294002b1e6bb5d7237db
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

android/hikey/template-xtest-lhg.json

diff --git a/android/hikey/template-xtest.json b/android/hikey/template-xtest-lhg.json
similarity index 96%
rename from android/hikey/template-xtest.json
rename to android/hikey/template-xtest-lhg.json
index 9b12260..f23c216 100644
--- a/android/hikey/template-xtest.json
+++ b/android/hikey/template-xtest-lhg.json
@@ -84,10 +84,10 @@
     ],
     "device_type": "hi6220-hikey",
     "image_type": "android",
-    "priority": "medium",
+    "priority": "high",
     "tags": [
         "optee-hikey"
     ],
-    "job_name": "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-basic",
+    "job_name": "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-optee",
     "timeout": 5400
 }

android/hikey/template-xtest-lmg.json

diff --git a/android/hikey/template-xtest.json b/android/hikey/template-xtest-lmg.json
similarity index 95%
copy from android/hikey/template-xtest.json
copy to android/hikey/template-xtest-lmg.json
index 9b12260..21b9bed 100644
--- a/android/hikey/template-xtest.json
+++ b/android/hikey/template-xtest-lmg.json
@@ -63,7 +63,7 @@
             "command": "submit_results",
             "parameters": {
                 "server": "http://validation.linaro.org/RPC2/",
-                "stream": "/private/team/lhg/"
+                "stream": "/private/team/lmg/"
             }
         },
         {
@@ -84,10 +84,10 @@
     ],
     "device_type": "hi6220-hikey",
     "image_type": "android",
-    "priority": "medium",
+    "priority": "high",
     "tags": [
         "optee-hikey"
     ],
-    "job_name": "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-basic",
+    "job_name": "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-optee",
     "timeout": 5400
 }

android/hikey/template.json

diff --git a/android/hikey/template.json b/android/hikey/template.json
index 5d2e678..88145db 100644
--- a/android/hikey/template.json
+++ b/android/hikey/template.json
@@ -96,20 +96,6 @@
         {
             "command": "lava_test_shell",
             "parameters": {
-                "lava_test_dir": "/data/local/tmp/lava/xtest",
-                "lava_test_results_dir": "/local/tmp/lava/xtest",
-                "testdef_repos": [
-                    {
-                        "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                        "testdef": "android/optee-xtest.yaml"
-                    }
-                ],
-                "timeout": 3600
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
                 "lava_test_dir": "/data/local/tmp/lava/tjbench",
                 "lava_test_results_dir": "/local/tmp/lava/tjbench",
                 "testdef_repos": [