commit e7d34b1d2c4049a788d0bee4b93a7f11aab01ed2
author Ravi Mistry <rmistry@google.com> Tue Dec 06 08:14:12 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 06 13:57:50 2016 +0000
tree 5983414a119a3871e7db10032ce4c072911572f7
parent 2afffbda66cd24c8559a62f59ee608096813b2bb

Do not checkout skia from chromium.googlesource.com in RecreateSKPs bot

It appears to be confusing "git cl upload".

BUG=skia:6033

Change-Id: I9813798dbfbbdb9eba6f4159f07e040ac865006c
Reviewed-on: https://skia-review.googlesource.com/5601
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

infra/bots/upload_skps.py

diff --git a/infra/bots/upload_skps.py b/infra/bots/upload_skps.py
index 3ec0f70..a1833df 100644
--- a/infra/bots/upload_skps.py
+++ b/infra/bots/upload_skps.py
@@ -13,7 +13,6 @@
 
 import git_utils
 
-CHROMIUM_SKIA = 'https://chromium.googlesource.com/skia.git'
 SKIA_COMMITTER_EMAIL = 'update-skps@skia.org'
 SKIA_COMMITTER_NAME = 'UpdateSKPs'
 COMMIT_MSG = '''Update SKP version
@@ -27,11 +26,7 @@
 
 
 def main(target_dir, gitcookies):
-  with git_utils.NewGitCheckout(repository=CHROMIUM_SKIA):
-    if CHROMIUM_SKIA in subprocess.check_output(['git', 'remote', '-v']):
-      subprocess.check_call(['git', 'remote', 'set-url', 'origin', SKIA_REPO,
-                             CHROMIUM_SKIA])
-
+  with git_utils.NewGitCheckout(repository=SKIA_REPO):
     # Download CIPD.
     cipd_sha1 = os.path.join(os.getcwd(), 'infra', 'bots', 'tools', 'luci-go',
                              'linux64', 'cipd.sha1')