[autotest] Change image_name -> build in BVT2 stuff
We've settled on referring to 'x86-mario-release/R18-long-version-stuff' as the
'build' we're testing.  Change var names to reflect this.

BUG=None
TEST=./server/autoserv test_suites/dev_harness

Change-Id: I595d24af6ff6f855ba49b781411a3452ece1df42
Reviewed-on: https://gerrit.chromium.org/gerrit/15022
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Chris Masone <cmasone@chromium.org>
diff --git a/test_suites/control.bvt b/test_suites/control.bvt
index abe47e6..c88b31c 100755
--- a/test_suites/control.bvt
+++ b/test_suites/control.bvt
@@ -17,8 +17,8 @@
 that validate critical functionality -- ability to acquire connectivity, perform
 crash reporting, get updates, and allow a user to log in, among other things.
 
-@param image_name: The name of the image to test.
-                     Ex: x86-mario-r17/R17-1412.33.0-a1-b29
+@param build: The name of the image to test.
+              Ex: x86-mario-r17/R17-1412.33.0-a1-b29
 @param board: The board to test on.  Ex: netbook_MARIO_MP
 @param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
 """
@@ -30,6 +30,6 @@
 reimager = dynamic_suite.Reimager(job.autodir)
 
 if (reimager.skip(globals()) or
-    reimager.attempt(image_name, 4, board, job.record)):
+    reimager.attempt(build, 4, board, job.record)):
     bvt = dynamic_suite.Suite.create_from_name(suite_tag, job.autodir)
-    bvt.run_and_wait(image_name, job.record, add_experimental=True)
+    bvt.run_and_wait(build, job.record, add_experimental=True)