android juno cts: update definition for target side
use url to sepcify the multinode-target.yaml
as the target side definition file,
to avoid copying all the necessary file when specify git repository
Change-Id: I0e09221a8229055ddb84726e8d0e1ac480f6b3fc
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
diff --git a/android/lcr-member-juno-m/template-cts-focused1.json b/android/lcr-member-juno-m/template-cts-focused1.json
index 0a59478..9735dc3 100644
--- a/android/lcr-member-juno-m/template-cts-focused1.json
+++ b/android/lcr-member-juno-m/template-cts-focused1.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-focused1"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-focused2.json b/android/lcr-member-juno-m/template-cts-focused2.json
index 5976b10..df2d09a 100644
--- a/android/lcr-member-juno-m/template-cts-focused2.json
+++ b/android/lcr-member-juno-m/template-cts-focused2.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-focused2"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-media-32.json b/android/lcr-member-juno-m/template-cts-media-32.json
index 29292c7..8fb6454 100644
--- a/android/lcr-member-juno-m/template-cts-media-32.json
+++ b/android/lcr-member-juno-m/template-cts-media-32.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-media"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-media-64.json b/android/lcr-member-juno-m/template-cts-media-64.json
index 175e573..0cf071f 100644
--- a/android/lcr-member-juno-m/template-cts-media-64.json
+++ b/android/lcr-member-juno-m/template-cts-media-64.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-media"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-opengl-32.json b/android/lcr-member-juno-m/template-cts-opengl-32.json
index 2240c72..62041f3 100644
--- a/android/lcr-member-juno-m/template-cts-opengl-32.json
+++ b/android/lcr-member-juno-m/template-cts-opengl-32.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-opengl"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-opengl-64.json b/android/lcr-member-juno-m/template-cts-opengl-64.json
index 1eb55d2..c00b641 100644
--- a/android/lcr-member-juno-m/template-cts-opengl-64.json
+++ b/android/lcr-member-juno-m/template-cts-opengl-64.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-opengl"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-part1.json b/android/lcr-member-juno-m/template-cts-part1.json
index 87c36d6..d69f072 100644
--- a/android/lcr-member-juno-m/template-cts-part1.json
+++ b/android/lcr-member-juno-m/template-cts-part1.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-part1"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-part2.json b/android/lcr-member-juno-m/template-cts-part2.json
index 3d9ca2e..055b71a 100644
--- a/android/lcr-member-juno-m/template-cts-part2.json
+++ b/android/lcr-member-juno-m/template-cts-part2.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-part2"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-part3.json b/android/lcr-member-juno-m/template-cts-part3.json
index e3c6be7..eff5d3e 100644
--- a/android/lcr-member-juno-m/template-cts-part3.json
+++ b/android/lcr-member-juno-m/template-cts-part3.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-part3"}
}
],
diff --git a/android/lcr-member-juno-m/template-cts-part4.json b/android/lcr-member-juno-m/template-cts-part4.json
index d0080b5..91e57e8 100644
--- a/android/lcr-member-juno-m/template-cts-part4.json
+++ b/android/lcr-member-juno-m/template-cts-part4.json
@@ -70,13 +70,10 @@
{
"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",
+ "url": "https://git.linaro.org/qa/test-definitions.git/blob_plain/HEAD:/android/multinode-target.yaml",
"parameters": {"TEST_NAME": "android-cts-7.0-part4"}
}
],