Merge lp:~fboudra/linaro-ci/convert-template-to-lava-test-shell-lp1194435 into lp:linaro-ci

[Fathi Boudra]

Convert LAVA template to lava-test-shell (LP:#1194435)

=== modified file 'get_latest_ci_hwpack'
--- get_latest_ci_hwpack	2013-02-11 22:00:07 +0000
+++ get_latest_ci_hwpack	2013-06-29 13:34:26 +0000
@@ -17,30 +17,26 @@
     hwpacktype = os.getenv("HWPACK_TYPE", "unknown")
     imagetype = os.getenv("ROOTFS_TYPE", "unknown")
     job_name = os.getenv("KERNEL_JOB_NAME", "unknown") + '_' + \
-               os.getenv("HWPACK_BUILD_DATE", "unknown") + '_daily test'
+        os.getenv("HWPACK_BUILD_DATE", "unknown") + '_daily test'
 
     testplan = os.getenv("LAVA_TEST_PLAN", "ltp, pwrmgmt")
     osdevicetags = os.getenv("DEVICE_TAGS", "none")
 
     template = {
-      "timeout": 20000,
-      "actions": [
-        {
-          "command": "deploy_linaro_image"
-        },
-        {
-          "command": "boot_linaro_image"
-        },
-        {
-          "command": "submit_results",
-          "parameters": {
-            "stream": os.getenv("BUNDLE_STREAM_NAME", "/anonymous/plars/"),
-            "server": "http://validation.linaro.org/lava-server/RPC2/"
-          }
-        }
-      ],
-      "job_name": job_name,
-      "device_type": board
+        "timeout": 18000,
+        "actions": [{
+                        "command": "deploy_linaro_image"
+                    },
+                    {
+                        "command": "submit_results",
+                        "parameters": {
+                            "stream": os.getenv("BUNDLE_STREAM_NAME",
+                                                "/anonymous/plars/"),
+                            "server": "http://validation.linaro.org/lava-server/RPC2/"
+                        }
+                    }],
+        "job_name": job_name,
+        "device_type": board
     }
 
     if osdevicetags != "none":
@@ -55,11 +51,11 @@
 
     latest_hwpack = os.getenv('HWPACK_NAME', 'unknown')
     hwpack_url = find_ci_latest(hwpack_url_path, latest_hwpack)
-    if hwpack_url == None:
+    if hwpack_url is None:
         sys.exit(1)
     rootfs_url = find_latest_rootfs(imagetype)
-    rootfs_name, rootfsdate, rootfsbuild = os.path.basename(rootfs_url).\
-                                             rsplit(".", 2)[0].rsplit("-", 2)
+    rootfs_name, rootfsdate, rootfsbuild = os.path.basename(rootfs_url). \
+        rsplit(".", 2)[0].rsplit("-", 2)
 
     deploy_params = {'hwpack': hwpack_url, 'rootfs': rootfs_url}
     template['actions'][0]['parameters'] = deploy_params
@@ -67,7 +63,8 @@
     metadata = {}
     hwpack_filename = os.path.basename(hwpack_url)
     hwpackdate, hwpackbuild = hwpack_filename.rsplit('_', 4)[1].split('-')
-    metadata['git_url'] = os.getenv("KERNEL_GIT", "git://git.linaro.org/kernel/unknown")
+    metadata['git_url'] = os.getenv("KERNEL_GIT",
+                                    "git://git.linaro.org/kernel/unknown")
     metadata['kernel.gitweb_url'] = os.getenv("GIT_WEB_URL", "unknown")
     metadata['git_commitid'] = os.getenv("KERNEL_COMMIT", "unknown")
     metadata['kernel_name'] = os.getenv("KERNEL_NAME", "unknown")
@@ -88,42 +85,40 @@
 
     testcases = testplan.split(',')
     testcases = [tc.strip() for tc in testplan.split(',')]
-    regex = re.compile("(?P<testcase>^\w+)(\((?P<options>[^\)]+)\))?"\
+    regex = re.compile("(?P<testcase>^\w+)(\((?P<options>[^\)]+)\))?"
                        "(:(?P<timeout>\d+))?")
 
-    # Dict for lava_test_install
-    lava_test_install_command = {}
-    lava_test_install_command["command"] = "lava_test_install"
-    lava_test_install_command["parameters"] = {"tests": [], "timeout": 4000}
-
     # The positions in the template dict to insert test install/run commands
-    install_cmd_pos = 1
-    run_cmd_pos = 2
+    run_cmd_pos = 1
 
     for testcase in testcases:
         r = regex.search(testcase)
-        if r.group("testcase") != None:
-            lava_test_install_command["parameters"]["tests"].\
-                                     append(r.group("testcase"))
-
-            # append lava_test_run commands
-            timeout = 4800
+        if r.group("testcase") is not None:
+            # append commands
+            timeout = 1200
             if r.group('timeout'):
                 timeout = int(r.group('timeout'))
 
+            test_list = [({
+                'git-repo': 'git://git.linaro.org/qa/test-definitions.git',
+                'testdef': '{distribution:>s}/{test:>s}.yaml'.format(
+                distribution='ubuntu', test=r.group('testcase'))})]
+
             lava_test_run_command = {}
-            lava_test_run_command["command"] = "lava_test_run"
-            lava_test_run_command["parameters"] = {"test_name": r.group('testcase'),
-                                                   "timeout": timeout}
+            lava_test_run_command["command"] = "lava_test_shell"
+            lava_test_run_command["parameters"] = {
+                "timeout": timeout,
+                'testdef_repos': test_list
+            }
 
             if r.group("options"):
-                lava_test_run_command["parameters"]["test_options"] = r.group("options")
+                lava_test_run_command["parameters"]["test_options"] = \
+                    r.group("options")
 
             template['actions'].insert(run_cmd_pos, lava_test_run_command)
             run_cmd_pos = run_cmd_pos + 1
 
     # append the lava test install command
-    template['actions'].insert(install_cmd_pos, lava_test_install_command)
     print json.dumps(template, indent=2)