Removing git retry logic
Removing all git retry logic from git module. Retry logic will
now be handled by the git wrapper within the builders.
BUG=chromium:825370
TEST=`./cbuildbot/run_tests` PASS
Change-Id: I592267bf6013acf56ca87d2719bd73a189496153
Reviewed-on: https://chromium-review.googlesource.com/1003273
Commit-Ready: Mike Nichols <mikenichols@chromium.org>
Tested-by: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
diff --git a/scripts/upload_prebuilts.py b/scripts/upload_prebuilts.py
index 32f73b5..d631324 100644
--- a/scripts/upload_prebuilts.py
+++ b/scripts/upload_prebuilts.py
@@ -145,13 +145,12 @@
return made_changes
-def RevGitFile(filename, data, retries=5, dryrun=False):
+def RevGitFile(filename, data, dryrun=False):
"""Update and push the git file.
Args:
filename: file to modify that is in a git repo already
data: A dict of key/values to update in |filename|
- retries: The number of times to retry before giving up, default: 5
dryrun: If True, do not actually commit the change.
"""
prebuilt_branch = 'prebuilt_branch'
@@ -168,7 +167,7 @@
UpdateLocalFile(filename, value, key)
git.RunGit(cwd, ['add', filename])
git.RunGit(cwd, ['commit', '-m', description])
- git.PushWithRetry(prebuilt_branch, cwd, dryrun=dryrun, retries=retries)
+ git.PushBranch(prebuilt_branch, cwd, dryrun=dryrun)
finally:
# We reset the index and the working tree state in case there are any
# uncommitted or pending changes, but we don't change any existing commits.