commit 3f17e3d5880b0b8cd328b08b0e793783264e125a
author Caroline Tice <cmtice@google.com> Thu Apr 13 13:46:10 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Thu Apr 13 15:37:06 2017 -0700
tree 9131fa807c57cd281812235856bedadddc5a1397
parent 9a47f6ba1f3f0acefec53ea6dbdd66120b10f4c6

[toolchain-utils] Workaround for new bug in cbuildbot.

There's a regression/bug in the cbuildbot stuff that is causing
all of our cbuildbot jobs to be unable to find their build records,
which causes them to fail.  Adding the flag '--do-not-use-buildbucket'
is a workaround that temporarily fixes this problem.  This CL adds
that flag to all of our cbuildbot jobs.

BUG=chromium:711430
TEST=Launched cbuildbots with & without this flag; saw the problem without
the flag; with the flag the problme was gone.

Change-Id: I75219dad55e762ce2d5f0e3b6d885a8e91be014e
Reviewed-on: https://chromium-review.googlesource.com/477391
Commit-Ready: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Yunlian Jiang <yunlian@chromium.org>

cros_utils/buildbot_utils.py

diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py
index d140355..0001052 100644
--- a/cros_utils/buildbot_utils.py
+++ b/cros_utils/buildbot_utils.py
@@ -236,11 +236,10 @@
   command_prefix = ''
   if not patch_arg:
     command_prefix = 'yes | '
-  command = ('%s ./cbuildbot --remote --nochromesdk %s'
-             ' --remote-description=%s %s %s %s' % (command_prefix,
-                                                    optional_flags, description,
-                                                    toolchain_flags, patch_arg,
-                                                    build))
+  command = ('%s ./cbuildbot --remote --nochromesdk --do-not-use-buildbucket %s'
+             ' --remote-description=%s %s %s %s' %
+             (command_prefix, optional_flags, description, toolchain_flags,
+              patch_arg, build))
   _, out, _ = ce.RunCommandWOutput(command)
   if 'Tryjob submitted!' not in out:
     logger.GetLogger().LogFatal('Error occurred while launching trybot job: '
@@ -269,8 +268,8 @@
     build_info = GetBuildInfo(base_dir, build)
     if not build_info:
       if pending_time > TIME_OUT:
-        logger.GetLogger().LogFatal('Unable to get build logs for target %s.' %
-                                    build)
+        logger.GetLogger().LogFatal(
+            'Unable to get build logs for target %s.' % build)
       else:
         pending_message = 'Unable to find build log; job may be pending.'
         done = False
@@ -317,8 +316,8 @@
                                      (pending_time / 60))
         pending_time += SLEEP_TIME
       else:
-        logger.GetLogger().LogOutput('{0} minutes passed.'.format(running_time /
-                                                                  60))
+        logger.GetLogger().LogOutput(
+            '{0} minutes passed.'.format(running_time / 60))
         logger.GetLogger().LogOutput('Sleeping {0} seconds.'.format(SLEEP_TIME))
         running_time += SLEEP_TIME
 
@@ -340,8 +339,8 @@
       trybot_image = FindArchiveImage(chromeos_root, build, build_id)
   if not trybot_image:
     logger.GetLogger().LogError('Trybot job %s failed with status %d;'
-                                ' no trybot image generated.' %
-                                (description, build_status))
+                                ' no trybot image generated.' % (description,
+                                                                 build_status))
 
   logger.GetLogger().LogOutput("trybot_image is '%s'" % trybot_image)
   logger.GetLogger().LogOutput('build_status is %d' % build_status)
@@ -375,8 +374,8 @@
   while elapsed_time < TIME_OUT:
     if DoesImageExist(chromeos_root, build):
       return
-    logger.GetLogger().LogOutput('Image %s not ready, waiting for 10 minutes' %
-                                 build)
+    logger.GetLogger().LogOutput(
+        'Image %s not ready, waiting for 10 minutes' % build)
     time.sleep(SLEEP_TIME)
     elapsed_time += SLEEP_TIME