android: hikey: cts: fix adb pushing timeout issue
LAVA fails to push symbol link files over adb until timed out. The
current approach avoid copying symbol link files.
Change-Id: I55500fd8c01d4718f70bfba9f8cae0f810aeb145
Signed-off-by: Chase Qi <chase.qi@linaro.org>
diff --git a/android/hikey/template-cts-focused1.json b/android/hikey/template-cts-focused1.json
index 317b3fd..623e246 100644
--- a/android/hikey/template-cts-focused1.json
+++ b/android/hikey/template-cts-focused1.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-focused1"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-focused1"
+ }
}
],
"timeout": 18000
diff --git a/android/hikey/template-cts-focused2.json b/android/hikey/template-cts-focused2.json
index 052b746..c23dc42 100644
--- a/android/hikey/template-cts-focused2.json
+++ b/android/hikey/template-cts-focused2.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-focused2"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-focused2"
+ }
}
],
"timeout": 18000
diff --git a/android/hikey/template-cts-media-32.json b/android/hikey/template-cts-media-32.json
index afc261b..341bcba 100644
--- a/android/hikey/template-cts-media-32.json
+++ b/android/hikey/template-cts-media-32.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-media"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-media"
+ }
}
],
"timeout": 18000
diff --git a/android/hikey/template-cts-media-64.json b/android/hikey/template-cts-media-64.json
index 774fb9f..db2434e 100644
--- a/android/hikey/template-cts-media-64.json
+++ b/android/hikey/template-cts-media-64.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-media"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-media"
+ }
}
],
"timeout": 18000
diff --git a/android/hikey/template-cts-opengl.json b/android/hikey/template-cts-opengl.json
index 24357fa..f5c7dcc 100644
--- a/android/hikey/template-cts-opengl.json
+++ b/android/hikey/template-cts-opengl.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-opengl"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-opengl"
+ }
}
],
"timeout": 10800
diff --git a/android/hikey/template-cts-part1.json b/android/hikey/template-cts-part1.json
index 43a6cd9..17269a8 100644
--- a/android/hikey/template-cts-part1.json
+++ b/android/hikey/template-cts-part1.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-part1"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-part1"
+ }
}
],
"timeout": 18000
diff --git a/android/hikey/template-cts-part2-32.json b/android/hikey/template-cts-part2-32.json
index 1418789..010533c 100644
--- a/android/hikey/template-cts-part2-32.json
+++ b/android/hikey/template-cts-part2-32.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-part2"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-part2"
+ }
}
],
"timeout": 36000
diff --git a/android/hikey/template-cts-part2-64.json b/android/hikey/template-cts-part2-64.json
index 109e413..0d50db9 100644
--- a/android/hikey/template-cts-part2-64.json
+++ b/android/hikey/template-cts-part2-64.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-part2"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-part2"
+ }
}
],
"timeout": 36000
diff --git a/android/hikey/template-cts-part3.json b/android/hikey/template-cts-part3.json
index cc4ac67..056d75e 100644
--- a/android/hikey/template-cts-part3.json
+++ b/android/hikey/template-cts-part3.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-part3"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-part3"
+ }
}
],
"timeout": 25200
diff --git a/android/hikey/template-cts-part4.json b/android/hikey/template-cts-part4.json
index 5228f17..20063ac 100644
--- a/android/hikey/template-cts-part4.json
+++ b/android/hikey/template-cts-part4.json
@@ -78,14 +78,13 @@
{
"command": "lava_test_shell",
"parameters": {
- "lava_test_dir": "/data/local/tmp/lava",
- "lava_test_results_dir": "/local/tmp/lava",
"role": "target",
"testdef_repos": [
{
- "git-repo": "https://git.linaro.org/qa/test-definitions.git",
- "testdef": "android/cts-target.yaml",
- "parameters": {"TEST_NAME": "android-cts-7.0-part4"}
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
+ "parameters": {
+ "TEST_NAME": "android-cts-7.0-part4"
+ }
}
],
"timeout": 18000