Merge lp:~liuyq0307/linaro-android-build-tools/support-timeout into lp:linaro-android-build-tools

[Yongqin Liu]

Add support for timeout option for each test actions.
And the wiki following has been updated about how to use the timeout support:
https://wiki.linaro.org/Platform/Android/AndroidBuild-LavaIntegration#preview

[Milo Casagrande (milo)]

Hi Yongqin,

thanks for working on this. Overall the merge proposal looks good to me, just a couple of really small comments.

On Fri, Jun 15, 2012 at 10:44 AM, Paul Sokolovsky <email address hidden> wrote:
>
> +    # Set the default timeout for all test,
> +    # if this value it not set, then use the 3600 seconds as the default value
> +    default_timeout = os.environ.get("DEFAULT_TIMEOUT", 3600)

Just a small typo here: s/it not/is not

>     config_json = {"job_name": build_url,
>                    "image_type": 'android',
> -                   "timeout": 18000,
> +                   "timeout": int(default_timeout),
>                    "actions": actions
>                   }

The old timeout here was set to 18000 seconds, now you set a default value of 3600: has it been discussed somewhere to lower the timeout?

Also, even if not introduced by you, can you please fix these two errors from pep8:

post-build-lava.py:44:15: E203 whitespace before ':'
post-build-lava.py:185:80: E501 line too long (100 characters)

Thanks.

review: Needs Information

[lp:~liuyq0307/linaro-android-build-tools/support-timeout]

489. By Yongqin Liu on 2012-06-16

modify according to the review comment

[Yongqin Liu (liuyq0307)]

> Hi Yongqin,
>
> thanks for working on this. Overall the merge proposal looks good to me, just
> a couple of really small comments.
>
> On Fri, Jun 15, 2012 at 10:44 AM, Paul Sokolovsky <email address hidden>
> wrote:
> >
> > +    # Set the default timeout for all test,
> > +    # if this value it not set, then use the 3600 seconds as the default
> value
> > +    default_timeout = os.environ.get("DEFAULT_TIMEOUT", 3600)

> Just a small typo here: s/it not/is not
> Also, even if not introduced by you, can you please fix these two errors from
> pep8:
>
> post-build-lava.py:44:15: E203 whitespace before ':'
> post-build-lava.py:185:80: E501 line too long (100 characters)

Thanks, the above typo and this two lines have been updated.

> >     config_json = {"job_name": build_url,
> >                    "image_type": 'android',
> > -                   "timeout": 18000,
> > +                   "timeout": int(default_timeout),
> >                    "actions": actions
> >                   }
>
> The old timeout here was set to 18000 seconds, now you set a default value of
> 3600: has it been discussed somewhere to lower the timeout?
For this, I have asked about it in lava team, the timeout is not used before.
This is the first time that it will be used.
And from the tests we have now, mainly less than 1 hour.
So I set it to 3600.

But it's seems set it to 18000 is more reasonable.
1. keep it as it was before, although not used before
2. only the CTS test need to be specifically set.
   **The CTS test will need more time, about 10H.

Now I changed it to 18000

[lp:~liuyq0307/linaro-android-build-tools/support-timeout]

490. By Yongqin Liu on 2012-06-16

change the default timeout to 18000 back

[Milo Casagrande (milo)]

Hello Yongqin,

looks good to me! Thanks for taking care of this!

review: Approve

[Yongqin Liu (liuyq0307)]

Thanks, and also perhaps need you help me to merge this branch.
I should not have the permission to do that.

Thanks very much.

Yongqin Liu

[Milo Casagrande (milo)]

Hello Yongqin,

sorry for the delay, I thought you could merge by yourself.

Can you please re-align with trunk? I merged another request, and here we get a couple of conflicts. If you can do it by today, I'll merge everything ASAP.

Thanks.

[lp:~liuyq0307/linaro-android-build-tools/support-timeout]

491. By Yongqin Liu on 2012-06-18

merge with trunk

Unmerged revisions

=== modified file 'build-scripts/post-build-lava.py'
--- build-scripts/post-build-lava.py	2012-06-18 11:52:58 +0000
+++ build-scripts/post-build-lava.py	2012-06-18 13:23:24 +0000
@@ -49,6 +49,7 @@
 }
 
 OPTION_SUFFIX = "_OPTION"
+TIMEOUT_SUFFIX = "_TIMEOUT"
 # Special token for LAVA_TEST_PLAN that allows the build owner to encode a
 # reboot in between test actions.
 REBOOT_TOKEN = '[system-reboot]'
@@ -77,6 +78,11 @@
         if test_option:
             parameters['option'] = test_option
 
+        timeout_option = os.environ.get('%s%s' % (test.upper(),
+                                                  TIMEOUT_SUFFIX))
+        if timeout_option:
+            parameters['timeout'] = int(timeout_option)
+
         if test != REBOOT_TOKEN:
             run_action = {
                           "command": "lava_android_test_run",
@@ -101,7 +107,7 @@
     return gen_lava_android_test_actions(test_plans)
 
 
-def gen_command_action(commands=[], cmd_file=None, parser=None):
+def gen_command_action(commands=[], cmd_file=None, parser=None, timeout=None):
     parameters = None
     if commands:
         parameters = {'commands': commands}
@@ -111,6 +117,9 @@
     if parameters and parser:
         parameters['parser'] = parser
 
+    if timeout:
+        parameters['timeout'] = int(timeout)
+
     action = {"command": "lava_android_test_run_custom",
               "parameters": parameters}
     return action
@@ -123,14 +132,17 @@
     test_list = []
     for var in os.environ.keys():
         if var.startswith(prefix) and (not var.endswith(pat_suffix)) \
-           and (var != 'LAVA_TEST_PLAN'):
+           and (var != 'LAVA_TEST_PLAN') \
+           and (not var.endswith(TIMEOUT_SUFFIX)):
             test_list.append(var)
     test_list.sort()
     for var in test_list:
         cmd = os.environ.get(var)
         pattern = os.environ.get('%s%s' % (var, pat_suffix))
+        timeout = os.environ.get('%s%s' % (var, TIMEOUT_SUFFIX))
         test_actions.append(gen_command_action(commands=[cmd],
-                                                parser=pattern))
+                                                parser=pattern,
+                                                timeout=timeout))
 
     return test_actions
 
@@ -140,17 +152,18 @@
     prefix = 'MONKEY_RUNNER_URL_'
     test_list = []
     for var in os.environ.keys():
-        if var.startswith(prefix):
+        if var.startswith(prefix) and (not var.endswith(TIMEOUT_SUFFIX)):
             test_list.append(var)
     test_list.sort()
     for var in test_list:
         url = os.environ.get(var)
+        parameters = {"url": url}
+        timeout = os.environ.get('%s%s' % (var, TIMEOUT_SUFFIX))
+        if timeout:
+            parameters['timeout'] = int(timeout)
         action = {
                     "command": "lava_android_test_run_monkeyrunner",
-                    "parameters":
-                            {
-                                 "url": url
-                            }
+                    "parameters": parameters
                  }
         test_actions.append(action)
     return test_actions
@@ -193,6 +206,10 @@
     else:
         enable_android_install_binaries = False
 
+    # Set the default timeout for all test,
+    # if this value is not set, then use the 18000 seconds as the default value
+    default_timeout = os.environ.get("DEFAULT_TIMEOUT", 18000)
+
     # Board-specific parameters
     if target_product not in PRODUCT_MAP:
         # We don't know how to test this job, so skip testing.
@@ -249,7 +266,7 @@
 
     config_json = {"job_name": build_url,
                    "image_type": 'android',
-                   "timeout": 18000,
+                   "timeout": int(default_timeout),
                    "actions": actions
                   }