Merge lp:~milo/linaro-ci/bug1090416 into lp:linaro-ci

[Milo Casagrande]

Support sending LAVA jobs to multiple boards.

The branch adds support for sending multiple jobs to LAVA to different boards, from the same CI job.

It introduces a new env variable: board_types.
The old one can still be used in the CI jobs, but the new one will be exported, and it will be used looping through the defined boards.

Multiple boards have to be written comma separated.

[Deepti B. Kalakeri (deeptik)]

283 +elif test -n "$boards" -a -n "$board_type"; then
284 + board_types="$board_types,$board_type"

Typo error: elseif needs to be "elif test -n "$board_types" -a -n "$board_type"; than the above
between, I don't know why would anyone want to define board_types and board_type together in a job, instead if someone needed to define multiple board_types then they could just use board_types param or if they needed single board testing then they can use only board_type. I feel they are compliment params.

review: Needs Fixing

[Milo Casagrande (milo)]

On Fri, Dec 21, 2012 at 12:34 PM, Deepti B. Kalakeri
<email address hidden> wrote:
> Review: Needs Fixing
>
> 283 +elif test -n "$boards" -a -n "$board_type"; then
> 284 + board_types="$board_types,$board_type"
>
> Typo error: elseif needs to be "elif test -n "$board_types" -a -n "$board_type"; than the above
> between, I don't know why would anyone want to define board_types and board_type together in a job, instead if someone needed to define multiple board_types then they could just use board_types param or if they needed single board testing then they can use only board_type. I feel they are compliment params.

They are, or well should be: just one of them should be defined in the
job. Actually, it has been done in that way, introducing
'board_types', not to drop support for all the jobs that are already
using 'board_type'. Or we could just use 'board_type' even for
multiple boards.
All the if-elif code is just for using 'board_types' in the script,
and looping other it, instead of exporting both of them and having to
test which one is defined or not later.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[lp:~milo/linaro-ci/bug1090416]

122. By Milo Casagrande on 2012-12-21

Fixed wrong env variable name.

123. By Milo Casagrande on 2012-12-21

Merged from trunk.

[James Tunnicliffe (dooferlad)]

Looks good. I wish the diff viewer could show "the indentation changed on this bit" though!

review: Approve

=== modified file 'get_latest_ci_hwpack'
--- get_latest_ci_hwpack	2012-08-27 08:23:44 +0000
+++ get_latest_ci_hwpack	2012-12-21 15:41:20 +0000
@@ -3,119 +3,130 @@
 Generate a job definition from a template using the latest hwpack and rootfs
 of specified types.
 """
-import os, sys
+import os
+import sys
 import re
 import json
 from find_latest import find_latest_rootfs, find_ci_latest
 
-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'
-
-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/"
-      }
+
+def main(board):
+    if not board:
+        board = 'unknown'
+
+    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'
+
+    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
     }
-  ],
-  "job_name": job_name,
-  "device_type": os.getenv("BOARD_TYPE", "unknown")
-}
-
-if osdevicetags != "none":
-    devicetags = osdevicetags.split(',')
-    template["device_tags"] = devicetags
-
-url=os.getenv("JOB_URL", "http://snapshots.linaro.org/kernel-hwpack/")
-hwpack_parent_url=os.getenv("KERNEL_NAME","unknown")
-hwpack_dir_url=os.getenv("KERNEL_JOB_NAME", "unknown")
-hwpack_url_path = os.path.join(url, hwpack_parent_url)
-hwpack_url_path = os.path.join(hwpack_url_path, hwpack_dir_url)
-
-latest_hwpack = os.getenv('HWPACK_NAME', 'unknown')
-hwpack_url = find_ci_latest(hwpack_url_path, latest_hwpack)
-if hwpack_url == None:
-   sys.exit(1)
-rootfs_url = find_latest_rootfs(imagetype)
-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
-
-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['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")
-metadata['kernel_version'] = os.getenv("KERNEL_VERSION", "unknown")
-metadata['build.id'] = os.getenv("BUILD_ID", "unknown")
-metadata['kernel.config'] = os.getenv('KERNEL_CONFIG', 'unknown')
-metadata['kernel.build_url'] = os.getenv("KERNEL_BUILD_URL", "unknown")
-metadata['kernel.git_branch_name'] = os.getenv("KERNEL_BRANCH", "unknown")
-metadata['kernel.git_log_info'] = os.getenv("GIT_LOG", "unknown")
-metadata['hwpack.type'] = hwpacktype
-metadata['hwpack.date'] = hwpackdate
-
-metadata['rootfs.type'] = imagetype
-metadata['rootfs.date'] = rootfsdate
-metadata['rootfs.build'] = rootfsbuild
-
-template['actions'][0]['metadata'] = metadata
-
-testcases = testplan.split(',')
-testcases = [tc.strip() for tc in testplan.split(',')]
-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
-
-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('timeout'):
-         timeout = r.group('timeout')
-
-        lava_test_run_command = {}
-        lava_test_run_command["command"] = "lava_test_run"
-        lava_test_run_command["parameters"] = {"test_name" : r.group('testcase'),
-                                               "timeout" : timeout }
-
-        if 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)
+
+    if osdevicetags != "none":
+        devicetags = osdevicetags.split(',')
+        template["device_tags"] = devicetags
+
+    url = os.getenv("JOB_URL", "http://snapshots.linaro.org/kernel-hwpack/")
+    hwpack_parent_url = os.getenv("KERNEL_NAME", "unknown")
+    hwpack_dir_url = os.getenv("KERNEL_JOB_NAME", "unknown")
+    hwpack_url_path = os.path.join(url, hwpack_parent_url)
+    hwpack_url_path = os.path.join(hwpack_url_path, hwpack_dir_url)
+
+    latest_hwpack = os.getenv('HWPACK_NAME', 'unknown')
+    hwpack_url = find_ci_latest(hwpack_url_path, latest_hwpack)
+    if hwpack_url == None:
+        sys.exit(1)
+    rootfs_url = find_latest_rootfs(imagetype)
+    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
+
+    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['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")
+    metadata['kernel_version'] = os.getenv("KERNEL_VERSION", "unknown")
+    metadata['build.id'] = os.getenv("BUILD_ID", "unknown")
+    metadata['kernel.config'] = os.getenv('KERNEL_CONFIG', 'unknown')
+    metadata['kernel.build_url'] = os.getenv("KERNEL_BUILD_URL", "unknown")
+    metadata['kernel.git_branch_name'] = os.getenv("KERNEL_BRANCH", "unknown")
+    metadata['kernel.git_log_info'] = os.getenv("GIT_LOG", "unknown")
+    metadata['hwpack.type'] = hwpacktype
+    metadata['hwpack.date'] = hwpackdate
+
+    metadata['rootfs.type'] = imagetype
+    metadata['rootfs.date'] = rootfsdate
+    metadata['rootfs.build'] = rootfsbuild
+
+    template['actions'][0]['metadata'] = metadata
+
+    testcases = testplan.split(',')
+    testcases = [tc.strip() for tc in testplan.split(',')]
+    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
+
+    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('timeout'):
+                timeout = r.group('timeout')
+
+            lava_test_run_command = {}
+            lava_test_run_command["command"] = "lava_test_run"
+            lava_test_run_command["parameters"] = {"test_name": r.group('testcase'),
+                                                   "timeout": timeout}
+
+            if 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)
+
+
+if __name__ == '__main__':
+    # We need only one argument, the board type.
+    main(sys.argv[1])

=== modified file 'jenkins_common_lib'
--- jenkins_common_lib	2012-12-21 15:18:27 +0000
+++ jenkins_common_lib	2012-12-21 15:41:20 +0000
@@ -15,7 +15,7 @@
 echo BUILD_ID=$BUILD_NUMBER >> hwpack_info
 echo GCC_VERSION=`dpkg -s gcc | grep Version | cut -d ' ' -f2` >> hwpack_info
 echo GCC_CROSS_COMPILER=$gcc_cc_version >> hwpack_info
-echo BOARD_TYPE=$board_type >> hwpack_info
+echo BOARD_TYPES=$board_types >> hwpack_info
 echo HWPACK_TYPE=$hwpack_type >> hwpack_info
 echo ROOTFS_TYPE=$rootfs_type >> hwpack_info
 echo BUNDLE_STREAM_NAME=$bundle_stream_name_path >> hwpack_info

=== modified file 'jenkins_kernel_build_inst'
--- jenkins_kernel_build_inst	2012-12-21 15:15:51 +0000
+++ jenkins_kernel_build_inst	2012-12-21 15:41:20 +0000
@@ -1,7 +1,7 @@
 #! /bin/bash
 # Example env variables and its values
 # kernel_config='omap2plus_defconfig'
-# export board_type='panda'
+# export board_types='panda'
 # kernel_flavour='omap4'
 # rootfs_type='nano'
 #
@@ -32,8 +32,13 @@
 if test -z "$hwpack_type"; then
   hwpack_type='panda'
 fi
-if test -z "$board_type"; then
-  board_type='panda'
+# Use the new board_types variable to define multiple boards for LAVA testing.
+if test -z "$board_types" -a -z "$board_type"; then
+    board_types="panda"
+elif test -z "$board_types" -a -n "$board_type"; then
+    board_types="$board_type"
+elif test -n "$board_types" -a -n "$board_type"; then
+    board_types="$board_types,$board_type"
 fi
 if test -z "$kernel_flavour"; then
   kernel_flavour='omap'
@@ -78,7 +83,7 @@
 export conf_external
 export kernel_config
 export hwpack_type
-export board_type
+export board_types
 export kernel_flavour
 export rootfs_type
 export git_web_url

=== modified file 'jenkins_lava_job_submissions'
--- jenkins_lava_job_submissions	2012-05-28 03:38:56 +0000
+++ jenkins_lava_job_submissions	2012-12-21 15:41:20 +0000
@@ -15,7 +15,10 @@
 python $WORKSPACE/lci-build-tools/jenkins_kernel_ci_bundle > $build_json_fname
 lava-dashboard-tool put --dashboard-url "$LAVA_ENDPOINT" $build_json_fname "$BUILD_STREAM_NAME"
 if test $SUBMIT_LAVA_JOB -eq 1; then
-    python $WORKSPACE/lci-build-tools/get_latest_ci_hwpack > $kernel_test_json_fname
-    lava_job_id=`lava-tool submit-job  "$LAVA_ENDPOINT" $kernel_test_json_fname | grep -v EXPERIMENTAL | cut -d ":" -f 2 | tr -d ' '`
-    echo "LAVA Job Id: $lava_job_id, URL: http://$LAVA_SERVER/lava-server/scheduler/job/$lava_job_id"
+    for board in `printf "$BOARD_TYPES" | tr ',' ' '`
+    do
+        python $WORKSPACE/lci-build-tools/get_latest_ci_hwpack "$board" > $kernel_test_json_fname
+        lava_job_id=`lava-tool submit-job  "$LAVA_ENDPOINT" $kernel_test_json_fname | grep -v EXPERIMENTAL | cut -d ":" -f 2 | tr -d ' '`
+        echo "LAVA Job Id: $lava_job_id, URL: http://$LAVA_SERVER/lava-server/scheduler/job/$lava_job_id"
+    done
 fi

=== modified file 'jenkins_packaged_kernel_build_inst'
--- jenkins_packaged_kernel_build_inst	2012-03-23 11:27:18 +0000
+++ jenkins_packaged_kernel_build_inst	2012-12-21 15:41:20 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Example env variables and its values
-# export board_type='panda'
+# export board_types='panda'
 # rootfs_type='nano'
 set -xe
 
@@ -9,7 +9,7 @@
 #
 : ${kernel_config:='packaged_kernel_config'}
 : ${hwpack_type:='panda'}
-: ${board_type:='panda'}
+: ${board_types:='panda'}
 : ${rootfs_type:='nano'}
 : ${submit_job:=1}
 : ${upstream_git_tree:='git://git.linaro.org/kernel/linux-linaro-3.0.git'}
@@ -337,7 +337,7 @@
 	BUILD_ID=$BUILD_NUMBER
 	GCC_VERSION=$(dpkg -s gcc | grep Version | cut -d ' ' -f2)
 	GCC_CROSS_COMPILER=$(dpkg -s gcc-arm-linux-gnueabi | grep Version | cut -d ' ' -f2)
-	BOARD_TYPE=$board_type
+	BOARD_TYPES=$board_types
 	HWPACK_TYPE=$hwpack_type
 	ROOTFS_TYPE=$rootfs_type
 	BUNDLE_STREAM_NAME=$bundle_stream_name_path