commit db7cb5e5c24ed2847d61a25d1fbc516620ac3a32
author Chun-ta Lin <itspeter@chromium.org> Tue Apr 04 04:54:45 2017 +0000
committer Chun-ta Lin <itspeter@chromium.org> Tue Apr 04 05:01:30 2017 +0000
tree 252f99f9e42f6202538fa5bb65854cdd5c33c7c2
parent fee287427456fba157a9d56fec9acb60898e4e8e

Revert "cbuildbot: Use buildbucket for remote tryjobs by default."

This reverts commit fee287427456fba157a9d56fec9acb60898e4e8e.

Reason for revert: Break pre-cq-launcher #8925

Original change's description:
> cbuildbot: Use buildbucket for remote tryjobs by default.
> 
> Remove --use-buildbucket option, and replace it with
> --do-not-use-buildbucket option.
> 
> We want to use bucketbucket to schedule all tryjobs by default. We
> haven't been able to find out for certain if there is anyone who needs
> buildbucket permissions for this that doesn't already have them,
> so.... let's find out!
> 
> A PSA has been sent out asking for feedback from anyone required to
> use --do-not-use-buildbucket to run a tryjob.
> 
> This CL was submitted as CL:462518, and reverted as CL:464309.
> 
> BUG=chromium:671848
> TEST=run_tests
> 
> Change-Id: I92f9137aa7cd4807a2b9006f357bf2189c2c0767
> Reviewed-on: https://chromium-review.googlesource.com/465488
> Commit-Ready: Don Garrett <dgarrett@chromium.org>
> Tested-by: Don Garrett <dgarrett@chromium.org>
> Reviewed-by: Ningning Xia <nxia@chromium.org>
> 

TBR=dgarrett@chromium.org,nxia@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:671848

Change-Id: Ib690af4dc6efabdf4c2445657f3e0c31a9f9ff79
Reviewed-on: https://chromium-review.googlesource.com/467026
Reviewed-by: Chun-ta Lin <itspeter@chromium.org>
Commit-Queue: Chun-ta Lin <itspeter@chromium.org>
Tested-by: Chun-ta Lin <itspeter@chromium.org>
Trybot-Ready: Chun-ta Lin <itspeter@chromium.org>

cbuildbot/stages/sync_stages.py

diff --git a/cbuildbot/stages/sync_stages.py b/cbuildbot/stages/sync_stages.py
index 5e41b0b..2c68f06 100644
--- a/cbuildbot/stages/sync_stages.py
+++ b/cbuildbot/stages/sync_stages.py
@@ -1393,7 +1393,12 @@
       cmd += ['-g', cros_patch.AddPrefix(patch, patch.gerrit_number)]
       self._PrintPatchStatus(patch, 'testing')
 
+    use_buildbucket = False
     config_buildbucket_id_map = {}
+    if buildbucket_lib.GetServiceAccount(constants.CHROMEOS_SERVICE_ACCOUNT):
+      # use buildbucket to launch trybots.
+      cmd += ['--use-buildbucket']
+      use_buildbucket = True
 
     if self._run.options.debug:
       logging.debug('Would have launched tryjob with %s', cmd)
@@ -1402,8 +1407,9 @@
           cmd, cwd=self._build_root, capture_output=True)
       if result and result.output:
         logging.info('cbuildbot output: %s' % result.output)
-        config_buildbucket_id_map = self.GetConfigBuildbucketIdMap(
-            result.output)
+        if use_buildbucket:
+          config_buildbucket_id_map = self.GetConfigBuildbucketIdMap(
+              result.output)
 
     actions = []
     build_id, db = self._run.GetCIDBHandle()

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index c1b863a..9b11aa3 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -479,8 +479,7 @@
       parser,
       'Remote Trybot Options (--remote)')
 
-  group.add_option('--do-not-use-buildbucket', action='store_false',
-                   dest='use_buildbucket', default=True,
+  group.add_option('--use-buildbucket', action='store_true', default=False,
                    help='Use buildbucket instead of git to request'
                         'the tryjob(s).')