commit a50bf49a7dbd98d0d65eae5a3eab8c9c3e2d2610
author Don Garrett <dgarrett@google.com> Thu Sep 28 18:33:02 2017 -0700
committer Don Garrett <dgarrett@chromium.org> Fri Sep 29 20:06:14 2017 +0000
tree 166ca1f8cb3ac5458b944d2eac442114a0e87c3f
parent 05550482e55716a1c86ae57ef07d71a594e7a7e6

cbuildbot_launch: Insert pinned depot_tools into path.

Before invoking cbuildbot, insert the depot_tools instance checked out
from the manifest pin into the path. This means that cbuildbot will
always use the same version of depot_tools, both inside and outside of
the chroot.

depot_tools versions before this CL:
  cbuildbot_launch (TOT) gets the recipe version (TOT).
  cbuildbot (top of branch) gets the recipe version (TOT) outside the
    chroot, and the manifest pinned version (branch) inside.

depot_tools versions after this CL:
  cbuildbot_launch (TOT) gets the recipe version (TOT).
  cbuildbot (top of branch) gets the same manifest version (branched)
    both inside and outside the chroot.

BUG=chromium:769828
TEST=run_tests
     cros tryjob --local lumpy-compile-only-pre-cq

Change-Id: I566f08af684c3b8c3805bb2ef80ccb8939fc8611
Reviewed-on: https://chromium-review.googlesource.com/691437
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Trybot-Ready: Don Garrett <dgarrett@chromium.org>

scripts/cbuildbot_launch_unittest.py

diff --git a/scripts/cbuildbot_launch_unittest.py b/scripts/cbuildbot_launch_unittest.py
index 60548c5..612a707 100644
--- a/scripts/cbuildbot_launch_unittest.py
+++ b/scripts/cbuildbot_launch_unittest.py
@@ -103,10 +103,11 @@
         cros_build_lib, 'GetTargetChromiteApiVersion', autospec=True,
         return_value=version)
 
-    cbuildbot_launch.RunCbuildbot('/cbuildbot_buildroot', args)
+    cbuildbot_launch.RunCbuildbot('/cbuildbot_buildroot', '/depot_tools', args)
 
     self.assertCommandCalled(
-        expected_cmd, cwd='/cbuildbot_buildroot', error_code_ok=True)
+        expected_cmd, extra_env={'PATH': mock.ANY},
+        cwd='/cbuildbot_buildroot', error_code_ok=True)
 
   def testRunCbuildbotSimple(self):
     """Ensure we invoke cbuildbot correctly."""
@@ -175,6 +176,7 @@
             '-r', '/root/repository',
             '--ts-mon-task-num', '1',
         ],
+        extra_env={'PATH': mock.ANY},
         cwd='/root/repository',
         error_code_ok=True)
 
@@ -231,6 +233,7 @@
             '--remote-trybot',
             '--ts-mon-task-num', '1',
         ],
+        extra_env={'PATH': mock.ANY},
         cwd='/root/repository',
         error_code_ok=True)