Merge branch 'aosp/mirror-chromium-master' into update_utils am: 4307f4735e am: 18caef1edd am: 6c551e0d52 am: ddfea1f7e7android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-dev

am: f1a93c225b

Change-Id: I60d258ddb8fd0bf9632f1f70c5cdeb3078938059

1 files changed, 10 insertions, 29 deletions

diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py
index 5bef28a4..06707be9 100755
--- a/buildbot_test_toolchains.py
+++ b/buildbot_test_toolchains.py
@@ -28,14 +28,8 @@ from cros_utils import logger
 
 from cros_utils import buildbot_utils
 
-# CL that updated GCC ebuilds to use 'next_gcc'.
-USE_NEXT_GCC_PATCH = '230260'
-
-# CL that uses LLVM to build the peppy image.
-USE_LLVM_PATCH = '295217'
-
 # CL that uses LLVM-Next to build the images (includes chrome).
-USE_LLVM_NEXT_PATCH = '424123'
+USE_LLVM_NEXT_PATCH = '513590'
 
 CROSTC_ROOT = '/usr/local/google/crostc'
 ROLE_ACCOUNT = 'mobiletc-prebuild'
@@ -78,7 +72,7 @@ class ToolchainComparator(object):
     self._ce = command_executer.GetCommandExecuter()
     self._l = logger.GetLogger()
     self._build = '%s-release' % board
-    self._patches = patches.split(',')
+    self._patches = patches.split(',') if patches else []
     self._patches_string = '_'.join(str(p) for p in self._patches)
     self._noschedv2 = noschedv2
 
@@ -105,9 +99,7 @@ class ToolchainComparator(object):
     mo = re.search(TRYBOT_IMAGE_RE, trybot_image)
     assert mo
     dirname = IMAGE_DIR.replace('\\', '').format(**mo.groupdict())
-    version = buildbot_utils.GetGSContent(self._chromeos_root,
-                                          dirname + '/LATEST-master')
-    return dirname + '/' + version
+    return buildbot_utils.GetLatestImage(self._chromeos_root, dirname)
 
   def _GetNonAFDOImageName(self, trybot_image):
     """Given a trybot artifact name, get corresponding non-AFDO image name.
@@ -158,13 +150,10 @@ class ToolchainComparator(object):
     experiment_file_dir = os.path.join(self._chromeos_root, '..', self._weekday)
     experiment_file_name = '%s_toolchain_experiment.txt' % self._board
 
-    compiler_string = 'gcc'
+    compiler_string = 'llvm'
     if USE_LLVM_NEXT_PATCH in self._patches_string:
       experiment_file_name = '%s_llvm_next_experiment.txt' % self._board
       compiler_string = 'llvm_next'
-    elif USE_LLVM_PATCH in self._patches_string:
-      experiment_file_name = '%s_llvm_experiment.txt' % self._board
-      compiler_string = 'llvm'
 
     experiment_file = os.path.join(experiment_file_dir, experiment_file_name)
     experiment_header = """
@@ -175,12 +164,12 @@ class ToolchainComparator(object):
     experiment_tests = """
     benchmark: all_toolchain_perf {
       suite: telemetry_Crosperf
-      iterations: 3
+      iterations: 0
     }
 
     benchmark: page_cycler_v2.typical_25 {
       suite: telemetry_Crosperf
-      iterations: 2
+      iterations: 0
       run_local: False
       retries: 0
     }
@@ -195,7 +184,7 @@ class ToolchainComparator(object):
           vanilla_image {
             chromeos_root: %s
             build: %s
-            compiler: gcc
+            compiler: llvm
           }
           """ % (self._chromeos_root, vanilla_image)
       f.write(official_image)
@@ -206,14 +195,12 @@ class ToolchainComparator(object):
           nonafdo_image {
             chromeos_root: %s
             build: %s
-            compiler: gcc
+            compiler: llvm
           }
           """ % (self._chromeos_root, nonafdo_image)
         f.write(official_nonafdo_image)
 
       label_string = '%s_trybot_image' % compiler_string
-      if USE_NEXT_GCC_PATCH in self._patches:
-        label_string = 'gcc_next_trybot_image'
 
       # Reuse autotest files from vanilla image for trybot images
       autotest_files = os.path.join('/tmp', vanilla_image, 'autotest_files')
@@ -251,11 +238,9 @@ class ToolchainComparator(object):
     filename = os.path.join(self._reports_dir, 'msg_body.html')
     if (os.path.exists(filename) and
         os.path.exists(os.path.expanduser(MAIL_PROGRAM))):
-      email_title = 'buildbot test results'
+      email_title = 'buildbot llvm test results'
       if USE_LLVM_NEXT_PATCH in self._patches_string:
         email_title = 'buildbot llvm_next test results'
-      elif USE_LLVM_PATCH in self._patches_string:
-        email_title = 'buildbot llvm test results'
       command = ('cat %s | %s -s "%s, %s" -team -html' %
                  (filename, MAIL_PROGRAM, email_title, self._board))
       self._ce.RunCommand(command)
@@ -341,13 +326,9 @@ def Main(argv):
   if not options.chromeos_root:
     print('Please specify the ChromeOS root directory.')
     return 1
-  if options.patches:
-    patches = options.patches
-  else:
-    patches = USE_NEXT_GCC_PATCH
 
   fc = ToolchainComparator(options.board, options.remote, options.chromeos_root,
-                           options.weekday, patches, options.noschedv2)
+                           options.weekday, options.patches, options.noschedv2)
   return fc.DoAll()