Update toolchain buildbot test scripts for llvm profile removal.

llvm profile is no longer required. Update buildbot test scripts
accordingly.

BUG=chromium:699594
TEST=Verified by launching dummy jobs on chrotomation2.

Change-Id: Ife411414aedd427268b5c29310fa2b15457feb52
Reviewed-on: https://chromium-review.googlesource.com/451719
Commit-Ready: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Yunlian Jiang <yunlian@chromium.org>

2 files changed, 19 insertions, 41 deletions

diff --git a/buildbot_test_llvm.py b/buildbot_test_llvm.py
index a43db752..94a7e68c 100755
--- a/buildbot_test_llvm.py
+++ b/buildbot_test_llvm.py
@@ -23,9 +23,6 @@ from cros_utils import logger
 
 from cros_utils import buildbot_utils
 
-# CL that uses LLVM to build the peppy image.
-USE_LLVM_PATCH = '295217'
-
 CROSTC_ROOT = '/usr/local/google/crostc'
 ROLE_ACCOUNT = 'mobiletc-prebuild'
 TOOLCHAIN_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -34,18 +31,18 @@ VALIDATION_RESULT_DIR = os.path.join(CROSTC_ROOT, 'validation_result')
 START_DATE = datetime.date(2016, 1, 1)
 TEST_PER_DAY = 2
 TEST_BOARD = [
-    'squawks',      # x86_64, rambi  (baytrail)
-    'terra',        # x86_64, strago (braswell)
-    'lulu',         # x86_64, auron  (broadwell)
-    'peach_pit',    # arm,    peach  (exynos-5420)
-    'peppy',        # x86_64, slippy (haswell celeron)
-    'link',         # x86_64, ivybridge (ivybridge)
-    'nyan_big',     # arm,    nyan   (tegra)
-    'sentry',       # x86_64, kunimitsu (skylake-u)
-    'chell',        # x86_64, glados (skylake-y)
-    'daisy',        # arm,    daisy  (exynos)
-    'caroline',     # amd64
-    'kevin',        # arm,    gru  (Rockchip)
+    'squawks',  # x86_64, rambi  (baytrail)
+    'terra',  # x86_64, strago (braswell)
+    'lulu',  # x86_64, auron  (broadwell)
+    'peach_pit',  # arm,    peach  (exynos-5420)
+    'peppy',  # x86_64, slippy (haswell celeron)
+    'link',  # x86_64, ivybridge (ivybridge)
+    'nyan_big',  # arm,    nyan   (tegra)
+    'sentry',  # x86_64, kunimitsu (skylake-u)
+    'chell',  # x86_64, glados (skylake-y)
+    'daisy',  # arm,    daisy  (exynos)
+    'caroline',  # amd64
+    'kevin',  # arm,    gru  (Rockchip)
 ]
 
 
@@ -99,6 +96,7 @@ class ToolchainVerifier(object):
 
     return 0
 
+
 def Main(argv):
   """The main function."""
 
@@ -136,13 +134,10 @@ def Main(argv):
   if not options.compiler:
     print('Please specify which compiler to test (gcc, llvm, or llvm-next).')
     return 1
-  patches = options.patches
-  if not patches and options.compiler == 'llvm':
-    patches = USE_LLVM_PATCH
 
   if options.board:
     fv = ToolchainVerifier(options.board, options.chromeos_root,
-                           options.weekday, patches, options.compiler)
+                           options.weekday, options.patches, options.compiler)
     return fv.Doall()
 
   today = datetime.date.today()
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py
index 028d7f1a..afb704c6 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 = '419149'
 
 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
 
@@ -158,13 +152,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 = """
@@ -212,8 +203,6 @@ class ToolchainComparator(object):
         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 +240,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 +328,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()