commit a8705842adfb7b02ee664322b1c00263270771a8
author Alex Miller <milleral@chromium.org> Fri Nov 08 14:29:32 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Nov 14 22:35:21 2013 +0000
tree c46f97882b3b4fac21b396ade5d09ae380063d3a
parent f63b5bcc2a36f1c00e1298aa9ebb09dd2f46e49c

[autotest] Don't re-resolve a devserver in AU suites.

If you do, you can get a different devserver.

TEST=None
BUG=chromium:265116

Change-Id: Iad7408d588293a66c1ac0173d5d921a5bbb9eff7
Reviewed-on: https://chromium-review.googlesource.com/176901
Reviewed-by: Alex Miller <milleral@chromium.org>
Commit-Queue: Alex Miller <milleral@chromium.org>
Tested-by: Alex Miller <milleral@chromium.org>

test_suites/control.au

diff --git a/test_suites/control.au b/test_suites/control.au
index b989ae2..9084f16 100644
--- a/test_suites/control.au
+++ b/test_suites/control.au
@@ -35,7 +35,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['au_suite'])
 
 # Values specified in this bug template will override default values when

test_suites/control.paygen_au_beta

diff --git a/test_suites/control.paygen_au_beta b/test_suites/control.paygen_au_beta
index d2d6f75..4a39f88 100644
--- a/test_suites/control.paygen_au_beta
+++ b/test_suites/control.paygen_au_beta
@@ -39,7 +39,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['paygen_au_beta_suite'])
 
 # TODO(sosa): Really should skip_reimage but suite logic does not currently

test_suites/control.paygen_au_canary

diff --git a/test_suites/control.paygen_au_canary b/test_suites/control.paygen_au_canary
index 81187fb..b95bf7a 100644
--- a/test_suites/control.paygen_au_canary
+++ b/test_suites/control.paygen_au_canary
@@ -39,7 +39,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['paygen_au_canary_suite'])
 
 # TODO(sosa): Really should skip_reimage but suite logic does not currently

test_suites/control.paygen_au_dev

diff --git a/test_suites/control.paygen_au_dev b/test_suites/control.paygen_au_dev
index 2f966dd..fd2241d 100644
--- a/test_suites/control.paygen_au_dev
+++ b/test_suites/control.paygen_au_dev
@@ -39,7 +39,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['paygen_au_dev_suite'])
 
 # TODO(sosa): Really should skip_reimage but suite logic does not currently

test_suites/control.paygen_au_stable

diff --git a/test_suites/control.paygen_au_stable b/test_suites/control.paygen_au_stable
index b2a33a9..add7d83 100644
--- a/test_suites/control.paygen_au_stable
+++ b/test_suites/control.paygen_au_stable
@@ -39,7 +39,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 # Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer.resolve(build)
+ds = dev_server.ImageServer(devserver_url)
 ds.stage_artifacts(build, artifacts=['paygen_au_stable_suite'])
 
 # TODO(sosa): Really should skip_reimage but suite logic does not currently