commit 102e35297e35f0389c3ca66f1fa3b052da37696d
author Simran Basi <sbasi@chromium.org> Thu Sep 11 11:46:10 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Sep 17 01:24:07 2014 +0000
tree 38c03930df3b38d3013243116269c75b651241be
parent bfdadbb466aea09d013431307af92078af5c092a

[autotest] Allow piping of max_runtime_mins to dynamic suites.

The AFE allows users to set the max runtime of a job but this is
not properly passed into dynamic_suites which already has support
for this variable.

This change pipes in max_runtime_mins from create_suite_job to the
suite control file from which dyanmic_suites may use.

Also updates the storagequal suite to pass max_runtime_mins to
dynamic suites.

BUG=chromium:395865
TEST=local setup, verified subjobs had max_runtime_mins value set
by the suite job.
DEPLOY=apache

Change-Id: I285e6153f3f420f4eefe5d4c79f4212a4df30f58
Reviewed-on: https://chromium-review.googlesource.com/217780
Tested-by: Simran Basi <sbasi@chromium.org>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Simran Basi <sbasi@chromium.org>

frontend/afe/site_rpc_interface.py

diff --git a/frontend/afe/site_rpc_interface.py b/frontend/afe/site_rpc_interface.py
index 78048d1..83f8e80 100644
--- a/frontend/afe/site_rpc_interface.py
+++ b/frontend/afe/site_rpc_interface.py
@@ -106,7 +106,7 @@
                      check_hosts=True, num=None, file_bugs=False, timeout=24,
                      timeout_mins=None, priority=priorities.Priority.DEFAULT,
                      suite_args=None, wait_for_results=True, job_retry=False,
-                     **kwargs):
+                     max_runtime_mins=None, **kwargs):
     """
     Create a job to run a test suite on the given device with the given image.
 
@@ -133,6 +133,8 @@
     @param wait_for_results: Set to False to run the suite job without waiting
                              for test jobs to finish. Default is True.
     @param job_retry: Set to True to enable job-level retry. Default is False.
+    @param max_runtime_mins: Maximum amount of time a job can be running in
+                             minutes.
     @param kwargs: extra keyword args. NOT USED.
 
     @raises ControlFileNotFound: if a unique suite control file doesn't exist.
@@ -159,6 +161,7 @@
       name = '%s-%s' % (build, suite_name)
 
     timeout_mins = timeout_mins or timeout * 60
+    max_runtime_mins = max_runtime_mins or timeout * 60
 
     if not board:
         board = utils.ParseBuildName(build)[0]
@@ -176,7 +179,8 @@
                    'priority': priority,
                    'suite_args' : suite_args,
                    'wait_for_results': wait_for_results,
-                   'job_retry': job_retry
+                   'job_retry': job_retry,
+                   'max_runtime_mins': max_runtime_mins
                    }
 
     control_file = tools.inject_vars(inject_dict, control_file)
@@ -184,7 +188,7 @@
     return rpc_utils.create_job_common(name,
                                           priority=priority,
                                           timeout_mins=timeout_mins,
-                                          max_runtime_mins=timeout*60,
+                                          max_runtime_mins=max_runtime_mins,
                                           control_type='Server',
                                           control_file=control_file,
                                           hostless=True,