[autotest] Drop RPC support for specifying a test kernel.
Our legacy Autotest code included support for specifying a specific
kernel to be tested when creating a job. That support wasn't
appropriate for Chrome OS, and didn't work.
All existing user level interfaces for specifying a kernel (CLI and
AFE) have been changed to drop this feature. This change removes
support for the feature in the RPC calls. Lower-level layers still
contain support that is unused, which will be removed in subsequent
CLs.
BUG=chromium:266704
TEST=Look at control file from AFE job creation page; run atest job create
Change-Id: Ifb0c6888f550f6cda98195b489ba8076cdf47e6b
Reviewed-on: https://chromium-review.googlesource.com/346570
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@google.com>
diff --git a/frontend/afe/rpc_interface.py b/frontend/afe/rpc_interface.py
index 116a327..d5de365 100644
--- a/frontend/afe/rpc_interface.py
+++ b/frontend/afe/rpc_interface.py
@@ -748,17 +748,14 @@
# jobs
-def generate_control_file(tests=(), kernel=None, label=None, profilers=(),
+def generate_control_file(tests=(), profilers=(),
client_control_file='', use_container=False,
- profile_only=None, upload_kernel_config=False,
- db_tests=True, test_source_build=None):
+ profile_only=None, db_tests=True,
+ test_source_build=None):
"""
- Generates a client-side control file to load a kernel and run tests.
+ Generates a client-side control file to run tests.
@param tests List of tests to run. See db_tests for more information.
- @param kernel A list of kernel info dictionaries configuring which kernels
- to boot for this job and other options for them
- @param label Name of label to grab kernel config from.
@param profilers List of profilers to activate during the job.
@param client_control_file The contents of a client-side control file to
run at the end of all tests. If this is supplied, all tests must be
@@ -772,10 +769,6 @@
@param profile_only A boolean that indicates what default profile_only
mode to use in the control file. Passing None will generate a
control file that does not explcitly set the default mode at all.
- @param upload_kernel_config: if enabled it will generate server control
- file code that uploads the kernel config file to the client and
- tells the client of the new (local) path when compiling the kernel;
- the tests must be server side tests
@param db_tests: if True, the test object can be found in the database
backing the test model. In this case, tests is a tuple
of test IDs which are used to retrieve the test objects
@@ -795,14 +788,13 @@
return dict(control_file='', is_server=False, synch_count=1,
dependencies=[])
- cf_info, test_objects, profiler_objects, label = (
- rpc_utils.prepare_generate_control_file(tests, kernel, label,
- profilers, db_tests))
+ cf_info, test_objects, profiler_objects = (
+ rpc_utils.prepare_generate_control_file(tests, profilers,
+ db_tests))
cf_info['control_file'] = control_file.generate_control(
- tests=test_objects, kernels=kernel, platform=label,
- profilers=profiler_objects, is_server=cf_info['is_server'],
+ tests=test_objects, profilers=profiler_objects,
+ is_server=cf_info['is_server'],
client_control_file=client_control_file, profile_only=profile_only,
- upload_kernel_config=upload_kernel_config,
test_source_build=test_source_build)
return cf_info