Revert "Use dev_server to determine the url of the devserver."
Started seeing this on the autotest server:
Traceback (most recent call last):
File "/usr/local/autotest/server/server_job.py", line 539, in run
self._execute_code(server_control_file, namespace)
File "/usr/local/autotest/server/server_job.py", line 1022, in _execute_code
execfile(code_file, namespace, namespace)
File "/usr/local/autotest/results/426888-chromeos-test/chromeos-rack8c-host2/
control.srv", line 31, in <module>
repo_url = dynamic_suite._package_url_pattern() % image_name
This reverts commit dfe7042a31f726cd637530cfc28ecaaec08256ba.
Change-Id: Icf560ac11f7f5567b7dbe4e32a13584ccdda06c7
Reviewed-on: https://gerrit.chromium.org/gerrit/28724
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
diff --git a/server/cros/dynamic_suite.py b/server/cros/dynamic_suite.py
index 86e935d..fa4a7fa 100644
--- a/server/cros/dynamic_suite.py
+++ b/server/cros/dynamic_suite.py
@@ -277,6 +277,7 @@
debug=False)
manager = host_lock_manager.HostLockManager(afe=afe)
reimager = Reimager(job.autodir, afe, tko, results_dir=job.resultdir)
+
try:
if skip_reimage or reimager.attempt(build, board, pool,
job.record_entry, check_hosts,
@@ -367,12 +368,6 @@
return CONFIG.get_config_value('CROS', 'package_url_pattern', type=str)
-def get_package_url(build):
- """Returns the package url for the given build."""
- devserver_url = dev_server.DevServer.devserver_url_for_build(build)
- return _package_url_pattern() % (devserver_url, build)
-
-
def skip_reimage(g):
return g.get('SKIP_IMAGE')
@@ -498,7 +493,7 @@
return job_status.gather_per_host_results(self._afe,
self._tko,
[canary_job],
- REIMAGE_JOB_NAME + '-')
+ REIMAGE_JOB_NAME+'-')
def _ensure_enough_hosts(self, board, pool, num):
@@ -606,10 +601,8 @@
@param num_machines: how many devices to reimage.
@return a frontend.Job object for the reimaging job we scheduled.
"""
- image_url = _image_url_pattern() % (
- dev_server.DevServer.devserver_url_for_build(build), build)
control_file = inject_vars(
- dict(image_url=image_url, image_name=build),
+ {'image_url': _image_url_pattern() % build, 'image_name': build},
self._cf_getter.get_control_file_contents_by_name('autoupdate'))
job_deps = []
if pool: