Set the Test Planner "set atomic group" job parameters directly instead of using keyvals. This is to support cloning of the "set atomic group" job.
Signed-off-by: James Ren <[email protected]> --- autotest/frontend/planner/execution_engine.py 2010-05-04 10:33:35.000000000 -0700 +++ autotest/frontend/planner/execution_engine.py 2010-05-04 14:47:18.000000000 -0700 @@ -70,7 +70,9 @@ """ while True: hosts = self._planner_rpc.run('get_hosts', plan_id=self._plan_id) - control = self._planner_rpc.run('get_atomic_group_control_file') + control = (self._planner_rpc.run('get_atomic_group_control_file') % + dict(server=self._server, label_name=self._label_name, + plan_id=self._plan_id)) info = self._afe_rest.execution_info.get().execution_info info['control_file'] = control @@ -82,15 +84,10 @@ entries = self._afe_rest.queue_entries_request.get( hosts=hosts).queue_entries - keyvals = {'server': self._server, - 'label_name': self._label_name, - 'plan_id': self._plan_id} - job_req = {'name' : name, 'owner': self._owner, 'execution_info' : info, - 'queue_entries' : entries, - 'keyvals' : keyvals} + 'queue_entries' : entries} try: self._afe_rest.jobs.post(job_req) --- autotest/frontend/planner/set_atomic_group_control.srv 2010-05-04 14:47:18.000000000 -0700 +++ autotest/frontend/planner/set_atomic_group_control.srv 2010-05-04 14:47:18.000000000 -0700 @@ -1,15 +1,11 @@ -from autotest_lib.client.common_lib import utils from autotest_lib.frontend.shared import rest_client from autotest_lib.server import frontend -keyvals = utils.read_keyval(job.resultdir) - planner_rpc = frontend.Planner() -afe_rest = rest_client.Resource.load( - 'http://%s/afe/server/resources' % keyvals['server']) +afe_rest = rest_client.Resource.load('http://%(server)s/afe/server/resources') -label = afe_rest.labels.get(name=keyvals['label_name']).members[0].get() +label = afe_rest.labels.get(name='%(label_name)s').members[0].get() def run(machine): hostname = hosts.create_host(machine).hostname @@ -18,4 +14,4 @@ job.parallel_simple(run, machines) -planner_rpc.run('modify_plan', id=keyvals['plan_id'], initialized=True) +planner_rpc.run('modify_plan', id=%(plan_id)d, initialized=True) _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
