mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bot: Always set up username on gce

Browse source 
Sligthly changes the logic. If we are on GCE, always use the authdaemon
and set up the git user info for the service account.

Outside of GCE just check if a cookie is available.

BUG=None
TEST=Faked out is_gce_instance and ran locally

Change-Id: Icf4c521b650b5d47f395a59695d1f1470621f661
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3585016
Reviewed-by: Anton Romanov <romanton@google.com>
Tested-by: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
Dennis Kempin 2022-04-15 12:41:19 -07:00
parent fe433eb18f
commit 77569908de
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/chromeos/merge_bot
View file

@ -175,19 +175,19 @@ def setup_tracking_branch(branch_name: str, tracking: str):
def gerrit_prerequisites():
"Make sure we can upload to gerrit."
# Make sure we have http cookies to access gerrit
cookie_file = git("config http.cookiefile").stdout(check=False)
if not cookie_file:
if is_gce_instance():
# Grab http cookies for accessing GOB. See go/gob-gce
gcompute_path = f"{os.environ['KOKORO_ARTIFACTS_DIR']}/gcompute-tools"
git("clone", "https://gerrit.googlesource.com/gcompute-tools", gcompute_path).fg()
cmd(f"{gcompute_path}/git-cookie-authdaemon", "--no-fork").fg()
if is_gce_instance():
# Grab http cookies for accessing GOB. See go/gob-gce
gcompute_path = f"{os.environ['KOKORO_ARTIFACTS_DIR']}/gcompute-tools"
git("clone", "https://gerrit.googlesource.com/gcompute-tools", gcompute_path).fg()
cmd(f"{gcompute_path}/git-cookie-authdaemon", "--no-fork").fg()
# Setup correct user info for the GCE service account.
git("config user.name", quoted("Crosvm Bot"))
git("config user.email", quoted("crosvm-bot@crosvm-packages.iam.gserviceaccount.com"))
else:
# Setup correct user info for the GCE service account.
git("config user.name", quoted("Crosvm Bot")).fg()
git("config user.email", quoted("crosvm-bot@crosvm-packages.iam.gserviceaccount.com")).fg()
else:
# Make sure we have http cookies to access gerrit
cookie_file = git("config http.cookiefile").stdout(check=False)
if not cookie_file:
print("Cannot access gerrit without http cookies.")
print(f"Install one via: {GERRIT_URL}/new-password")
sys.exit(1)