[autotest] Remove support for `autoserv --image`.
This removes code associated with the `autoserv --image` option.
Previously, the option was used for installing a selected version of
Chrome OS on a DUT prior to testing. The feature has long since
been supplanted by provision_AutoUpdate.
BUG=None
TEST=sanity suite on a local autotest instance
Change-Id: Ie9261b7cc80fb2b81c4521731c5324444c6b8073
Reviewed-on: https://chromium-review.googlesource.com/988751
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
diff --git a/server/autoserv b/server/autoserv
index 54e3453..d9909c1 100755
--- a/server/autoserv
+++ b/server/autoserv
@@ -138,11 +138,8 @@
host_attributes=parser.options.host_attributes,
)
- # If test_source_build is not specified, default to use server-side test
- # code from build specified in --image.
namespace = {'machines': machines_list,
- 'image': (parser.options.test_source_build or
- parser.options.image),}
+ 'image': parser.options.test_source_build}
script_locals = {}
execfile(STAGE_SERVER_SIDE_PACKAGE_CONTROL_FILE, namespace, script_locals)
return script_locals['ssp_url'], script_locals['error_msg']
@@ -462,8 +459,6 @@
user = parser.options.user
client = parser.options.client
server = parser.options.server
- install_before = parser.options.install_before
- install_after = parser.options.install_after
verify = parser.options.verify
repair = parser.options.repair
cleanup = parser.options.cleanup
@@ -609,8 +604,7 @@
f = {'in_container': utils.is_in_container(),
'success': False}
with metrics.SecondsTimer(metric_name, fields=f) as c:
- job.run(install_before, install_after,
- verify_job_repo_url=verify_job_repo_url,
+ job.run(verify_job_repo_url=verify_job_repo_url,
only_collect_crashinfo=collect_crashinfo,
skip_crash_collection=skip_crash_collection,
job_labels=job_labels,
@@ -758,12 +752,13 @@
logging.warn(
'Autoserv is required to run with server-side packaging. '
'However, no server-side package can be staged based on '
- '`--image`, host attribute job_repo_url or host OS version '
- 'label. It could be that the build to test is older than the '
- 'minimum version that supports server-side packaging, or no '
- 'devserver can be found to stage server-side package. The test '
- 'will be executed without using erver-side packaging. '
- 'Following is the detailed error:\n%s', ssp_error_msg)
+ '`--test_source_build`, host attribute job_repo_url or host '
+ 'OS version label. It could be that the build to test is '
+ 'older than the minimum version that supports server-side '
+ 'packaging, or no devserver can be found to stage server-side '
+ 'package. The test will be executed without using server-side '
+ 'packaging. Following is the detailed error:\n%s',
+ ssp_error_msg)
if results:
logging.info("Results placed in %s" % results)