diff options
author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-09-15 12:43:16 +0100 |
---|---|---|
committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-09-15 12:46:35 +0100 |
commit | eadaa41b67d8df0ce324e61a2132780b5c239074 (patch) | |
tree | fd0e0c7cfe49ed116656381728ffc2f40d927625 /lt-qcom-ubuntu-images-tracking | |
parent | 815d2b31e673167f074b34af5dbaf2c212550f58 (diff) |
lt-qcom-ubuntu-images*: move SATA test to main template
All devices in the LAB are now equipped with SATA drives. The SATA tests
were moved to main template.
Change-Id: I8cfeb06e117abdb2f8cbf3c90128f647f045ecec
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Diffstat (limited to 'lt-qcom-ubuntu-images-tracking')
4 files changed, 18 insertions, 77 deletions
diff --git a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-sata.json b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-sata.json deleted file mode 100644 index 848744fd44..0000000000 --- a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-sata.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "actions": [ - { - "command": "deploy_linaro_android_image", - "parameters": { - "images": [ - { - "partition": "boot", - "url": "${BOOT_URL}" - }, - { - "partition": "userdata", - "url": "${DATA_URL}" - }, - { - "partition": "system", - "url": "${SYSTEM_URL}" - } - ], - "target_type": "ubuntu" - } - }, - { - "command": "boot_linaro_image" - }, - { - "command": "lava_test_shell", - "parameters": { - "testdef_repos": [ - { - "git-repo": "http://git.linaro.org/qa/test-definitions.git", - "testdef": "ubuntu/sata-partition-rw.yaml" - } - ], - "timeout": 3600 - } - }, - { - "command": "submit_results", - "parameters": { - "stream": "${BUNDLE_STREAM_NAME}", - "server": "http://${LAVA_SERVER}" - } - } - ], - "device_type": "${DEVICE_TYPE}", - "tags": ["sata-drive"], - "job_name": "${BUILD_URL}", - "timeout": 3600 -} diff --git a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-sata.yaml b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-sata.yaml deleted file mode 100644 index 9c903083ed..0000000000 --- a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-sata.yaml +++ /dev/null @@ -1,27 +0,0 @@ -actions: - - command: deploy_linaro_android_image - parameters: - images: - - partition: 'boot' - url: '${BOOT_URL}' - - partition: 'userdata' - url: '${DATA_URL}' - - partition: 'system' - url: '${SYSTEM_URL}' - target_type: 'ubuntu' - - command: boot_linaro_image - - command: lava_test_shell - parameters: - testdef_repos: - - git-repo: 'http://git.linaro.org/qa/test-definitions.git' - testdef: 'ubuntu/sata-partition-rw.yaml' - timeout: 3600 - - command: submit_results - parameters: - server: 'http://${LAVA_SERVER}' - stream: '${BUNDLE_STREAM_NAME}' -device_type: '${DEVICE_TYPE}' -job_name: '${BUILD_URL}' -tags: - - sata-drive -timeout: 3600 diff --git a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template.json b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template.json index 31bad0be4c..9ba93a9902 100644 --- a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template.json +++ b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template.json @@ -159,6 +159,18 @@ } }, { + "command": "lava_test_shell", + "parameters": { + "testdef_repos": [ + { + "git-repo": "http://git.linaro.org/qa/test-definitions.git", + "testdef": "ubuntu/sata-partition-rw.yaml" + } + ], + "timeout": 3600 + } + }, + { "command": "submit_results", "parameters": { "stream": "${BUNDLE_STREAM_NAME}", diff --git a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template.yaml b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template.yaml index 3a5004e257..6e913215d6 100644 --- a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template.yaml +++ b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template.yaml @@ -80,6 +80,12 @@ actions: parameters: TEST: 'cpu' timeout: 8000 + - command: lava_test_shell + parameters: + testdef_repos: + - git-repo: 'http://git.linaro.org/qa/test-definitions.git' + testdef: 'ubuntu/sata-partition-rw.yaml' + timeout: 3600 - command: submit_results parameters: server: 'http://${LAVA_SERVER}' |