Fix the drone results dir computation. I forgot that the results don't just go under the drone_installation_directory, they go under "results" in there.
Signed-off-by: Steve Howard <showard@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3854 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/scheduler/drone_manager.py b/scheduler/drone_manager.py
index ec1fccc..93753fd 100644
--- a/scheduler/drone_manager.py
+++ b/scheduler/drone_manager.py
@@ -5,6 +5,10 @@
from autotest_lib.scheduler import scheduler_config
+# results on drones will be placed under the drone_installation_directory in a
+# directory with this name
+_DRONE_RESULTS_DIR_SUFFIX = 'results'
+
WORKING_DIRECTORY = object() # see execute_command()
@@ -523,7 +527,8 @@
if on_results_repository:
base_dir = self._results_dir
else:
- base_dir = drones.AUTOTEST_INSTALL_DIR
+ base_dir = os.path.join(drones.AUTOTEST_INSTALL_DIR,
+ _DRONE_RESULTS_DIR_SUFFIX)
return os.path.join(base_dir, path)