Remove non-monorepo logic branches from release_builder.py.

There is more TLC that could be done, but changing recipes is
stresful to begin with, so let's start with this safer set of
changes.

Bug: https://github.com/flutter/flutter/issues/168095
Change-Id: Id081237fadde42649bcea32d3bbbf8754ed1d896
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/65080
Reviewed-by: Jason Simmons <jsimmons@google.com>
Commit-Queue: Matan Lurey <matanl@google.com>
Reviewed-by: John McDole <codefu@google.com>
diff --git a/recipes/release/release_builder.expected/base_linux_beta.json b/recipes/release/release_builder.expected/base_linux_beta.json
deleted file mode 100644
index 5cda580..0000000
--- a/recipes/release/release_builder.expected/base_linux_beta.json
+++ /dev/null
@@ -1,662 +0,0 @@
-[
-  {
-    "cmd": [
-      "top",
-      "-b",
-      "-n",
-      "3",
-      "-o",
-      "%MEM"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "OS info"
-  },
-  {
-    "cmd": [],
-    "name": "Checkout flutter/mirrors/engine"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/mirrors/engine",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/engine"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "read ci yaml",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@yaml@@@@",
-      "@@@STEP_LOG_END@yaml@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read ci yaml.read",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@.ci.yaml@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
-      "--yaml_file",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
-      "--json_file",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read ci yaml.parse",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux one\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"release_build\": \"true\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      },@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"engine/something\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    },@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"beta\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"main\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux packaging one\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      },@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"scheduler\": \"release\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "Identify branches"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Identify branches.git rev-parse",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "branch",
-      "-a",
-      "--contains",
-      "12345abcde12345abcde12345abcde12345abcde"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Identify branches.git branch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "launch builds"
-  },
-  {
-    "cmd": [],
-    "name": "launch builds.get buildbucket id",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@8945511751514863184@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "bb",
-      "batch",
-      "-host",
-      "cr-buildbucket.appspot.com"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"responses\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"scheduleBuild\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"builder\": \"builder-subbuild1\",@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"project\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"id\": \"8945511751514863186\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@request@{@@@",
-      "@@@STEP_LOG_LINE@request@  \"requests\": [@@@",
-      "@@@STEP_LOG_LINE@request@    {@@@",
-      "@@@STEP_LOG_LINE@request@      \"scheduleBuild\": {@@@",
-      "@@@STEP_LOG_LINE@request@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"builder\": \"Linux Engine Drone\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"project\": \"prod\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"key\": \"os\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"Linux\"@@@",
-      "@@@STEP_LOG_LINE@request@          }@@@",
-      "@@@STEP_LOG_LINE@request@        ],@@@",
-      "@@@STEP_LOG_LINE@request@        \"exe\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"cipdVersion\": \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"experimental\": \"NO\",@@@",
-      "@@@STEP_LOG_LINE@request@        \"experiments\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"luci.buildbucket.parent_tracking\": false@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\",@@@",
-      "@@@STEP_LOG_LINE@request@        \"gerritChanges\": [@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"change\": \"123456\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"host\": \"flutter-review.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"patchset\": \"7\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"project\": \"mirrors/engine\"@@@",
-      "@@@STEP_LOG_LINE@request@          }@@@",
-      "@@@STEP_LOG_LINE@request@        ],@@@",
-      "@@@STEP_LOG_LINE@request@        \"gitilesCommit\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"host\": \"flutter.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"project\": \"mirrors/engine\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"ref\": \"refs/heads/beta\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"priority\": 30,@@@",
-      "@@@STEP_LOG_LINE@request@        \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"$flutter/osx_sdk\": {@@@",
-      "@@@STEP_LOG_LINE@request@            \"sdk_version\": \"14a5294e\"@@@",
-      "@@@STEP_LOG_LINE@request@          },@@@",
-      "@@@STEP_LOG_LINE@request@          \"build\": {@@@",
-      "@@@STEP_LOG_LINE@request@            \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@request@              \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@request@            ],@@@",
-      "@@@STEP_LOG_LINE@request@            \"enabled_branches\": [@@@",
-      "@@@STEP_LOG_LINE@request@              \"beta\",@@@",
-      "@@@STEP_LOG_LINE@request@              \"main\"@@@",
-      "@@@STEP_LOG_LINE@request@            ],@@@",
-      "@@@STEP_LOG_LINE@request@            \"name\": \"linux packaging one\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@request@              \"$flutter/osx_sdk\": {@@@",
-      "@@@STEP_LOG_LINE@request@                \"sdk_version\": \"14a5294e\"@@@",
-      "@@@STEP_LOG_LINE@request@              }@@@",
-      "@@@STEP_LOG_LINE@request@            },@@@",
-      "@@@STEP_LOG_LINE@request@            \"recipe\": \"release/something\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"scheduler\": \"release\"@@@",
-      "@@@STEP_LOG_LINE@request@          },@@@",
-      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
-      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"recipe\": \"release/something\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"repository\": \"engine\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
-      "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"key\": \"cq_experimental\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"false\"@@@",
-      "@@@STEP_LOG_LINE@request@          },@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@          },@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"recipe\"@@@",
-      "@@@STEP_LOG_LINE@request@          }@@@",
-      "@@@STEP_LOG_LINE@request@        ]@@@",
-      "@@@STEP_LOG_LINE@request@      }@@@",
-      "@@@STEP_LOG_LINE@request@    }@@@",
-      "@@@STEP_LOG_LINE@request@  ]@@@",
-      "@@@STEP_LOG_LINE@request@}@@@",
-      "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@8945511751514863186@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "collect builds"
-  },
-  {
-    "cmd": [],
-    "name": "collect builds.collect",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "bb",
-      "collect",
-      "-host",
-      "cr-buildbucket.appspot.com",
-      "-interval",
-      "20s",
-      "8945511751514863186"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect builds.collect.wait",
-    "timeout": 86400,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "bb",
-      "batch",
-      "-host",
-      "cr-buildbucket.appspot.com"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect builds.collect.get",
-    "stdin": "{\"requests\": [{\"getBuild\": {\"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"id\": \"8945511751514863186\"}}]}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"responses\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"getBuild\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"builder\": \"builder-subbuild1\",@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"project\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"createTime\": \"2018-05-25T23:50:17Z\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"createdBy\": \"project:fuchsia\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"id\": \"8945511751514863186\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"infra\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"backend\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"task\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"id\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@                \"id\": \"abc123\"@@@",
-      "@@@STEP_LOG_LINE@json.output@              }@@@",
-      "@@@STEP_LOG_LINE@json.output@            }@@@",
-      "@@@STEP_LOG_LINE@json.output@          },@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"resultdb\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"invocation\": \"invocations/build:8945511751514863186\"@@@",
-      "@@@STEP_LOG_LINE@json.output@          },@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"priority\": 30@@@",
-      "@@@STEP_LOG_LINE@json.output@          }@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"input\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"gerritChanges\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@            {@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"change\": \"123456\",@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"host\": \"chromium-review.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"patchset\": \"7\",@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"project\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@json.output@            }@@@",
-      "@@@STEP_LOG_LINE@json.output@          ]@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"output\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"test_orchestration_inputs_hash\": \"abc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@          }@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"status\": \"SUCCESS\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"tags\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@          {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"key\": \"cq_experimental\",@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"value\": \"false\"@@@",
-      "@@@STEP_LOG_LINE@json.output@          }@@@",
-      "@@@STEP_LOG_LINE@json.output@        ]@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@request@{@@@",
-      "@@@STEP_LOG_LINE@request@  \"requests\": [@@@",
-      "@@@STEP_LOG_LINE@request@    {@@@",
-      "@@@STEP_LOG_LINE@request@      \"getBuild\": {@@@",
-      "@@@STEP_LOG_LINE@request@        \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\",@@@",
-      "@@@STEP_LOG_LINE@request@        \"id\": \"8945511751514863186\"@@@",
-      "@@@STEP_LOG_LINE@request@      }@@@",
-      "@@@STEP_LOG_LINE@request@    }@@@",
-      "@@@STEP_LOG_LINE@request@  ]@@@",
-      "@@@STEP_LOG_LINE@request@}@@@",
-      "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@8945511751514863186@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "display builds"
-  },
-  {
-    "cmd": [],
-    "name": "display builds.linux packaging one",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@8945511751514863186@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/release/release_builder.expected/base_linux_beta_monorepo.json b/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
index 5cda580..edd7620 100644
--- a/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
+++ b/recipes/release/release_builder.expected/base_linux_beta_monorepo.json
@@ -25,7 +25,7 @@
   },
   {
     "cmd": [],
-    "name": "Checkout flutter/mirrors/engine"
+    "name": "Checkout flutter/mirrors/flutter"
   },
   {
     "cmd": [
@@ -33,9 +33,9 @@
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[START_DIR]/mirrors/engine",
+      "[START_DIR]/mirrors/flutter",
       "--url",
-      "https://flutter.googlesource.com/mirrors/engine"
+      "https://flutter.googlesource.com/mirrors/flutter"
     ],
     "luci_context": {
       "realm": {
@@ -49,7 +49,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git setup",
+    "name": "Checkout flutter/mirrors/flutter.git setup",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -63,7 +63,7 @@
       "--progress",
       "--tags"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "env": {
       "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
     },
@@ -80,7 +80,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git fetch",
+    "name": "Checkout flutter/mirrors/flutter.git fetch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -92,7 +92,7 @@
       "-f",
       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -106,7 +106,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git checkout",
+    "name": "Checkout flutter/mirrors/flutter.git checkout",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -117,7 +117,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -131,7 +131,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.read revision",
+    "name": "Checkout flutter/mirrors/flutter.read revision",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -146,7 +146,7 @@
       "-d",
       "-x"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -160,7 +160,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git clean",
+    "name": "Checkout flutter/mirrors/flutter.git clean",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -171,7 +171,7 @@
       "submodule",
       "sync"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -185,7 +185,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule sync",
+    "name": "Checkout flutter/mirrors/flutter.submodule sync",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -198,7 +198,7 @@
       "--init",
       "--recursive"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -212,7 +212,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule update",
+    "name": "Checkout flutter/mirrors/flutter.submodule update",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -233,7 +233,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -260,7 +260,7 @@
       "vpython3",
       "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
       "--yaml_file",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "--json_file",
       "/path/to/tmp/json"
     ],
@@ -323,7 +323,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -350,7 +350,7 @@
       "--contains",
       "12345abcde12345abcde12345abcde12345abcde"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -402,7 +402,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/beta\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\"}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"release/something\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -448,13 +448,13 @@
       "@@@STEP_LOG_LINE@request@            \"change\": \"123456\",@@@",
       "@@@STEP_LOG_LINE@request@            \"host\": \"flutter-review.googlesource.com\",@@@",
       "@@@STEP_LOG_LINE@request@            \"patchset\": \"7\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"project\": \"mirrors/engine\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"project\": \"mirrors/flutter\"@@@",
       "@@@STEP_LOG_LINE@request@          }@@@",
       "@@@STEP_LOG_LINE@request@        ],@@@",
       "@@@STEP_LOG_LINE@request@        \"gitilesCommit\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"host\": \"flutter.googlesource.com\",@@@",
       "@@@STEP_LOG_LINE@request@          \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"project\": \"mirrors/engine\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"project\": \"mirrors/flutter\",@@@",
       "@@@STEP_LOG_LINE@request@          \"ref\": \"refs/heads/beta\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"priority\": 30,@@@",
@@ -474,7 +474,8 @@
       "@@@STEP_LOG_LINE@request@            \"properties\": {@@@",
       "@@@STEP_LOG_LINE@request@              \"$flutter/osx_sdk\": {@@@",
       "@@@STEP_LOG_LINE@request@                \"sdk_version\": \"14a5294e\"@@@",
-      "@@@STEP_LOG_LINE@request@              }@@@",
+      "@@@STEP_LOG_LINE@request@              },@@@",
+      "@@@STEP_LOG_LINE@request@              \"is_fusion\": \"true\"@@@",
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"release/something\",@@@",
       "@@@STEP_LOG_LINE@request@            \"scheduler\": \"release\"@@@",
@@ -482,9 +483,10 @@
       "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"is_fusion\": \"true\",@@@",
       "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"release/something\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"repository\": \"engine\"@@@",
+      "@@@STEP_LOG_LINE@request@          \"repository\": \"flutter\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
@@ -657,6 +659,143 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "read ci yaml (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@yaml@@@@",
+      "@@@STEP_LOG_END@yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).read",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@.ci.yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
+      "--yaml_file",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "--json_file",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"targets\": []@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Identify branches (2)"
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches (2).git rev-parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "branch",
+      "-a",
+      "--contains",
+      "12345abcde12345abcde12345abcde12345abcde"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches (2).git branch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "launch builds (2)"
+  },
+  {
+    "cmd": [],
+    "name": "collect builds (2)"
+  },
+  {
+    "cmd": [],
+    "name": "display builds (2)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/release/release_builder.expected/base_linux_main.json b/recipes/release/release_builder.expected/base_linux_main.json
deleted file mode 100644
index 43db4a6..0000000
--- a/recipes/release/release_builder.expected/base_linux_main.json
+++ /dev/null
@@ -1,660 +0,0 @@
-[
-  {
-    "cmd": [
-      "top",
-      "-b",
-      "-n",
-      "3",
-      "-o",
-      "%MEM"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "OS info"
-  },
-  {
-    "cmd": [],
-    "name": "Checkout flutter/mirrors/engine"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/mirrors/engine",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/engine"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "main",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "read ci yaml",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@yaml@@@@",
-      "@@@STEP_LOG_END@yaml@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read ci yaml.read",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@.ci.yaml@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
-      "--yaml_file",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
-      "--json_file",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read ci yaml.parse",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux one\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"release_build\": \"true\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      },@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"engine/something\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    },@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"beta\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"main\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux packaging one\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      },@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"scheduler\": \"release\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "Identify branches"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Identify branches.git rev-parse",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "branch",
-      "-a",
-      "--contains",
-      "12345abcde12345abcde12345abcde12345abcde"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Identify branches.git branch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "launch builds"
-  },
-  {
-    "cmd": [],
-    "name": "launch builds.get buildbucket id",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@8945511751514863184@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "bb",
-      "batch",
-      "-host",
-      "cr-buildbucket.appspot.com"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"linux one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"responses\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"scheduleBuild\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"builder\": \"builder-subbuild1\",@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"project\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"id\": \"8945511751514863186\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@request@{@@@",
-      "@@@STEP_LOG_LINE@request@  \"requests\": [@@@",
-      "@@@STEP_LOG_LINE@request@    {@@@",
-      "@@@STEP_LOG_LINE@request@      \"scheduleBuild\": {@@@",
-      "@@@STEP_LOG_LINE@request@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"builder\": \"Linux Engine Drone\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"project\": \"prod\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"key\": \"os\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"Linux\"@@@",
-      "@@@STEP_LOG_LINE@request@          }@@@",
-      "@@@STEP_LOG_LINE@request@        ],@@@",
-      "@@@STEP_LOG_LINE@request@        \"exe\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"cipdVersion\": \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"experimental\": \"NO\",@@@",
-      "@@@STEP_LOG_LINE@request@        \"experiments\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"luci.buildbucket.parent_tracking\": false@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\",@@@",
-      "@@@STEP_LOG_LINE@request@        \"gerritChanges\": [@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"change\": \"123456\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"host\": \"flutter-review.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"patchset\": \"7\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"project\": \"mirrors/engine\"@@@",
-      "@@@STEP_LOG_LINE@request@          }@@@",
-      "@@@STEP_LOG_LINE@request@        ],@@@",
-      "@@@STEP_LOG_LINE@request@        \"gitilesCommit\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"host\": \"flutter.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"project\": \"mirrors/engine\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"ref\": \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"priority\": 30,@@@",
-      "@@@STEP_LOG_LINE@request@        \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"$flutter/osx_sdk\": {@@@",
-      "@@@STEP_LOG_LINE@request@            \"sdk_version\": \"14a5294e\"@@@",
-      "@@@STEP_LOG_LINE@request@          },@@@",
-      "@@@STEP_LOG_LINE@request@          \"build\": {@@@",
-      "@@@STEP_LOG_LINE@request@            \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@request@              \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@request@            ],@@@",
-      "@@@STEP_LOG_LINE@request@            \"name\": \"linux one\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@request@              \"$flutter/osx_sdk\": {@@@",
-      "@@@STEP_LOG_LINE@request@                \"sdk_version\": \"14a5294e\"@@@",
-      "@@@STEP_LOG_LINE@request@              },@@@",
-      "@@@STEP_LOG_LINE@request@              \"release_build\": \"true\"@@@",
-      "@@@STEP_LOG_LINE@request@            },@@@",
-      "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine/something\"@@@",
-      "@@@STEP_LOG_LINE@request@          },@@@",
-      "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
-      "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine/something\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"release_build\": \"true\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"repository\": \"engine\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
-      "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@          \"parentRunId\": \"fake-task-id\"@@@",
-      "@@@STEP_LOG_LINE@request@        },@@@",
-      "@@@STEP_LOG_LINE@request@        \"tags\": [@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"key\": \"cq_experimental\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"false\"@@@",
-      "@@@STEP_LOG_LINE@request@          },@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"key\": \"parent_buildbucket_id\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@          },@@@",
-      "@@@STEP_LOG_LINE@request@          {@@@",
-      "@@@STEP_LOG_LINE@request@            \"key\": \"user_agent\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"value\": \"recipe\"@@@",
-      "@@@STEP_LOG_LINE@request@          }@@@",
-      "@@@STEP_LOG_LINE@request@        ]@@@",
-      "@@@STEP_LOG_LINE@request@      }@@@",
-      "@@@STEP_LOG_LINE@request@    }@@@",
-      "@@@STEP_LOG_LINE@request@  ]@@@",
-      "@@@STEP_LOG_LINE@request@}@@@",
-      "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@8945511751514863186@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "collect builds"
-  },
-  {
-    "cmd": [],
-    "name": "collect builds.collect",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "bb",
-      "collect",
-      "-host",
-      "cr-buildbucket.appspot.com",
-      "-interval",
-      "20s",
-      "8945511751514863186"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect builds.collect.wait",
-    "timeout": 86400,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "bb",
-      "batch",
-      "-host",
-      "cr-buildbucket.appspot.com"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "prod:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "collect builds.collect.get",
-    "stdin": "{\"requests\": [{\"getBuild\": {\"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"id\": \"8945511751514863186\"}}]}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"responses\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"getBuild\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"builder\": \"builder-subbuild1\",@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"project\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"createTime\": \"2018-05-25T23:50:17Z\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"createdBy\": \"project:fuchsia\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"id\": \"8945511751514863186\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"infra\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"backend\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"task\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"id\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@                \"id\": \"abc123\"@@@",
-      "@@@STEP_LOG_LINE@json.output@              }@@@",
-      "@@@STEP_LOG_LINE@json.output@            }@@@",
-      "@@@STEP_LOG_LINE@json.output@          },@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"resultdb\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"invocation\": \"invocations/build:8945511751514863186\"@@@",
-      "@@@STEP_LOG_LINE@json.output@          },@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"priority\": 30@@@",
-      "@@@STEP_LOG_LINE@json.output@          }@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"input\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"gerritChanges\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@            {@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"change\": \"123456\",@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"host\": \"chromium-review.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"patchset\": \"7\",@@@",
-      "@@@STEP_LOG_LINE@json.output@              \"project\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@json.output@            }@@@",
-      "@@@STEP_LOG_LINE@json.output@          ]@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"output\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"test_orchestration_inputs_hash\": \"abc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@          }@@@",
-      "@@@STEP_LOG_LINE@json.output@        },@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"status\": \"SUCCESS\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"tags\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@          {@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"key\": \"cq_experimental\",@@@",
-      "@@@STEP_LOG_LINE@json.output@            \"value\": \"false\"@@@",
-      "@@@STEP_LOG_LINE@json.output@          }@@@",
-      "@@@STEP_LOG_LINE@json.output@        ]@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@request@{@@@",
-      "@@@STEP_LOG_LINE@request@  \"requests\": [@@@",
-      "@@@STEP_LOG_LINE@request@    {@@@",
-      "@@@STEP_LOG_LINE@request@      \"getBuild\": {@@@",
-      "@@@STEP_LOG_LINE@request@        \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\",@@@",
-      "@@@STEP_LOG_LINE@request@        \"id\": \"8945511751514863186\"@@@",
-      "@@@STEP_LOG_LINE@request@      }@@@",
-      "@@@STEP_LOG_LINE@request@    }@@@",
-      "@@@STEP_LOG_LINE@request@  ]@@@",
-      "@@@STEP_LOG_LINE@request@}@@@",
-      "@@@STEP_LOG_END@request@@@",
-      "@@@STEP_LINK@8945511751514863186@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "display builds"
-  },
-  {
-    "cmd": [],
-    "name": "display builds.linux one",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@8945511751514863186@https://cr-buildbucket.appspot.com/build/8945511751514863186@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/release/release_builder.expected/base_linux_main_monorepo.json b/recipes/release/release_builder.expected/base_linux_main_monorepo.json
index 43db4a6..9298e34 100644
--- a/recipes/release/release_builder.expected/base_linux_main_monorepo.json
+++ b/recipes/release/release_builder.expected/base_linux_main_monorepo.json
@@ -25,7 +25,7 @@
   },
   {
     "cmd": [],
-    "name": "Checkout flutter/mirrors/engine"
+    "name": "Checkout flutter/mirrors/flutter"
   },
   {
     "cmd": [
@@ -33,9 +33,9 @@
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[START_DIR]/mirrors/engine",
+      "[START_DIR]/mirrors/flutter",
       "--url",
-      "https://flutter.googlesource.com/mirrors/engine"
+      "https://flutter.googlesource.com/mirrors/flutter"
     ],
     "luci_context": {
       "realm": {
@@ -49,7 +49,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git setup",
+    "name": "Checkout flutter/mirrors/flutter.git setup",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -64,7 +64,7 @@
       "--progress",
       "--tags"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "env": {
       "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
     },
@@ -81,7 +81,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git fetch",
+    "name": "Checkout flutter/mirrors/flutter.git fetch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -93,7 +93,7 @@
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -107,7 +107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git checkout",
+    "name": "Checkout flutter/mirrors/flutter.git checkout",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -118,7 +118,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -132,7 +132,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.read revision",
+    "name": "Checkout flutter/mirrors/flutter.read revision",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -147,7 +147,7 @@
       "-d",
       "-x"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -161,7 +161,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git clean",
+    "name": "Checkout flutter/mirrors/flutter.git clean",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -172,7 +172,7 @@
       "submodule",
       "sync"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -186,7 +186,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule sync",
+    "name": "Checkout flutter/mirrors/flutter.submodule sync",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -199,7 +199,7 @@
       "--init",
       "--recursive"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -213,7 +213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule update",
+    "name": "Checkout flutter/mirrors/flutter.submodule update",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -234,7 +234,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -261,7 +261,7 @@
       "vpython3",
       "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
       "--yaml_file",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "--json_file",
       "/path/to/tmp/json"
     ],
@@ -324,7 +324,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -351,7 +351,7 @@
       "--contains",
       "12345abcde12345abcde12345abcde12345abcde"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -403,7 +403,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"linux one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"dimensions\": [{\"key\": \"os\", \"value\": \"Linux\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/flutter\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/flutter\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"drone_dimensions\": [\"os=Linux\"], \"name\": \"linux one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"is_fusion\": \"true\", \"release_build\": \"true\"}, \"recipe\": \"engine/something\"}, \"build_identifier\": \"8945511751514863184\", \"environment\": \"Staging\", \"gclient_variables\": {}, \"is_fusion\": \"true\", \"parent_commit\": \"\", \"recipe\": \"engine/something\", \"release_build\": \"true\", \"repository\": \"flutter\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -449,13 +449,13 @@
       "@@@STEP_LOG_LINE@request@            \"change\": \"123456\",@@@",
       "@@@STEP_LOG_LINE@request@            \"host\": \"flutter-review.googlesource.com\",@@@",
       "@@@STEP_LOG_LINE@request@            \"patchset\": \"7\",@@@",
-      "@@@STEP_LOG_LINE@request@            \"project\": \"mirrors/engine\"@@@",
+      "@@@STEP_LOG_LINE@request@            \"project\": \"mirrors/flutter\"@@@",
       "@@@STEP_LOG_LINE@request@          }@@@",
       "@@@STEP_LOG_LINE@request@        ],@@@",
       "@@@STEP_LOG_LINE@request@        \"gitilesCommit\": {@@@",
       "@@@STEP_LOG_LINE@request@          \"host\": \"flutter.googlesource.com\",@@@",
       "@@@STEP_LOG_LINE@request@          \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"project\": \"mirrors/engine\",@@@",
+      "@@@STEP_LOG_LINE@request@          \"project\": \"mirrors/flutter\",@@@",
       "@@@STEP_LOG_LINE@request@          \"ref\": \"refs/heads/main\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"priority\": 30,@@@",
@@ -472,6 +472,7 @@
       "@@@STEP_LOG_LINE@request@              \"$flutter/osx_sdk\": {@@@",
       "@@@STEP_LOG_LINE@request@                \"sdk_version\": \"14a5294e\"@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
+      "@@@STEP_LOG_LINE@request@              \"is_fusion\": \"true\",@@@",
       "@@@STEP_LOG_LINE@request@              \"release_build\": \"true\"@@@",
       "@@@STEP_LOG_LINE@request@            },@@@",
       "@@@STEP_LOG_LINE@request@            \"recipe\": \"engine/something\"@@@",
@@ -479,10 +480,11 @@
       "@@@STEP_LOG_LINE@request@          \"build_identifier\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@          \"environment\": \"Staging\",@@@",
       "@@@STEP_LOG_LINE@request@          \"gclient_variables\": {},@@@",
+      "@@@STEP_LOG_LINE@request@          \"is_fusion\": \"true\",@@@",
       "@@@STEP_LOG_LINE@request@          \"parent_commit\": \"\",@@@",
       "@@@STEP_LOG_LINE@request@          \"recipe\": \"engine/something\",@@@",
       "@@@STEP_LOG_LINE@request@          \"release_build\": \"true\",@@@",
-      "@@@STEP_LOG_LINE@request@          \"repository\": \"engine\"@@@",
+      "@@@STEP_LOG_LINE@request@          \"repository\": \"flutter\"@@@",
       "@@@STEP_LOG_LINE@request@        },@@@",
       "@@@STEP_LOG_LINE@request@        \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\",@@@",
       "@@@STEP_LOG_LINE@request@        \"swarming\": {@@@",
@@ -655,6 +657,143 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "read ci yaml (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@yaml@@@@",
+      "@@@STEP_LOG_END@yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).read",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@.ci.yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
+      "--yaml_file",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "--json_file",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"targets\": []@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Identify branches (2)"
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches (2).git rev-parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "branch",
+      "-a",
+      "--contains",
+      "12345abcde12345abcde12345abcde12345abcde"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches (2).git branch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "launch builds (2)"
+  },
+  {
+    "cmd": [],
+    "name": "collect builds (2)"
+  },
+  {
+    "cmd": [],
+    "name": "display builds (2)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/release/release_builder.expected/dart_internal.json b/recipes/release/release_builder.expected/dart_internal.json
deleted file mode 100644
index 59bee30..0000000
--- a/recipes/release/release_builder.expected/dart_internal.json
+++ /dev/null
@@ -1,389 +0,0 @@
-[
-  {
-    "cmd": [
-      "top",
-      "-b",
-      "-n",
-      "3",
-      "-o",
-      "%MEM"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "OS info"
-  },
-  {
-    "cmd": [],
-    "name": "Checkout flutter/mirrors/engine"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/mirrors/engine",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/engine"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "flutter-3.2-candidate.5",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/engine.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "read ci yaml",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@yaml@@@@",
-      "@@@STEP_LOG_END@yaml@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read ci yaml.read",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@.ci.yaml@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
-      "--yaml_file",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
-      "--json_file",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read ci yaml.parse",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux packaging one\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      },@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    },@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"beta\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"main\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux packaging two\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      },@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "Identify branches"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Identify branches.git rev-parse",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "branch",
-      "-a",
-      "--contains",
-      "12345abcde12345abcde12345abcde12345abcde"
-    ],
-    "cwd": "[START_DIR]/mirrors/engine",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Identify branches.git branch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "launch builds"
-  },
-  {
-    "cmd": [],
-    "name": "collect builds"
-  },
-  {
-    "cmd": [],
-    "name": "display builds"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/release/release_builder.expected/filter_enabled_branches.json b/recipes/release/release_builder.expected/filter_enabled_branches.json
index 1a4e275..187cab5 100644
--- a/recipes/release/release_builder.expected/filter_enabled_branches.json
+++ b/recipes/release/release_builder.expected/filter_enabled_branches.json
@@ -25,7 +25,7 @@
   },
   {
     "cmd": [],
-    "name": "Checkout flutter/mirrors/engine"
+    "name": "Checkout flutter/mirrors/flutter"
   },
   {
     "cmd": [
@@ -33,9 +33,9 @@
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[START_DIR]/mirrors/engine",
+      "[START_DIR]/mirrors/flutter",
       "--url",
-      "https://flutter.googlesource.com/mirrors/engine"
+      "https://flutter.googlesource.com/mirrors/flutter"
     ],
     "luci_context": {
       "realm": {
@@ -49,7 +49,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git setup",
+    "name": "Checkout flutter/mirrors/flutter.git setup",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -64,7 +64,7 @@
       "--progress",
       "--tags"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "env": {
       "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
     },
@@ -81,7 +81,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git fetch",
+    "name": "Checkout flutter/mirrors/flutter.git fetch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -93,7 +93,7 @@
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -107,7 +107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git checkout",
+    "name": "Checkout flutter/mirrors/flutter.git checkout",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -118,7 +118,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -132,7 +132,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.read revision",
+    "name": "Checkout flutter/mirrors/flutter.read revision",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -147,7 +147,7 @@
       "-d",
       "-x"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -161,7 +161,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git clean",
+    "name": "Checkout flutter/mirrors/flutter.git clean",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -172,7 +172,7 @@
       "submodule",
       "sync"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -186,7 +186,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule sync",
+    "name": "Checkout flutter/mirrors/flutter.submodule sync",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -199,7 +199,7 @@
       "--init",
       "--recursive"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -213,7 +213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule update",
+    "name": "Checkout flutter/mirrors/flutter.submodule update",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -234,7 +234,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -261,7 +261,7 @@
       "vpython3",
       "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
       "--yaml_file",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "--json_file",
       "/path/to/tmp/json"
     ],
@@ -290,6 +290,171 @@
       "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
       "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
       "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"name\": \"Linux flutter_test\",@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"release_build\": \"true\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      },@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    },@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"os=Mac\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"name\": \"Mac flutter_test\",@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"release_build\": \"true\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      },@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Identify branches"
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches.git rev-parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "branch",
+      "-a",
+      "--contains",
+      "12345abcde12345abcde12345abcde12345abcde"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches.git branch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "launch builds"
+  },
+  {
+    "cmd": [],
+    "name": "collect builds"
+  },
+  {
+    "cmd": [],
+    "name": "display builds"
+  },
+  {
+    "cmd": [],
+    "name": "read ci yaml (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@yaml@@@@",
+      "@@@STEP_LOG_END@yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).read",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@.ci.yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
+      "--yaml_file",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "--json_file",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
       "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux packaging one\",@@@",
       "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\"@@@",
@@ -317,7 +482,7 @@
   },
   {
     "cmd": [],
-    "name": "Identify branches"
+    "name": "Identify branches (2)"
   },
   {
     "cmd": [
@@ -325,7 +490,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -339,7 +504,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Identify branches.git rev-parse",
+    "name": "Identify branches (2).git rev-parse",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -352,7 +517,7 @@
       "--contains",
       "12345abcde12345abcde12345abcde12345abcde"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -366,22 +531,22 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Identify branches.git branch",
+    "name": "Identify branches (2).git branch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "launch builds"
+    "name": "launch builds (2)"
   },
   {
     "cmd": [],
-    "name": "collect builds"
+    "name": "collect builds (2)"
   },
   {
     "cmd": [],
-    "name": "display builds"
+    "name": "display builds (2)"
   },
   {
     "name": "$result"
diff --git a/recipes/release/release_builder.expected/linux_framework_single_repo.json b/recipes/release/release_builder.expected/linux_framework_single_repo.json
deleted file mode 100644
index f0c3b92..0000000
--- a/recipes/release/release_builder.expected/linux_framework_single_repo.json
+++ /dev/null
@@ -1,386 +0,0 @@
-[
-  {
-    "cmd": [
-      "top",
-      "-b",
-      "-n",
-      "3",
-      "-o",
-      "%MEM"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "OS info"
-  },
-  {
-    "cmd": [],
-    "name": "Checkout flutter/mirrors/flutter"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/mirrors/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "flutter-3.2-candidate.5",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/mirrors/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/mirrors/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/mirrors/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/mirrors/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/mirrors/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "read ci yaml",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@yaml@@@@",
-      "@@@STEP_LOG_END@yaml@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/mirrors/flutter/.ci.yaml",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read ci yaml.read",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_END@.ci.yaml@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
-      "--yaml_file",
-      "[START_DIR]/mirrors/flutter/.ci.yaml",
-      "--json_file",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read ci yaml.parse",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"Linux flutter_test\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"properties\": {},@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    },@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os=Mac\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      ],@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"Mac flutter_test\",@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      },@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "Identify branches"
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/mirrors/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Identify branches.git rev-parse",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "branch",
-      "-a",
-      "--contains",
-      "12345abcde12345abcde12345abcde12345abcde"
-    ],
-    "cwd": "[START_DIR]/mirrors/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Identify branches.git branch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "launch builds"
-  },
-  {
-    "cmd": [],
-    "name": "collect builds"
-  },
-  {
-    "cmd": [],
-    "name": "display builds"
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/release/release_builder.expected/retry_override_skip_target linux_target.json b/recipes/release/release_builder.expected/retry_override_skip_target linux_target.json
index 1a4e275..187cab5 100644
--- a/recipes/release/release_builder.expected/retry_override_skip_target linux_target.json
+++ b/recipes/release/release_builder.expected/retry_override_skip_target linux_target.json
@@ -25,7 +25,7 @@
   },
   {
     "cmd": [],
-    "name": "Checkout flutter/mirrors/engine"
+    "name": "Checkout flutter/mirrors/flutter"
   },
   {
     "cmd": [
@@ -33,9 +33,9 @@
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[START_DIR]/mirrors/engine",
+      "[START_DIR]/mirrors/flutter",
       "--url",
-      "https://flutter.googlesource.com/mirrors/engine"
+      "https://flutter.googlesource.com/mirrors/flutter"
     ],
     "luci_context": {
       "realm": {
@@ -49,7 +49,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git setup",
+    "name": "Checkout flutter/mirrors/flutter.git setup",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -64,7 +64,7 @@
       "--progress",
       "--tags"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "env": {
       "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
     },
@@ -81,7 +81,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git fetch",
+    "name": "Checkout flutter/mirrors/flutter.git fetch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -93,7 +93,7 @@
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -107,7 +107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git checkout",
+    "name": "Checkout flutter/mirrors/flutter.git checkout",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -118,7 +118,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -132,7 +132,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.read revision",
+    "name": "Checkout flutter/mirrors/flutter.read revision",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -147,7 +147,7 @@
       "-d",
       "-x"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -161,7 +161,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git clean",
+    "name": "Checkout flutter/mirrors/flutter.git clean",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -172,7 +172,7 @@
       "submodule",
       "sync"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -186,7 +186,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule sync",
+    "name": "Checkout flutter/mirrors/flutter.submodule sync",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -199,7 +199,7 @@
       "--init",
       "--recursive"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -213,7 +213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule update",
+    "name": "Checkout flutter/mirrors/flutter.submodule update",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -234,7 +234,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -261,7 +261,7 @@
       "vpython3",
       "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
       "--yaml_file",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "--json_file",
       "/path/to/tmp/json"
     ],
@@ -290,6 +290,171 @@
       "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
       "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
       "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"name\": \"Linux flutter_test\",@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"release_build\": \"true\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      },@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    },@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"os=Mac\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"name\": \"Mac flutter_test\",@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"release_build\": \"true\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      },@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Identify branches"
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches.git rev-parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "branch",
+      "-a",
+      "--contains",
+      "12345abcde12345abcde12345abcde12345abcde"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches.git branch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "launch builds"
+  },
+  {
+    "cmd": [],
+    "name": "collect builds"
+  },
+  {
+    "cmd": [],
+    "name": "display builds"
+  },
+  {
+    "cmd": [],
+    "name": "read ci yaml (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@yaml@@@@",
+      "@@@STEP_LOG_END@yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).read",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@.ci.yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
+      "--yaml_file",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "--json_file",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
       "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux packaging one\",@@@",
       "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\"@@@",
@@ -317,7 +482,7 @@
   },
   {
     "cmd": [],
-    "name": "Identify branches"
+    "name": "Identify branches (2)"
   },
   {
     "cmd": [
@@ -325,7 +490,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -339,7 +504,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Identify branches.git rev-parse",
+    "name": "Identify branches (2).git rev-parse",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -352,7 +517,7 @@
       "--contains",
       "12345abcde12345abcde12345abcde12345abcde"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -366,22 +531,22 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Identify branches.git branch",
+    "name": "Identify branches (2).git branch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "launch builds"
+    "name": "launch builds (2)"
   },
   {
     "cmd": [],
-    "name": "collect builds"
+    "name": "collect builds (2)"
   },
   {
     "cmd": [],
-    "name": "display builds"
+    "name": "display builds (2)"
   },
   {
     "name": "$result"
diff --git a/recipes/release/release_builder.expected/retry_override_skip_target.json b/recipes/release/release_builder.expected/retry_override_skip_target.json
index 1a4e275..187cab5 100644
--- a/recipes/release/release_builder.expected/retry_override_skip_target.json
+++ b/recipes/release/release_builder.expected/retry_override_skip_target.json
@@ -25,7 +25,7 @@
   },
   {
     "cmd": [],
-    "name": "Checkout flutter/mirrors/engine"
+    "name": "Checkout flutter/mirrors/flutter"
   },
   {
     "cmd": [
@@ -33,9 +33,9 @@
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[START_DIR]/mirrors/engine",
+      "[START_DIR]/mirrors/flutter",
       "--url",
-      "https://flutter.googlesource.com/mirrors/engine"
+      "https://flutter.googlesource.com/mirrors/flutter"
     ],
     "luci_context": {
       "realm": {
@@ -49,7 +49,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git setup",
+    "name": "Checkout flutter/mirrors/flutter.git setup",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -64,7 +64,7 @@
       "--progress",
       "--tags"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "env": {
       "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
     },
@@ -81,7 +81,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git fetch",
+    "name": "Checkout flutter/mirrors/flutter.git fetch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -93,7 +93,7 @@
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -107,7 +107,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git checkout",
+    "name": "Checkout flutter/mirrors/flutter.git checkout",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -118,7 +118,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -132,7 +132,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.read revision",
+    "name": "Checkout flutter/mirrors/flutter.read revision",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
@@ -147,7 +147,7 @@
       "-d",
       "-x"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -161,7 +161,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.git clean",
+    "name": "Checkout flutter/mirrors/flutter.git clean",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -172,7 +172,7 @@
       "submodule",
       "sync"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -186,7 +186,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule sync",
+    "name": "Checkout flutter/mirrors/flutter.submodule sync",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -199,7 +199,7 @@
       "--init",
       "--recursive"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -213,7 +213,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Checkout flutter/mirrors/engine.submodule update",
+    "name": "Checkout flutter/mirrors/flutter.submodule update",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -234,7 +234,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -261,7 +261,7 @@
       "vpython3",
       "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
       "--yaml_file",
-      "[START_DIR]/mirrors/engine/.ci.yaml",
+      "[START_DIR]/mirrors/flutter/engine/src/flutter/.ci.yaml",
       "--json_file",
       "/path/to/tmp/json"
     ],
@@ -290,6 +290,171 @@
       "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
       "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
       "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"name\": \"Linux flutter_test\",@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"release_build\": \"true\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      },@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    },@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"os=Mac\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"name\": \"Mac flutter_test\",@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"release_build\": \"true\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      },@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"recipe\": \"release/something\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Identify branches"
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches.git rev-parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "branch",
+      "-a",
+      "--contains",
+      "12345abcde12345abcde12345abcde12345abcde"
+    ],
+    "cwd": "[START_DIR]/mirrors/flutter/engine/src/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Identify branches.git branch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "launch builds"
+  },
+  {
+    "cmd": [],
+    "name": "collect builds"
+  },
+  {
+    "cmd": [],
+    "name": "display builds"
+  },
+  {
+    "cmd": [],
+    "name": "read ci yaml (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@yaml@@@@",
+      "@@@STEP_LOG_END@yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).read",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@.ci.yaml@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "RECIPE_MODULE[flutter::yaml]/resources/parse_yaml.py",
+      "--yaml_file",
+      "[START_DIR]/mirrors/flutter/.ci.yaml",
+      "--json_file",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "prod:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "read ci yaml (2).parse",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"drone_dimensions\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"os=Linux\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"enabled_branches\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"flutter-3.2-candidate.5\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
       "@@@STEP_LOG_LINE@json.output@      \"name\": \"linux packaging one\",@@@",
       "@@@STEP_LOG_LINE@json.output@      \"properties\": {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"$flutter/osx_sdk\": \"{\\\"sdk_version\\\": \\\"14a5294e\\\"}\"@@@",
@@ -317,7 +482,7 @@
   },
   {
     "cmd": [],
-    "name": "Identify branches"
+    "name": "Identify branches (2)"
   },
   {
     "cmd": [
@@ -325,7 +490,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -339,7 +504,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Identify branches.git rev-parse",
+    "name": "Identify branches (2).git rev-parse",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -352,7 +517,7 @@
       "--contains",
       "12345abcde12345abcde12345abcde12345abcde"
     ],
-    "cwd": "[START_DIR]/mirrors/engine",
+    "cwd": "[START_DIR]/mirrors/flutter",
     "infra_step": true,
     "luci_context": {
       "realm": {
@@ -366,22 +531,22 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Identify branches.git branch",
+    "name": "Identify branches (2).git branch",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "launch builds"
+    "name": "launch builds (2)"
   },
   {
     "cmd": [],
-    "name": "collect builds"
+    "name": "collect builds (2)"
   },
   {
     "cmd": [],
-    "name": "display builds"
+    "name": "display builds (2)"
   },
   {
     "name": "$result"
diff --git a/recipes/release/release_builder.expected/throws_assertion_on_unsupported_repo.json b/recipes/release/release_builder.expected/throws_assertion_on_unsupported_repo.json
deleted file mode 100644
index f551d02..0000000
--- a/recipes/release/release_builder.expected/throws_assertion_on_unsupported_repo.json
+++ /dev/null
@@ -1,256 +0,0 @@
-[
-  {
-    "cmd": [
-      "top",
-      "-b",
-      "-n",
-      "3",
-      "-o",
-      "%MEM"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "OS info"
-  },
-  {
-    "cmd": [],
-    "name": "Checkout flutter/openpay"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/openpay",
-      "--url",
-      "https://dash-internal.googlesource.com/openpay"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/openpay.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "flutter-3.2-candidate.5",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/openpay",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/openpay.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/openpay",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/openpay.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/openpay",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/openpay.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/openpay",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/openpay.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/openpay",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/openpay.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/openpay",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart-internal:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout flutter/openpay.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "RECIPE CRASH (Uncaught exception)",
-    "~followup_annotations": [
-      "@@@STEP_EXCEPTION@@@",
-      "The recipe has crashed at point 'Uncaught exception'!",
-      "",
-      "Traceback (most recent call last):",
-      "  File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps",
-      "    raw_result = recipe_obj.run_steps(api, engine)",
-      "                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps",
-      "    recipe_result = invoke_with_properties(",
-      "                    ^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties",
-      "    return _invoke_with_properties(callable_obj, all_props, environ, prop_defs,",
-      "           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties",
-      "    return callable_obj(*props, **additional_args)",
-      "           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[flutter]/recipes/release/release_builder.py\", line 158, in RunSteps",
-      "    context = GetRepoContext(api, repository, checkout_path)",
-      "              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
-      "  File \"RECIPE_REPO[flutter]/recipes/release/release_builder.py\", line 114, in GetRepoContext",
-      "    assert False, f'the repository {repository} is not supported by the release/release_builder.py recipe'",
-      "           ^^^^^",
-      "AssertionError: the repository openpay is not supported by the release/release_builder.py recipe"
-    ]
-  },
-  {
-    "failure": {
-      "humanReason": "Uncaught Exception: AssertionError('the repository openpay is not supported by the release/release_builder.py recipe')"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/release/release_builder.py b/recipes/release/release_builder.py
index aa0741f..dce030a 100644
--- a/recipes/release/release_builder.py
+++ b/recipes/release/release_builder.py
@@ -33,21 +33,8 @@
 RELEASE_CHANNELS = ('refs/heads/beta', 'refs/heads/stable')
 
 
-# TODO(fujino): delete this once Flutter monorepo reaches stable channel
-class RepoContext(Enum):
-  """An enum covering the possible Flutter repository types this recipe will be invoked on."""
-  SINGLE_REPO_FRAMEWORK = 0
-  SINGLE_REPO_ENGINE = 1
-  MONOREPO = 2
-
-
-def ShouldRun(
-    api, git_ref, target, release_branch, retry_override_list, repo_context
-):
-  """Validates if a target should run based on platform, channel and repo.
-
-  If repo_context == RepoContext.MONOREPO, then the target platform does not
-  need to match the current platform."""
+def ShouldRun(api, git_ref, target, release_branch, retry_override_list):
+  """Validates if a target should run based on platform, channel and repo."""
 
   # If retry_override_list list of targets to retry has been provided,
   # skip the target if not specified on list.
@@ -69,17 +56,15 @@
       # Current branch didn't match any of the enabled branches.
       return False
 
-  release_build = target.get('properties', {}).get('release_build', '') == 'true'
-  for_this_platform = target['name'].lower().startswith(api.platform.name)
-  # Postsubmit for engine and flutter repositories.
-  # TODO(fujino): once 3.29 reaches stable, ignore repo_context
-  if (release_build and
-      (repo_context == RepoContext.MONOREPO or for_this_platform) and
-      (git_ref not in RELEASE_CHANNELS)):
+  # Postsubmit for the flutter repository.
+  release_build = target.get('properties',
+                             {}).get('release_build', '') == 'true'
+  if (release_build and git_ref not in RELEASE_CHANNELS):
     return True
   # Packaging for the flutter repository.
+  for_this_platform = target['name'].lower().startswith(api.platform.name)
   if (target.get('scheduler') == 'release' and for_this_platform and
-      (git_ref in RELEASE_CHANNELS) and
+      git_ref in RELEASE_CHANNELS and
       git_ref.replace('refs/heads/', '') in target.get('enabled_branches', [])):
     return True
   return False
@@ -104,19 +89,7 @@
   return (repository, url, ref)
 
 
-def GetRepoContext(api, repository, root):
-  if repository in ('engine', 'mirrors/engine'):
-    return RepoContext.SINGLE_REPO_ENGINE
-  if repository in ('flutter', 'mirrors/flutter'):
-    if api.path.exists(root / 'engine'):
-      return RepoContext.MONOREPO
-    return RepoContext.SINGLE_REPO_FRAMEWORK
-  assert False, f'the repository {repository} is not supported by the release/release_builder.py recipe'
-
-
-def ScheduleBuildsForRepo(
-    api, checkout_path, git_ref, retry_override_list, context
-):
+def ScheduleBuildsForRepo(api, checkout_path, git_ref, retry_override_list):
   ci_yaml_path = checkout_path / '.ci.yaml'
   ci_yaml = api.yaml.read('read ci yaml', ci_yaml_path, api.json.output())
 
@@ -131,12 +104,10 @@
   build_results = []
   with api.step.nest('launch builds') as presentation:
     for target in ci_yaml.json.output['targets']:
-      if ShouldRun(api, git_ref, target, release_branch, retry_override_list,
-                   context):
+      if ShouldRun(api, git_ref, target, release_branch, retry_override_list):
         target = api.shard_util.pre_process_properties(target)
-        if context == RepoContext.MONOREPO:
-          properties = target.setdefault('properties', {})
-          properties['is_fusion'] = 'true'
+        properties = target.setdefault('properties', {})
+        properties['is_fusion'] = 'true'
         tasks.update(
             api.shard_util.schedule([target],
                                     presentation,
@@ -155,8 +126,6 @@
       repository, checkout_path=checkout_path, url=git_url, ref=git_ref
   )
 
-  context = GetRepoContext(api, repository, checkout_path)
-
   # retry_override_list is optional and is a space separated string of
   # the config_name of targets to explitly retry
   retry_override_list = api.properties.get('retry_override_list', '').split()
@@ -170,35 +139,23 @@
         raise_on_failure=True,
     )
 
-  if context in (RepoContext.SINGLE_REPO_FRAMEWORK, RepoContext.SINGLE_REPO_ENGINE):
-    collect_and_display_builds(
-        ScheduleBuildsForRepo(
-            api, checkout_path, git_ref, retry_override_list, context
-        )
-    )
-  elif context == RepoContext.MONOREPO:
-    collect_and_display_builds(
-        ScheduleBuildsForRepo(
-            api,
-            checkout_path / 'engine' / 'src' / 'flutter',
-            git_ref,
-            retry_override_list,
-            context,
-        )
-    )
+  collect_and_display_builds(
+      ScheduleBuildsForRepo(
+          api,
+          checkout_path / 'engine' / 'src' / 'flutter',
+          git_ref,
+          retry_override_list,
+      )
+  )
 
-    collect_and_display_builds(
-        ScheduleBuildsForRepo(
-            api,
-            checkout_path,
-            git_ref,
-            retry_override_list,
-            context,
-        )
-    )
-  else:
-    assert False, "You must update release/release_builder.py to handle a new RepoContext"  # pragma: nocover
-
+  collect_and_display_builds(
+      ScheduleBuildsForRepo(
+          api,
+          checkout_path,
+          git_ref,
+          retry_override_list,
+      )
+  )
 
 
 def GenTests(api):
@@ -208,55 +165,65 @@
       output_props={"test_orchestration_inputs_hash": "abc"},
       status="SUCCESS",
   )
-  tasks_dict = {
-      'targets': [{
-          'name': 'linux one', 'recipe': 'engine/something', 'properties': {
-              'release_build': 'true',
-              '$flutter/osx_sdk': '{"sdk_version": "14a5294e"}'
-          }, 'drone_dimensions': ['os=Linux']
-      }, {
-          'name': 'linux packaging one', 'recipe': 'release/something',
-          'scheduler': 'release',
-          'properties': {'$flutter/osx_sdk': '{"sdk_version": "14a5294e"}'},
-          'enabled_branches': ['beta',
-                               'main'], 'drone_dimensions': ['os=Linux']
-      }]
-  }
   for git_ref in ['main', 'beta']:
-    # TODO(fujino): delete once 3.29 reaches stable
-    for is_monorepo in [True, False]:
-      props = [
-          api.platform.name('linux'),
-          api.properties(environment='Staging', repository='engine'),
-          api.buildbucket.try_build(
-              project='prod',
-              builder='try-builder',
-              git_repo='https://flutter.googlesource.com/mirrors/engine',
-              revision='a' * 40,
-              build_number=123,
-              git_ref='refs/heads/%s' % git_ref,
-          ),
-          api.shard_util.child_build_steps(
-              subbuilds=[try_subbuild1],
-              launch_step="launch builds.schedule",
-              collect_step="collect builds",
-          ),
-          api.step_data('read ci yaml.parse', api.json.output(tasks_dict)),
-      ]
-
-      if is_monorepo:
-        yield api.test(
-            'base_linux_%s_monorepo' % git_ref,
-            api.path.dirs_exist(
-                api.path.start_dir / 'mirrors' / 'flutter' / 'engine',
-            ),
-            *props,
-        )
-      else:
-        yield api.test(
-            'base_linux_%s' % git_ref,
-            *props,
-        )
+    yield api.test(
+        'base_linux_%s_monorepo' % git_ref,
+        api.path.dirs_exist(
+            api.path.start_dir / 'mirrors' / 'flutter' / 'engine',
+        ),
+        api.platform.name('linux'),
+        api.properties(
+            environment='Staging',
+            repository='flutter',
+        ),
+        api.buildbucket.try_build(
+            project='prod',
+            builder='try-builder',
+            git_repo='https://flutter.googlesource.com/mirrors/flutter',
+            revision='a' * 40,
+            build_number=123,
+            git_ref='refs/heads/%s' % git_ref,
+        ),
+        api.shard_util.child_build_steps(
+            subbuilds=[try_subbuild1],
+            launch_step="launch builds.schedule",
+            collect_step="collect builds",
+        ),
+        # Engine .ci.yaml
+        api.step_data(
+            'read ci yaml.parse',
+            api.json.output({
+                'targets': [
+                    {
+                        'name': 'linux one',
+                        'recipe': 'engine/something',
+                        'properties': {
+                            'release_build': 'true',
+                            '$flutter/osx_sdk': '{"sdk_version": "14a5294e"}',
+                        },
+                        'drone_dimensions': ['os=Linux'],
+                    },
+                    {
+                        'name': 'linux packaging one',
+                        'recipe': 'release/something',
+                        'scheduler': 'release',
+                        'properties': {
+                            '$flutter/osx_sdk': '{"sdk_version": "14a5294e"}',
+                        },
+                        'enabled_branches': [
+                            'beta',
+                            'main',
+                        ],
+                        'drone_dimensions': ['os=Linux'],
+                    },
+                ]
+            })
+        ),
+        # Framework .ci.yaml
+        api.step_data(
+            'read ci yaml (2).parse', api.json.output({"targets": []})
+        ),
+    )
 
   git_ref = 'flutter-3.2-candidate.5'
   multiplatform_tasks = {
@@ -328,17 +295,29 @@
   }
   yield api.test(
       'filter_enabled_branches',
-      api.properties(environment='Staging', repository='engine'),
+      api.properties(
+          environment='Staging',
+          repository='flutter',
+      ),
+      api.platform.name('linux'),
+      api.path.dirs_exist(
+          api.path.start_dir / 'mirrors' / 'flutter' / 'engine',
+      ),
       api.buildbucket.try_build(
           project='prod',
           builder='try-builder',
-          git_repo='https://flutter.googlesource.com/mirrors/engine',
+          git_repo='https://flutter.googlesource.com/mirrors/flutter',
           revision='a' * 40,
           build_number=123,
           git_ref='refs/heads/%s' % git_ref,
       ),
+      # Engine .ci.yaml
       api.step_data(
-          'read ci yaml.parse', api.json.output(tasks_dict_scheduler)
+          'read ci yaml.parse', api.json.output(release_multiplatform_tasks)
+      ),
+      # Framework .ci.yaml
+      api.step_data(
+          'read ci yaml (2).parse', api.json.output(tasks_dict_scheduler)
       ),
       api.step_data(
           'Identify branches.git branch',
@@ -351,66 +330,32 @@
         'retry_override_%s' % retry_list,
         api.properties(
             environment='Staging',
-            repository='engine',
-            retry_override_list=retry_list
+            repository='flutter',
+            retry_override_list=retry_list,
+        ),
+        api.platform.name('linux'),
+        api.path.dirs_exist(
+            api.path.start_dir / 'mirrors' / 'flutter' / 'engine',
         ),
         api.buildbucket.try_build(
             project='prod',
             builder='try-builder',
-            git_repo='https://flutter.googlesource.com/mirrors/engine',
+            git_repo='https://flutter.googlesource.com/mirrors/flutter',
             revision='a' * 40,
             build_number=123,
             git_ref='refs/heads/%s' % git_ref
         ),
+        # Engine .ci.yaml
         api.step_data(
-            'read ci yaml.parse', api.json.output(tasks_dict_scheduler)
+            'read ci yaml.parse', api.json.output(release_multiplatform_tasks)
+        ),
+        # Framework .ci.yaml
+        api.step_data(
+            'read ci yaml (2).parse', api.json.output(tasks_dict_scheduler)
         ),
     )
 
   yield api.test(
-      'dart_internal',
-      api.properties(environment='Staging', repository='engine'),
-      api.buildbucket.try_build(
-          project='dart-internal',
-          bucket='flutter',
-          builder='prod-builder',
-          git_repo='https://flutter.googlesource.com/mirrors/engine',
-          revision='a' * 40,
-          build_number=123,
-          git_ref='refs/heads/%s' % git_ref,
-      ),
-      api.step_data(
-          'read ci yaml.parse', api.json.output(tasks_dict_scheduler)
-      ),
-      api.step_data(
-          'Identify branches.git branch',
-          stdout=api.raw_io
-          .output_text('branch1\nbranch2\nflutter-3.2-candidate.5')
-      ),
-  )
-  yield api.test(
-      'linux_framework_single_repo',
-      api.properties(environment='Staging', repository='framework'),
-      api.platform.name('linux'),
-      api.buildbucket.try_build(
-          project='dart-internal',
-          bucket='flutter',
-          builder='prod-builder',
-          git_repo='https://flutter.googlesource.com/mirrors/flutter',
-          revision='a' * 40,
-          build_number=123,
-          git_ref='refs/heads/%s' % git_ref,
-      ),
-      api.step_data(
-          'read ci yaml.parse', api.json.output(multiplatform_tasks)
-      ),
-      api.step_data(
-          'Identify branches.git branch',
-          stdout=api.raw_io
-          .output_text('branch1\nbranch2\nflutter-3.2-candidate.5')
-      ),
-  )
-  yield api.test(
       'linux_engine_monorepo_candidate',
       api.properties(
           environment='Staging',
@@ -444,20 +389,3 @@
           )
       ),
   )
-  yield api.test(
-      'throws_assertion_on_unsupported_repo',
-      api.properties(
-          environment='Staging',
-          git_repo='openpay',
-      ),
-      api.buildbucket.try_build(
-          project='dart-internal',
-          bucket='flutter',
-          builder='prod-builder',
-          git_repo='https://flutter.googlesource.com/mirrors/openpay',
-          revision='a' * 40,
-          build_number=123,
-          git_ref='refs/heads/%s' % git_ref,
-      ),
-      api.expect_exception('AssertionError'),
-  )