Revert "Revert "Modify the job submission script to use lava-test-shell instead of lava""
This reverts commit cc58ac7c12da764faef559998d99b81045d81785.
diff --git a/lava-submit.py b/lava-submit.py
index d328f8d..e3d88a4 100755
--- a/lava-submit.py
+++ b/lava-submit.py
@@ -109,6 +109,8 @@
hwpack_build_number, \
hwpack_file_name)
+ git_base_url = "http://git.linaro.org/gitweb?p=ubuntu/test-definitions.git;a=blob_plain;f="
+
# tests set specific to an image
tests = tests_nano
@@ -148,12 +150,6 @@
"rootfs.type": "%s" % rootfs_type,
"distribution": "%s" % distribution,
}
- },
- {
- "command": "boot_linaro_image",
- "parameters": {
- "options": ["boot_cmds=boot_cmds_oe"]
- }
}]
else: # Distribution is Ubuntu
actions = [{
@@ -167,24 +163,14 @@
"rootfs.type": "%s" % rootfs_type,
"ubuntu.distribution": "%s" % distribution,
}
- },
- {
- "command": "boot_linaro_image"
}]
if len(tests) > 0:
+ tests = [git_base_url + x + ".yaml" for x in tests]
actions.append({
- "command": "lava_test_install",
+ "command": "lava_test_shell",
"parameters": {
- "tests": tests
- }
- })
-
- for test in tests:
- actions.append({
- "command": "lava_test_run",
- "parameters": {
- "test_name": test
+ "testdef_urls": tests
}
})