commit d3e2c28c101f91934319a99b32e94bd0757a5c31
author Aviv Keshet <akeshet@chromium.org> Mon Mar 20 16:56:18 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Mar 22 04:23:19 2017 -0700
tree 5e95e7d9c9f0f5b5b8073a4713bf743de53c0b0e
parent 115431151aa16be79f1412c94da2452e6cdb884f

autotest: add a virtualenv_autoserv entry point that uses virtualenv

This CL creates a virtualenv entry point for autoserv, and some plumbing
to the command-line-generation functions, but does not enable it
anywhere.

BUG=chromium:703261
TEST=server/virtualenv_autoserv -> starts autoserv in virtualenv as
expected, and doesn't blow up

Change-Id: Ibcb09cb5d57c49c77f8772c2fb0f0b0fca344535
Reviewed-on: https://chromium-review.googlesource.com/457225
Commit-Ready: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Simran Basi <sbasi@chromium.org>

server/autoserv_utils.py

diff --git a/server/autoserv_utils.py b/server/autoserv_utils.py
index a0993e7..aca62ff 100644
--- a/server/autoserv_utils.py
+++ b/server/autoserv_utils.py
@@ -30,7 +30,8 @@
                              ssh_options=None,
                              use_packaging=True,
                              in_lab=False,
-                             host_attributes=None):
+                             host_attributes=None,
+                             use_virtualenv=False):
     """
     Construct an autoserv command from a job or host queue entry.
 
@@ -63,11 +64,17 @@
                    the database is available and can make database calls such
                    as looking up host attributes at runtime.
     @param host_attributes: Dict of host attributes to pass into autoserv.
+    @param use_virtualenv: Whether to run autoserv inside of virtualenv. In
+                           general this should be set to True in our production
+                           lab, and probably False in most other use cases
+                           (moblab, local testing) until we rollout virtualenv
+                           support everywhere. Default: False.
 
     @returns The autoserv command line as a list of executable + parameters.
 
     """
-    command = [os.path.join(autoserv_directory, 'autoserv')]
+    script_name = 'virtualenv_autoserv' if use_virtualenv else 'autoserv'
+    command = [os.path.join(autoserv_directory, script_name)]
 
     if write_pidfile:
         command.append('-p')
@@ -131,7 +138,7 @@
 
 
 def _autoserv_command_line(machines, extra_args, job=None, queue_entry=None,
-                           verbose=True, in_lab=False):
+                           verbose=True, in_lab=False, use_virtualenv=False):
     """
     @returns The autoserv command line as a list of executable + parameters.
 
@@ -146,6 +153,7 @@
                    environment. This information is useful as autoserv knows
                    the database is available and can make database calls such
                    as looking up host attributes at runtime.
+    @param use_virtualenv: See autoserv_run_job_command.
     """
     if drone_manager is None:
         raise ImportError('Unable to import drone_manager in autoserv_utils')
@@ -153,4 +161,4 @@
     return autoserv_run_job_command(autoserv_directory,
             machines, results_directory=drone_manager.WORKING_DIRECTORY,
             extra_args=extra_args, job=job, queue_entry=queue_entry,
-            verbose=verbose, in_lab=in_lab)
+            verbose=verbose, in_lab=in_lab, use_virtualenv=use_virtualenv)