commit fceaba3af1a2dbb9e965320be39432b1b412e284
author Yunlian Jiang <yunlian@google.com> Wed Jun 06 09:08:44 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Thu Jun 07 08:36:12 2018 -0700
tree a5758aa75aa5a25294c84f239feea4cba6565c65
parent 907d4631d98ace2222eb1c3d1ccfcc06f0589d9b

Use internal chrome source tree for telemetry.

Now sync_chrome works for mobiletc-prebuild, there is no need to
have this workaround.

BUG=none
TEST=ebuild-caroline $(equery-caroline w chromeos-chrome) prepare
     works on mobiletc-prebuild account

Change-Id: I36ca9967b8b8fe5f79ca3b4dedc69271484d633f
Reviewed-on: https://chromium-review.googlesource.com/1089114
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>

buildbot_test_toolchains.py

diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py
index eb13793..e5674a2 100755
--- a/buildbot_test_toolchains.py
+++ b/buildbot_test_toolchains.py
@@ -175,17 +175,7 @@
       f.write(experiment_tests)
 
       # Now add vanilla to test file.
-      if os.getlogin() == ROLE_ACCOUNT:
-        official_image = """
-          vanilla_image {
-            chromeos_root: %s
-            build: %s
-            compiler: llvm
-            chrome_src: /usr/local/google/crostc/chrome-src-internal
-          }
-          """ % (self._chromeos_root, vanilla_image)
-      else:
-        official_image = """
+      official_image = """
           vanilla_image {
             chromeos_root: %s
             build: %s
@@ -196,17 +186,7 @@
 
       # Now add non-AFDO image to test file.
       if nonafdo_image:
-        if os.getlogin() == ROLE_ACCOUNT:
-          official_nonafdo_image = """
-          nonafdo_image {
-            chromeos_root: %s
-            build: %s
-            compiler: llvm
-            chrome_src: /usr/local/google/crostc/chrome-src-internal
-          }
-          """ % (self._chromeos_root, nonafdo_image)
-        else:
-          official_nonafdo_image = """
+        official_nonafdo_image = """
           nonafdo_image {
             chromeos_root: %s
             build: %s
@@ -219,19 +199,7 @@
 
       # Reuse autotest files from vanilla image for trybot images
       autotest_files = os.path.join('/tmp', vanilla_image, 'autotest_files')
-      if os.getlogin() == ROLE_ACCOUNT:
-        experiment_image = """
-          %s {
-            chromeos_root: %s
-            build: %s
-            autotest_path: %s
-            compiler: %s
-            chrome_src: /usr/local/google/crostc/chrome-src-internal
-          }
-          """ % (label_string, self._chromeos_root, trybot_image,
-                 autotest_files, compiler_string)
-      else:
-        experiment_image = """
+      experiment_image = """
           %s {
             chromeos_root: %s
             build: %s