[recipes] Add parameters to checkout module

Pass in the behavioral switches, rather than deriving them from the
builder name inside the module.

Bug: skia:6473
Change-Id: I2cbf67d5c450ae7e0fa319d983431d26505f0b67
Reviewed-on: https://skia-review.googlesource.com/130846
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

9 files changed, 338 insertions, 34 deletions

diff --git a/infra/bots/recipe_modules/checkout/api.py b/infra/bots/recipe_modules/checkout/api.py
index 67c27b1aeb..f520c5b0a3 100644
--- a/infra/bots/recipe_modules/checkout/api.py
+++ b/infra/bots/recipe_modules/checkout/api.py
@@ -34,53 +34,62 @@ class CheckoutApi(recipe_api.RecipeApi):
       self.m.git('rebase', self.m.properties['revision'])
       return self.m.properties['revision']
 
-  def bot_update(self, checkout_root, gclient_cache=None):
-    """Run the steps to obtain a checkout using bot_update."""
+  def bot_update(self, checkout_root, gclient_cache=None,
+                 checkout_chromium=False, checkout_flutter=False,
+                 extra_gclient_env=None, parent_rev=False,
+                 flutter_android=False):
+    """Run the steps to obtain a checkout using bot_update.
+
+    Args:
+      checkout_root: Root directory where the code will be synced.
+      gclient_cache: Optional, directory of the gclient cache.
+      checkout_chromium: If True, will check out chromium/src.git in addition
+          to the primary repo.
+      checkout_flutter: If True, will checkout flutter in addition to the
+          primary repo.
+      extra_gclient_env: Map of extra environment variable names to their values
+          to supply while running gclient.
+      parent_rev: If True, checks out the parent of the specified revision,
+          rather than the revision itself, ie. HEAD^ for normal jobs and HEAD
+          (no patch) for try jobs.
+      flutter_android: Indicates that we're checking out flutter for Android.
+    """
     if not gclient_cache:
       gclient_cache = self.m.vars.cache_dir.join('git')
+    if not extra_gclient_env:
+      extra_gclient_env = {}
 
     cfg_kwargs = {}
-    is_parent_revision = 'ParentRevision' in self.m.vars.extra_tokens
 
     # Use a persistent gclient cache for Swarming.
     cfg_kwargs['CACHE_DIR'] = gclient_cache
 
     # Create the checkout path if necessary.
-    if not self.m.path.exists(checkout_root):
-      self.m.file.ensure_directory('makedirs checkout_path', checkout_root)
+    # TODO(borenet): 'makedirs checkout_root'
+    self.m.file.ensure_directory('makedirs checkout_path', checkout_root)
 
     # Initial cleanup.
     gclient_cfg = self.m.gclient.make_config(**cfg_kwargs)
 
-    # Some bots also require a checkout of chromium.
-    need_chromium_checkout = False
-    gclient_env = {'DEPOT_TOOLS_UPDATE': '0'}
-    if 'CommandBuffer' in self.m.properties['buildername']:
-      need_chromium_checkout = True
-      gclient_env['GYP_CHROMIUM_NO_ACTION'] = '0'
-    if 'RecreateSKPs' in self.m.properties['buildername']:
-      need_chromium_checkout = True
-      gclient_env['CPPFLAGS'] = '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1'
-
     # Add chromium first because of skbug.com/7917.
-    if need_chromium_checkout:
+    if checkout_chromium:
       chromium = gclient_cfg.solutions.add()
       chromium.name = 'src'
       chromium.managed = False
       chromium.url = 'https://chromium.googlesource.com/chromium/src.git'
       chromium.revision = 'origin/master'
+      extra_gclient_env['GYP_CHROMIUM_NO_ACTION'] = '0'
 
     main_repo = self.m.properties['repository']
 
-    need_flutter_checkout = 'Flutter' in self.m.properties['buildername']
-    if need_flutter_checkout:
+    if checkout_flutter:
       main_repo = 'https://github.com/flutter/engine.git'
     main_name = self.m.path.basename(main_repo)
     if main_name.endswith('.git'):
       main_name = main_name[:-len('.git')]
       # Special case for flutter because it seems to need a very specific
       # directory structure to successfully build.
-      if need_flutter_checkout and main_name == 'engine':
+      if checkout_flutter and main_name == 'engine':
         main_name = 'src/flutter'
     main = gclient_cfg.solutions.add()
     main.name = main_name
@@ -97,13 +106,13 @@ class CheckoutApi(recipe_api.RecipeApi):
       if patch_root.endswith('.git'):
         patch_root = patch_root[:-4]
 
-    if need_flutter_checkout:
+    if checkout_flutter:
       # Skia is a DEP of Flutter; the 'revision' property is a Skia revision,
       # and any patch should be applied to Skia, not Flutter.
       main.revision = 'origin/master'
       main.managed = True
       m[main_name] = 'got_flutter_revision'
-      if 'Android' in self.m.vars.extra_tokens:
+      if flutter_android:
         gclient_cfg.target_os.add('android')
 
       skia_dep_path = 'src/third_party/skia'
@@ -130,7 +139,7 @@ class CheckoutApi(recipe_api.RecipeApi):
       # code and properties to agree with bot_update.
       self.m.bot_update._repository = patch_repo
 
-    if not self.m.vars.is_trybot and is_parent_revision:
+    if not self.m.vars.is_trybot and parent_rev:
       main.revision = main.revision + '^'
 
     self.m.gclient.c = gclient_cfg
@@ -141,10 +150,13 @@ class CheckoutApi(recipe_api.RecipeApi):
           # patch=False, we'll see "... (without patch)" in the step names, even
           # for non-trybot runs, which is misleading and confusing. Therefore,
           # always specify patch=True for non-trybot runs.
-          patch=not (self.m.vars.is_trybot and is_parent_revision)
+          patch=not (self.m.vars.is_trybot and parent_rev)
       )
 
-    if need_chromium_checkout or need_flutter_checkout:
+    if checkout_chromium or checkout_flutter:
+      gclient_env = {'DEPOT_TOOLS_UPDATE': '0'}
+      if extra_gclient_env:
+        gclient_env.update(extra_gclient_env)
       with self.m.context(cwd=checkout_root, env=gclient_env):
         self.m.gclient.runhooks()
     return update_step.presentation.properties['got_revision']
diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
index f3980c9d00..bdfbf77f14 100644
--- a/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
+++ b/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
@@ -107,6 +107,7 @@
     "env": {
       "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
       "DEPOT_TOOLS_UPDATE": "0",
+      "GYP_CHROMIUM_NO_ACTION": "0",
       "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
diff --git a/infra/bots/recipe_modules/checkout/examples/full.py b/infra/bots/recipe_modules/checkout/examples/full.py
index 7e7f436783..f42020a995 100644
--- a/infra/bots/recipe_modules/checkout/examples/full.py
+++ b/infra/bots/recipe_modules/checkout/examples/full.py
@@ -20,11 +20,34 @@ def RunSteps(api):
   if 'NoDEPS' in api.properties['buildername']:
     bot_update = False
 
+  checkout_root = api.checkout.default_checkout_root
+  checkout_chromium = False
+  checkout_flutter = False
+  extra_gclient_env = {}
+  flutter_android = False
+  parent_rev = False
+  if 'CommandBuffer' in api.vars.builder_name:
+    checkout_chromium = True
+  if 'RecreateSKPs' in api.vars.builder_name:
+    checkout_chromium = True
+    extra_gclient_env['CPPFLAGS'] = (
+        '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1')
+  if 'Flutter' in api.vars.builder_name:
+    checkout_root = checkout_root.join('flutter')
+    checkout_flutter = True
+    if 'Android' in api.vars.builder_name:
+      flutter_android = True
+  if 'ParentRevision' in api.vars.builder_name:
+    parent_rev = True
+
   if bot_update:
-    checkout_root = api.checkout.default_checkout_root
-    if 'Flutter' in api.vars.builder_name:
-      checkout_root = checkout_root.join('flutter')
-    api.checkout.bot_update(checkout_root=checkout_root)
+    api.checkout.bot_update(
+        checkout_root=checkout_root,
+        checkout_chromium=checkout_chromium,
+        checkout_flutter=checkout_flutter,
+        extra_gclient_env=extra_gclient_env,
+        flutter_android=flutter_android,
+        parent_rev=parent_rev)
   else:
     api.checkout.git(checkout_root=api.path['start_dir'])
   api.file.ensure_directory('makedirs tmp_dir', api.vars.tmp_dir)
diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
new file mode 100644
index 0000000000..7061a2e781
--- /dev/null
+++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
@@ -0,0 +1,234 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/cache/work"
+    ],
+    "infra_step": true,
+    "name": "makedirs checkout_path"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "remove",
+      "[START_DIR]/cache/work/.gclient_entries"
+    ],
+    "infra_step": true,
+    "name": "remove [START_DIR]/cache/work/.gclient_entries"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+      "--spec-path",
+      "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
+      "--patch_root",
+      "skia",
+      "--revision_mapping_file",
+      "{\"got_revision\": \"skia\"}",
+      "--git-cache-dir",
+      "[START_DIR]/cache/git",
+      "--cleanup-dir",
+      "[CLEANUP]/bot_update",
+      "--output_json",
+      "/path/to/tmp/json",
+      "--revision",
+      "skia@abc123",
+      "--revision",
+      "src@origin/master"
+    ],
+    "cwd": "[START_DIR]/cache/work",
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "bot_update",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Some step text@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"skia\": \"abc123\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"origin/master\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"skia\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/skia.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"skia\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"source_manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"directories\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"skia\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"git_checkout\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"repo_url\": \"https://fake.org/skia.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        }@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"version\": 0@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+      "runhooks"
+    ],
+    "cwd": "[START_DIR]/cache/work",
+    "env": {
+      "DEPOT_TOOLS_UPDATE": "0",
+      "GYP_CHROMIUM_NO_ACTION": "0",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gclient runhooks"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/tmp"
+    ],
+    "infra_step": true,
+    "name": "makedirs tmp_dir"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/cache/work/skia/tools/build_command_buffer.py",
+      "--chrome-dir",
+      "[START_DIR]/cache/work",
+      "--output-dir",
+      "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
+      "--no-sync",
+      "--no-hooks",
+      "--make-output-dir"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "build command_buffer"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/cache/work/skia/bin/fetch-gn"
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "fetch-gn"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/cache/work/skia/bin/gn",
+      "gen",
+      "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
+      "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] target_cpu=\"x86_64\""
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gn gen"
+  },
+  {
+    "cmd": [
+      "ninja",
+      "-k",
+      "0",
+      "-C",
+      "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug"
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "ninja"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n  os.makedirs(dst)\nexcept OSError as e:\n  if e.errno != errno.EEXIST:\n    raise\n\nfor pattern in build_products_whitelist:\n  path = os.path.join(src, pattern)\n  for f in glob.glob(path):\n    dst_path = os.path.join(dst, os.path.relpath(f, src))\n    if not os.path.isdir(os.path.dirname(dst_path)):\n      os.makedirs(os.path.dirname(dst_path))\n    print 'Copying build product %s to %s' % (f, dst_path)\n    shutil.move(f, dst_path)\n",
+      "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug",
+      "[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
+    ],
+    "infra_step": true,
+    "name": "copy build products",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@import errno@@@",
+      "@@@STEP_LOG_LINE@python.inline@import glob@@@",
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  os.makedirs(dst)@@@",
+      "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  if e.errno != errno.EEXIST:@@@",
+      "@@@STEP_LOG_LINE@python.inline@    raise@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  path = os.path.join(src, pattern)@@@",
+      "@@@STEP_LOG_LINE@python.inline@  for f in glob.glob(path):@@@",
+      "@@@STEP_LOG_LINE@python.inline@    dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
+      "@@@STEP_LOG_LINE@python.inline@    if not os.path.isdir(os.path.dirname(dst_path)):@@@",
+      "@@@STEP_LOG_LINE@python.inline@      os.makedirs(os.path.dirname(dst_path))@@@",
+      "@@@STEP_LOG_LINE@python.inline@    print 'Copying build product %s to %s' % (f, dst_path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@    shutil.move(f, dst_path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]
\ No newline at end of file
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py
index e5e553cd16..9a2e0f6b23 100644
--- a/infra/bots/recipes/compile.py
+++ b/infra/bots/recipes/compile.py
@@ -26,14 +26,37 @@ def RunSteps(api):
   api.vars.setup()
 
   # Check out code.
+  bot_update = True
+  checkout_root = api.checkout.default_checkout_root
+  checkout_chromium = False
+  checkout_flutter = False
+  extra_gclient_env = {}
+  flutter_android = False
+  parent_rev = False
+
   if 'NoDEPS' in api.properties['buildername']:
+    bot_update = False
     checkout_root = api.path['start_dir']
-    api.checkout.git(checkout_root=checkout_root)
+  if 'CommandBuffer' in api.vars.builder_name:
+    checkout_chromium = True
+  if 'Flutter' in api.vars.builder_name:
+    checkout_root = checkout_root.join('flutter')
+    checkout_flutter = True
+    if 'Android' in api.vars.builder_name:
+      flutter_android = True
+  if 'ParentRevision' in api.vars.builder_name:
+    parent_rev = True
+
+  if bot_update:
+    api.checkout.bot_update(
+        checkout_root=checkout_root,
+        checkout_chromium=checkout_chromium,
+        checkout_flutter=checkout_flutter,
+        extra_gclient_env=extra_gclient_env,
+        flutter_android=flutter_android,
+        parent_rev=parent_rev)
   else:
-    checkout_root = api.checkout.default_checkout_root
-    if 'Flutter' in api.vars.builder_name:
-      checkout_root = checkout_root.join('flutter')
-    api.checkout.bot_update(checkout_root=checkout_root)
+    api.checkout.git(checkout_root=checkout_root)
 
   api.file.ensure_directory('makedirs tmp_dir', api.vars.tmp_dir)
 
@@ -78,6 +101,7 @@ TEST_BUILDERS = [
   'Build-Debian9-Clang-x86_64-Release-NoDEPS',
   'Build-Debian9-Clang-x86_64-Release-ParentRevision',
   'Build-Debian9-GCC-x86_64-Release-Flutter_Android',
+  'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
   'Build-Win-Clang-x86-Debug',
 ]
 
diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
index 949cd9386c..19635682e5 100644
--- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
+++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
@@ -107,6 +107,7 @@
     "env": {
       "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
       "DEPOT_TOOLS_UPDATE": "0",
+      "GYP_CHROMIUM_NO_ACTION": "0",
       "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
index 35bd377ce6..b915c976ac 100644
--- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
+++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
@@ -107,6 +107,7 @@
     "env": {
       "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
       "DEPOT_TOOLS_UPDATE": "0",
+      "GYP_CHROMIUM_NO_ACTION": "0",
       "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
index 2078155fa6..2168c432f2 100644
--- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json
+++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
@@ -107,6 +107,7 @@
     "env": {
       "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
       "DEPOT_TOOLS_UPDATE": "0",
+      "GYP_CHROMIUM_NO_ACTION": "0",
       "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
diff --git a/infra/bots/recipes/recreate_skps.py b/infra/bots/recipes/recreate_skps.py
index 80f4dcf0df..053cfba60f 100644
--- a/infra/bots/recipes/recreate_skps.py
+++ b/infra/bots/recipes/recreate_skps.py
@@ -36,8 +36,15 @@ TEST_BUILDERS = {
 def RunSteps(api):
   # Check out Chrome.
   api.vars.setup()
+
   checkout_root = api.checkout.default_checkout_root
-  api.checkout.bot_update(checkout_root=checkout_root)
+  extra_gclient_env = {
+      'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1'}
+  api.checkout.bot_update(
+      checkout_root=checkout_root,
+      checkout_chromium=True,
+      extra_gclient_env=extra_gclient_env)
+
   api.file.ensure_directory('makedirs tmp_dir', api.vars.tmp_dir)
   api.flavor.setup()