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, 19 insertions, 21 deletions

diff --git a/buildbot_test_llvm.py b/buildbot_test_llvm.py
index a43db752..5d686891 100755
--- a/buildbot_test_llvm.py
+++ b/buildbot_test_llvm.py
@@ -23,29 +23,29 @@ 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__))
 MAIL_PROGRAM = '~/var/bin/mail-sheriff'
 VALIDATION_RESULT_DIR = os.path.join(CROSTC_ROOT, 'validation_result')
 START_DATE = datetime.date(2016, 1, 1)
-TEST_PER_DAY = 2
+TEST_PER_DAY = 3
 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',  # x86_64, glados (skylake-y)
+    'kevin',  # arm,    gru  (Rockchip)
+    'reef',  # x86_64, reef  (Apollo Lake)
+    'lakitu',
+    'whirlwind',
 ]
 
 
@@ -99,6 +99,7 @@ class ToolchainVerifier(object):
 
     return 0
 
+
 def Main(argv):
   """The main function."""
 
@@ -136,13 +137,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()
@@ -154,7 +152,7 @@ def Main(argv):
     try:
       board = TEST_BOARD[(start_board + i) % len(TEST_BOARD)]
       fv = ToolchainVerifier(board, options.chromeos_root, options.weekday,
-                             patches, options.compiler)
+                             options.patches, options.compiler)
       fv.DoAll()
     except SystemExit:
       logfile = os.path.join(VALIDATION_RESULT_DIR, options.compiler, board)