Revert^4 "Remove BOTO_CONFIG to use the swarming tasks service account instead of" This reverts commit d3983fb3caec7db8d342bcc558ac33b84096c17a. Reason for revert: Try removing this again Original change's description: > Revert^3 "Remove BOTO_CONFIG to use the swarming tasks service account instead of" > > This reverts commit 27f3b939347e4b367a6ab2aab71e78312231dfc7. > > Reason for revert: Still not working > > Original change's description: > > Revert^2 "Remove BOTO_CONFIG to use the swarming tasks service account instead of" > > > > This reverts commit 0d2306dfb51e596840725bc22674f938aa29aeb4. > > > > Reason for revert: Try again with new permissions > > > > Original change's description: > > > Revert "Remove BOTO_CONFIG to use the swarming tasks service account instead of" > > > > > > This reverts commit c397c94283b79a792a76812cd43a6ac5d5282ddf. > > > > > > Reason for revert: https://b.corp.google.com/issues/306465816#comment11 > > > > > > Original change's description: > > > > Remove BOTO_CONFIG to use the swarming tasks service account instead of > > > > .boto > > > > > > > > Bug: b/306465816 > > > > Change-Id: Iefa84ee3e22703218f2f6cf31bf18b9f5c41b553 > > > > Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/778304 > > > > Reviewed-by: Joe Gregorio <jcgregorio@google.com> > > > > Commit-Queue: Ravi Mistry <rmistry@google.com> > > > > > > Bug: b/306465816 > > > Change-Id: Ic5778d3fa5796d075cf4234ef3fe5fc95f170ddf > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/778836 > > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > Commit-Queue: Ravi Mistry <rmistry@google.com> > > > > Bug: b/306465816 > > Change-Id: I72a0bc27e99999b3415b0515a9924aa691c4cbd6 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/778876 > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > Auto-Submit: Ravi Mistry <rmistry@google.com> > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > Bug: b/306465816 > Change-Id: I631a57162cdb8b9a211726f4703ae08041181168 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/778916 > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Auto-Submit: Ravi Mistry <rmistry@google.com> Bug: b/306465816 Change-Id: I6241e352381b2ebd5a0542ec19723bea07f2ad8c Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/797396 Reviewed-by: Joe Gregorio <jcgregorio@google.com> Auto-Submit: Ravi Mistry <rmistry@google.com> Commit-Queue: Joe Gregorio <jcgregorio@google.com>
diff --git a/ct/go/util/util.go b/ct/go/util/util.go index 5c1220f..790951c 100644 --- a/ct/go/util/util.go +++ b/ct/go/util/util.go
@@ -808,11 +808,8 @@ // instances. pythonExec = BINARY_PYTHON } else if targetPlatform == PLATFORM_ANDROID { - env = append(env, "BOTO_CONFIG=/home/chrome-bot/.boto.puppet-bak") // Reset android logcat prior to the run so that we can examine the logs later. util.LogErr(ExecuteCmd(ctx, BINARY_ADB, []string{"logcat", "-c"}, []string{}, ADB_ROOT_TIMEOUT, nil, nil)) - } else if targetPlatform == PLATFORM_LINUX { - env = append(env, "BOTO_CONFIG=/home/chrome-bot/.boto.puppet-bak") } // Create buffer for capturing the stdout and stderr of the benchmark run.