Try to use bot_update in Skia repo recipes

infra/bots/recipe_modules/core/api.py

Index: infra/bots/recipe_modules/core/api.py
diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py
index e65073cb3694d58466b1203ede936bb1bd6ee162..503c3d1fdf9c2b7932dd47089d536d2e256a440b 100644
--- a/infra/bots/recipe_modules/core/api.py
+++ b/infra/bots/recipe_modules/core/api.py
@@ -82,15 +82,7 @@ class SkiaApi(recipe_api.RecipeApi):
     skia.managed = False
     skia.url = 'https://skia.googlesource.com/skia.git'
     skia.revision = self.m.properties.get('revision') or 'origin/master'
-    self.update_repo(self.m.vars.checkout_root, skia)
-
-    # TODO(rmistry): Remove the below block after there is a solution for
-    #                crbug.com/616443
-    entries_file = self.m.vars.checkout_root.join('.gclient_entries')
-    if self.m.path.exists(entries_file):
-      self.m.file.remove('remove %s' % entries_file,
-                         entries_file,
-                         infra_step=True)  # pragma: no cover
+    # self.update_repo(self.m.vars.checkout_root, skia)
 
     if self.m.vars.need_chromium_checkout:
       chromium = gclient_cfg.solutions.add()
@@ -98,7 +90,7 @@ class SkiaApi(recipe_api.RecipeApi):
       chromium.managed = False
       chromium.url = 'https://chromium.googlesource.com/chromium/src.git'
       chromium.revision = 'origin/lkgr'
-      self.update_repo(self.m.vars.checkout_root, chromium)
+      # self.update_repo(self.m.vars.checkout_root, chromium)
 
     if self.m.vars.need_pdfium_checkout:
       pdfium = gclient_cfg.solutions.add()
@@ -106,7 +98,7 @@ class SkiaApi(recipe_api.RecipeApi):
       pdfium.managed = False
       pdfium.url = 'https://pdfium.googlesource.com/pdfium.git'
       pdfium.revision = 'origin/master'
-      self.update_repo(self.m.vars.checkout_root, pdfium)
+      # self.update_repo(self.m.vars.checkout_root, pdfium)
 
     # Run 'gclient sync'.
     gclient_cfg.got_revision_mapping['skia'] = 'got_revision'
@@ -116,6 +108,7 @@ class SkiaApi(recipe_api.RecipeApi):
 
     # api.gclient.revert() assumes things about the layout of the code, so it
     # fails for us. Run an appropriate revert sequence for trybots instead.
+    """
     gclient_file = self.m.vars.checkout_root.join('.gclient')
     if (self.m.tryserver.is_tryserver and
         self.m.path.exists(gclient_file)):  # pragma: no cover
@@ -131,16 +124,29 @@ class SkiaApi(recipe_api.RecipeApi):
           'revert',
           ['revert', '-v', '-v', '-v', '--nohooks', '--upstream'],
           cwd=self.m.vars.checkout_root)
-
-    update_step = self.m.gclient.checkout(gclient_config=gclient_cfg,
-                                          cwd=self.m.vars.checkout_root,
-                                          revert=False,
-                                          **checkout_kwargs)
+    """
+
+    # update_step = self.m.gclient.checkout(gclient_config=gclient_cfg,
+    #                                       cwd=self.m.vars.checkout_root,
+    #                                       revert=False,
+    #                                       **checkout_kwargs)
+
+    checkout_kwargs['cwd'] = self.m.vars.checkout_root
+    update_step = self.m.bot_update.ensure_checkout(
+        # Use the gclient_cfg we constructed above.
+        gclient_config=gclient_cfg,
+        # Always run bot_update. Seems to be turned on by other recipes as well.
+        force=True,
+        # Uncomment the below after recipe deps is rolled.
+        # Below param will not be needed after True is the default in bot_update.
+        # gerrit_rebase_patch_ref=True,
+        **checkout_kwargs)
 
     self.m.vars.got_revision = (
         update_step.presentation.properties['got_revision'])
-    self.m.tryserver.maybe_apply_issue()
+    # self.m.tryserver.maybe_apply_issue()
 
     if self.m.vars.need_chromium_checkout:
+      # rmistry: hooks??
       self.m.gclient.runhooks(cwd=self.m.vars.checkout_root,
                               env=self.m.vars.gclient_env)