commit 3011bc8930a7c135d3e8c04589d4cdf58f340d99
author Godofredo Contreras <godofredoc@google.com> Wed Mar 08 15:57:08 2023 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Mar 08 15:57:08 2023 +0000
tree 43557c92b804dd1a700ed5ba3c451ab6e6507e14
parent 6c623024c031aefecb099ca7c2710e9436b49cbe

Move packaging_v2 to packaging for a soft transition.

packaging/packaging recipes was replace with packaging_v2/packaging_v2.
Now that packaging_v2 has been running on prod for a few months we are
renaming it as packaging and remove packaging_v2.

Bug: https://github.com/flutter/flutter/issues/121735
Change-Id: I4857c673170e70baf14b154b080d86e17b1e2b9b
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/39940
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
(cherry picked from commit 3d708a2aeda0b7924479e6ec7b6793b276110228)
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/39960
Reviewed-by: Jesse Seales <jseales@google.com>

recipes/packaging/packaging.expected/linux_beta_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_prod.json b/recipes/packaging/packaging.expected/linux_beta_experimental_prod.json
deleted file mode 100644
index 2be9903..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_prod.json
+++ /dev/null
@@ -1,723 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_beta_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_upload_staging.json b/recipes/packaging/packaging.expected/linux_beta_experimental_upload_staging.json
deleted file mode 100644
index 02f2918..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_upload_staging.json
+++ /dev/null
@@ -1,723 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_beta_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_prod.json b/recipes/packaging/packaging.expected/linux_beta_prod.json
deleted file mode 100644
index 16d63d3..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_prod.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_beta_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_staging.json b/recipes/packaging/packaging.expected/linux_beta_staging.json
deleted file mode 100644
index 9b6b915..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_staging.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_beta_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_upload_prod.json b/recipes/packaging/packaging.expected/linux_beta_upload_prod.json
deleted file mode 100644
index 16d63d3..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_upload_prod.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_beta_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_upload_staging.json b/recipes/packaging/packaging.expected/linux_beta_upload_staging.json
deleted file mode 100644
index 9b6b915..0000000
--- a/recipes/packaging/packaging.expected/linux_beta_upload_staging.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_invalidbeta_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_experimental_flutter.json
index 63bc697..e0d7dcd 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_experimental_prod.json
index 63bc697..ddccbeb 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_experimental_staging.json
index 74bde44..d9a2534 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_flutter.json
index 63bc697..e0d7dcd 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_prod.json
index 63bc697..ddccbeb 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_staging.json
index 74bde44..d9a2534 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidbeta_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_flutter.json
index 63bc697..e0d7dcd 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidbeta_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_prod.json
index 63bc697..ddccbeb 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/linux_invalidbeta_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_staging.json
index 74bde44..d9a2534 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidbeta_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_upload_flutter.json
index 63bc697..e0d7dcd 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_prod.json b/recipes/packaging/packaging.expected/linux_invalidbeta_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_upload_prod.json
index 63bc697..ddccbeb 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidbeta_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_staging.json b/recipes/packaging/packaging.expected/linux_invalidbeta_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidbeta_upload_staging.json
index 74bde44..d9a2534 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_flutter.json
index 63bc697..a54ba8a 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_prod.json
index 63bc697..7e68e46 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_staging.json
index 74bde44..cab1a9b 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_flutter.json
index 63bc697..a54ba8a 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_prod.json
index 63bc697..7e68e46 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
rename to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_staging.json
index 74bde44..cab1a9b 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_flutter.json
index 63bc697..a54ba8a 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_prod.json
index 63bc697..7e68e46 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_staging.json
index 74bde44..cab1a9b 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_flutter.json
index 63bc697..a54ba8a 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_prod.json
index 63bc697..7e68e46 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_staging.json
index 74bde44..cab1a9b 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidmaster_experimental_flutter.json
index 63bc697..1786016 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
rename to recipes/packaging/packaging.expected/linux_invalidmaster_experimental_prod.json
index 63bc697..e208893 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
rename to recipes/packaging/packaging.expected/linux_invalidmaster_experimental_staging.json
index 74bde44..47ee826 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_flutter.json
index 63bc697..1786016 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
rename to recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_prod.json
index 63bc697..e208893 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_staging.json
index 74bde44..47ee826 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidmaster_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidmaster_flutter.json
index 63bc697..1786016 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_prod.json b/recipes/packaging/packaging.expected/linux_invalidmaster_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_master_prod.json
rename to recipes/packaging/packaging.expected/linux_invalidmaster_prod.json
index 63bc697..e208893 100644
--- a/recipes/packaging/packaging.expected/linux_master_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_staging.json b/recipes/packaging/packaging.expected/linux_invalidmaster_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_master_staging.json
rename to recipes/packaging/packaging.expected/linux_invalidmaster_staging.json
index 74bde44..47ee826 100644
--- a/recipes/packaging/packaging.expected/linux_master_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidmaster_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidmaster_upload_flutter.json
index 63bc697..1786016 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_prod.json b/recipes/packaging/packaging.expected/linux_invalidmaster_upload_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_master_upload_prod.json
rename to recipes/packaging/packaging.expected/linux_invalidmaster_upload_prod.json
index 63bc697..e208893 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidmaster_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_staging.json b/recipes/packaging/packaging.expected/linux_invalidmaster_upload_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_master_upload_staging.json
rename to recipes/packaging/packaging.expected/linux_invalidmaster_upload_staging.json
index 74bde44..47ee826 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_experimental_flutter.json
index 63bc697..289f52f 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_experimental_prod.json
index 63bc697..0035d6d 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_experimental_staging.json
index 74bde44..57743e0 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_flutter.json
index 63bc697..289f52f 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_prod.json
index 63bc697..0035d6d 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_staging.json
index 74bde44..57743e0 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidstable_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_flutter.json
index 63bc697..289f52f 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidstable_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_prod.json
index 63bc697..0035d6d 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/linux_invalidstable_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_staging.json
index 74bde44..57743e0 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidstable_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_upload_flutter.json
index 63bc697..289f52f 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/linux_invalidstable_upload_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_upload_prod.json
index 63bc697..0035d6d 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_invalidstable_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_staging.json b/recipes/packaging/packaging.expected/linux_invalidstable_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_staging.json
copy to recipes/packaging/packaging.expected/linux_invalidstable_upload_staging.json
index 74bde44..57743e0 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_flutter.json
new file mode 100644
index 0000000..2163b6c
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_flutter.json
@@ -0,0 +1,1164 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "beta",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=beta"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_linux.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_prod.json
index 602698f..5252585 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,7 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_staging.json
similarity index 99%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_staging.json
index 1bca559..bbb3cdf 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,7 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_flutter.json
new file mode 100644
index 0000000..2163b6c
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_flutter.json
@@ -0,0 +1,1164 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "beta",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=beta"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_linux.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_prod.json
index 602698f..5252585 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,7 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_staging.json
index 1bca559..bbb3cdf 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,7 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_beta_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_beta_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_flutter.json
new file mode 100644
index 0000000..6c3d557
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_flutter.json
@@ -0,0 +1,1424 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "beta",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=beta"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_linux.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_2/releases/beta/linux"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/linux"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_2/releases/beta/linux"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/linux/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_beta_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_beta_prod.json
index 69e16f2..c9c3363 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -719,6 +719,165 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/beta/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/beta/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_beta_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/linux_beta_experimental_staging.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_beta_staging.json
index 02f2918..bbb3cdf 100644
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_flutter.json
new file mode 100644
index 0000000..6c3d557
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_flutter.json
@@ -0,0 +1,1424 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "beta",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=beta"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_linux.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_2/releases/beta/linux"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/linux"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_2/releases/beta/linux"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/linux/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/beta/linux/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_prod.json
index 69e16f2..c9c3363 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -719,6 +719,165 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/beta/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/beta/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_staging.json
similarity index 99%
copy from recipes/packaging/packaging.expected/linux_beta_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_staging.json
index 02f2918..bbb3cdf 100644
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_flutter.json
similarity index 71%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_flutter.json
index 69e16f2..049a863 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +543,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +558,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +588,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -515,6 +602,52 @@
   },
   {
     "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -551,7 +684,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +736,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +754,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +783,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -661,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -702,7 +834,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -719,6 +851,98 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_prod.json
index 69e16f2..18c2ad6 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_stable_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_staging.json
index 0a20e1b..aac2ad7 100644
--- a/recipes/packaging/packaging.expected/linux_stable_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_flutter.json
similarity index 71%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_flutter.json
index 69e16f2..049a863 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +543,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +558,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +588,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -515,6 +602,52 @@
   },
   {
     "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -551,7 +684,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +736,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +754,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +783,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -661,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -702,7 +834,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -719,6 +851,98 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_prod.json
index 69e16f2..18c2ad6 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_stable_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_staging.json
index 0a20e1b..aac2ad7 100644
--- a/recipes/packaging/packaging.expected/linux_stable_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_flutter.json
new file mode 100644
index 0000000..485708e
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_flutter.json
@@ -0,0 +1,1208 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "flutter-release-test",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=flutter-release-test"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_prod.json
index 69e16f2..6f65b40 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -719,6 +719,165 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_stable_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_staging.json
index 0a20e1b..aac2ad7 100644
--- a/recipes/packaging/packaging.expected/linux_stable_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_flutter.json
new file mode 100644
index 0000000..485708e
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_flutter.json
@@ -0,0 +1,1208 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "flutter-release-test",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=flutter-release-test"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_prod.json
index 69e16f2..6f65b40 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -719,6 +719,165 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_upload_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/mac_beta_upload_staging.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_staging.json
index 4b1527c..aac2ad7 100644
--- a/recipes/packaging/packaging.expected/mac_beta_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -436,7 +436,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +481,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -529,7 +530,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -581,7 +582,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -630,7 +630,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -680,7 +680,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"

recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_flutter.json
similarity index 71%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_flutter.json
index 69e16f2..94e1683 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +543,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +558,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +588,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -515,6 +602,52 @@
   },
   {
     "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -551,7 +684,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +736,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +754,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +783,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -661,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -702,7 +834,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -719,6 +851,98 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/linux_stable_prod.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_prod.json
index 69e16f2..e0fa507 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_staging.json
index 4b1527c..8a40040 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -436,7 +436,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +481,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -529,7 +530,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -581,7 +582,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -630,7 +630,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -680,7 +680,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"

recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_flutter.json
similarity index 71%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_flutter.json
index 69e16f2..94e1683 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +543,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +558,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +588,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -515,6 +602,52 @@
   },
   {
     "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -551,7 +684,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +736,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +754,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +783,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -661,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -702,7 +834,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -719,6 +851,98 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_prod.json
similarity index 99%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_prod.json
index 602698f..e0fa507 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,7 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_staging.json
similarity index 99%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_staging.json
index 1bca559..8a40040 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,7 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_master_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_master_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_flutter.json
new file mode 100644
index 0000000..fbf0622
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_flutter.json
@@ -0,0 +1,1208 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=master"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/master/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/master/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_master_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_prod.json
index 69e16f2..cd8307c 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -719,6 +719,165 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/master/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/master/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_master_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_staging.json
index 4b1527c..8a40040 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -436,7 +436,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +481,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -529,7 +530,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -581,7 +582,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -630,7 +630,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -680,7 +680,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"

recipes/packaging/packaging.expected/linux_refs_heads_master_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_master_upload_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_upload_flutter.json
new file mode 100644
index 0000000..fbf0622
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_upload_flutter.json
@@ -0,0 +1,1208 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=master"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/master/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/master/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_master_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_upload_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_upload_prod.json
index 69e16f2..cd8307c 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -719,6 +719,165 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/master/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/master/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_master_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_master_upload_staging.json
index 4b1527c..8a40040 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -436,7 +436,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +481,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -529,7 +530,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -581,7 +582,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -630,7 +630,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -680,7 +680,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "darwin",
+      "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"

recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_flutter.json
new file mode 100644
index 0000000..4918fd1
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_flutter.json
@@ -0,0 +1,1164 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "stable",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=stable"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_linux.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_prod.json
similarity index 99%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_prod.json
index 602698f..23ce1aa 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_staging.json
index 1bca559..1ab46e9 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_flutter.json
new file mode 100644
index 0000000..4918fd1
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_flutter.json
@@ -0,0 +1,1164 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "stable",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=stable"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_linux.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_prod.json
similarity index 99%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_prod.json
index 602698f..23ce1aa 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_staging.json
similarity index 99%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_staging.json
index 1bca559..1ab46e9 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_stable_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_stable_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_flutter.json
new file mode 100644
index 0000000..6f23d8e
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_flutter.json
@@ -0,0 +1,1424 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "stable",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=stable"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_linux.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_2/releases/stable/linux"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/linux"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_2/releases/stable/linux"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/linux/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_stable_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_stable_prod.json
index 69e16f2..900b40d 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -719,6 +719,165 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/stable/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/stable/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_stable_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/linux_stable_staging.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_stable_staging.json
index 0a20e1b..1ab46e9 100644
--- a/recipes/packaging/packaging.expected/linux_stable_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_flutter.json
new file mode 100644
index 0000000..6f23d8e
--- /dev/null
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_flutter.json
@@ -0,0 +1,1424 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "stable",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=stable"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_linux.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_2/releases/stable/linux"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/linux"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_2/releases/stable/linux"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/linux/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "6e952a2780379c93ce1a23bd0a3a2f8770877fc02ae8685b99f3308128f39950",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/stable/linux/flutter-archive-package.tar.xz"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_prod.json
index 69e16f2..900b40d 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -719,6 +719,165 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/stable/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/linux/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.tar.xz",
+      "[CLEANUP]/tmp_tmp_1/releases/stable/linux/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/linux/experimental/flutter-archive-package.tar.xz"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "linux",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/linux/experimental/flutter-archive-package.tar.xz",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_upload_staging.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/linux_stable_upload_staging.json
rename to recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_staging.json
index 0a20e1b..1ab46e9 100644
--- a/recipes/packaging/packaging.expected/linux_stable_upload_staging.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [

recipes/packaging/packaging.expected/linux_stable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_upload_prod.json b/recipes/packaging/packaging.expected/linux_stable_upload_prod.json
deleted file mode 100644
index 69e16f2..0000000
--- a/recipes/packaging/packaging.expected/linux_stable_upload_prod.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
index 63bc697..e0d7dcd 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_experimental_prod.json
index 63bc697..ddccbeb 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_experimental_staging.json
index 74bde44..d9a2534 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_flutter.json
index 63bc697..e0d7dcd 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_prod.json
index 63bc697..ddccbeb 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_staging.json
index 74bde44..d9a2534 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
index 63bc697..e0d7dcd 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_prod.json
index 63bc697..ddccbeb 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidbeta_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_staging.json
index 74bde44..d9a2534 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_upload_flutter.json
index 63bc697..e0d7dcd 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_upload_prod.json
index 63bc697..ddccbeb 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidbeta_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_staging.json b/recipes/packaging/packaging.expected/mac_invalidbeta_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidbeta_upload_staging.json
index 74bde44..d9a2534 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
index 63bc697..a54ba8a 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_prod.json
index 63bc697..7e68e46 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_staging.json
index 74bde44..cab1a9b 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_flutter.json
index 63bc697..a54ba8a 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_prod.json
index 63bc697..7e68e46 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_staging.json
index 74bde44..cab1a9b 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
index 63bc697..a54ba8a 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_prod.json
index 63bc697..7e68e46 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_staging.json
index 74bde44..cab1a9b 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_flutter.json
index 63bc697..a54ba8a 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_prod.json
index 63bc697..7e68e46 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_staging.json
index 74bde44..cab1a9b 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
index 63bc697..1786016 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_experimental_prod.json
index 63bc697..e208893 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_experimental_staging.json
index 74bde44..47ee826 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_flutter.json
index 63bc697..1786016 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_prod.json
index 63bc697..e208893 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_staging.json
index 74bde44..47ee826 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
index 63bc697..1786016 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_prod.json
index 63bc697..e208893 100644
--- a/recipes/packaging/packaging.expected/linux_master_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_staging.json b/recipes/packaging/packaging.expected/mac_invalidmaster_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_staging.json
index 74bde44..47ee826 100644
--- a/recipes/packaging/packaging.expected/linux_master_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_upload_flutter.json
index 63bc697..1786016 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_upload_prod.json
index 63bc697..e208893 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidmaster_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_staging.json b/recipes/packaging/packaging.expected/mac_invalidmaster_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidmaster_upload_staging.json
index 74bde44..47ee826 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
index 63bc697..289f52f 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_experimental_prod.json
index 63bc697..0035d6d 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_experimental_staging.json
index 74bde44..57743e0 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_flutter.json
index 63bc697..289f52f 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_prod.json
index 63bc697..0035d6d 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_staging.json
index 74bde44..57743e0 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
index 63bc697..289f52f 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_prod.json
index 63bc697..0035d6d 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidstable_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/linux_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_staging.json
index 74bde44..57743e0 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_upload_flutter.json
similarity index 75%
copy from recipes/packaging/packaging.expected/linux_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_upload_flutter.json
index 63bc697..289f52f 100644
--- a/recipes/packaging/packaging.expected/linux_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +514,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_prod.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_upload_prod.json
index 63bc697..0035d6d 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_invalidstable_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/linux_master_upload_staging.json b/recipes/packaging/packaging.expected/mac_invalidstable_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_master_upload_staging.json
copy to recipes/packaging/packaging.expected/mac_invalidstable_upload_staging.json
index 74bde44..57743e0 100644
--- a/recipes/packaging/packaging.expected/linux_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/mac_master_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_master_experimental_prod.json
deleted file mode 100644
index 63bc697..0000000
--- a/recipes/packaging/packaging.expected/mac_master_experimental_prod.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_master_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_master_experimental_staging.json
deleted file mode 100644
index 74bde44..0000000
--- a/recipes/packaging/packaging.expected/mac_master_experimental_staging.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_master_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/mac_master_experimental_upload_prod.json
deleted file mode 100644
index 63bc697..0000000
--- a/recipes/packaging/packaging.expected/mac_master_experimental_upload_prod.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_master_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/mac_master_experimental_upload_staging.json
deleted file mode 100644
index 74bde44..0000000
--- a/recipes/packaging/packaging.expected/mac_master_experimental_upload_staging.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_master_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_master_prod.json b/recipes/packaging/packaging.expected/mac_master_prod.json
deleted file mode 100644
index 63bc697..0000000
--- a/recipes/packaging/packaging.expected/mac_master_prod.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_master_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_master_staging.json b/recipes/packaging/packaging.expected/mac_master_staging.json
deleted file mode 100644
index 74bde44..0000000
--- a/recipes/packaging/packaging.expected/mac_master_staging.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_master_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_master_upload_prod.json b/recipes/packaging/packaging.expected/mac_master_upload_prod.json
deleted file mode 100644
index 63bc697..0000000
--- a/recipes/packaging/packaging.expected/mac_master_upload_prod.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_master_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_master_upload_staging.json b/recipes/packaging/packaging.expected/mac_master_upload_staging.json
deleted file mode 100644
index 74bde44..0000000
--- a/recipes/packaging/packaging.expected/mac_master_upload_staging.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json
new file mode 100644
index 0000000..84d99b2
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json
@@ -0,0 +1,1164 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "beta",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=beta"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_macos.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/mac_beta_experimental_prod.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_prod.json
index 9eb8c64..02bffe1 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/mac_beta_experimental_staging.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_staging.json
index 5477530..3e54adb 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_flutter.json
new file mode 100644
index 0000000..84d99b2
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_flutter.json
@@ -0,0 +1,1164 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "beta",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=beta"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_macos.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_upload_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/mac_beta_experimental_upload_prod.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_prod.json
index 9eb8c64..02bffe1 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_experimental_upload_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/mac_beta_experimental_upload_staging.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_staging.json
index 5477530..3e54adb 100644
--- a/recipes/packaging/packaging.expected/mac_beta_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json
new file mode 100644
index 0000000..d88ebb8
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json
@@ -0,0 +1,1424 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "beta",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=beta"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_macos.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/macos"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_beta_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/mac_beta_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_beta_prod.json
index 3b800d3..3fdf670 100644
--- a/recipes/packaging/packaging.expected/mac_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,11 +714,170 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_beta_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_beta_staging.json
index 4b1527c..3e54adb 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_flutter.json
new file mode 100644
index 0000000..d88ebb8
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_flutter.json
@@ -0,0 +1,1424 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "beta",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=beta"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_macos.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/macos"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_beta_experimental_upload_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_prod.json
similarity index 79%
rename from recipes/packaging/packaging.expected/linux_beta_experimental_upload_prod.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_prod.json
index 2be9903..3fdf670 100644
--- a/recipes/packaging/packaging.expected/linux_beta_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_prod.json
@@ -436,7 +436,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +481,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -529,7 +530,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -581,7 +582,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -629,7 +630,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -679,7 +680,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -713,11 +714,170 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_staging.json
index 4b1527c..3e54adb 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
similarity index 70%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
index 69e16f2..590ad80 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -436,7 +522,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -457,7 +543,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +558,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +567,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -501,7 +588,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -515,6 +602,52 @@
   },
   {
     "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -529,7 +662,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -551,7 +684,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -581,7 +714,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -603,7 +736,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +754,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -630,7 +762,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -651,7 +783,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -661,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +804,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -680,7 +812,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -702,7 +834,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -714,11 +846,103 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/mac_beta_prod.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
index 3b800d3..37e4ea6 100644
--- a/recipes/packaging/packaging.expected/mac_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/mac_beta_staging.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
index 4b1527c..5d0d631 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_flutter.json
similarity index 70%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_flutter.json
index 69e16f2..590ad80 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -436,7 +522,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -457,7 +543,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +558,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +567,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -501,7 +588,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -515,6 +602,52 @@
   },
   {
     "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -529,7 +662,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -551,7 +684,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -581,7 +714,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -603,7 +736,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +754,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -630,7 +762,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -651,7 +783,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -661,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +804,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -680,7 +812,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -702,7 +834,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -714,11 +846,103 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_prod.json
index 3b800d3..37e4ea6 100644
--- a/recipes/packaging/packaging.expected/mac_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_staging.json
index 4b1527c..5d0d631 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json
new file mode 100644
index 0000000..7b6fcf2
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json
@@ -0,0 +1,1208 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "flutter-release-test",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=flutter-release-test"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_prod.json
similarity index 78%
copy from recipes/packaging/packaging.expected/linux_stable_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_prod.json
index 69e16f2..e956430 100644
--- a/recipes/packaging/packaging.expected/linux_stable_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -436,7 +436,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +481,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -529,7 +530,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -581,7 +582,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -630,7 +630,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -680,7 +680,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -714,11 +714,170 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_staging.json
index 4b1527c..5d0d631 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_flutter.json
new file mode 100644
index 0000000..7b6fcf2
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_flutter.json
@@ -0,0 +1,1208 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "flutter-release-test",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=flutter-release-test"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_upload_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_prod.json
similarity index 79%
rename from recipes/packaging/packaging.expected/mac_beta_upload_prod.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_prod.json
index 3b800d3..e956430 100644
--- a/recipes/packaging/packaging.expected/mac_beta_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,11 +714,170 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_staging.json
index 4b1527c..5d0d631 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
similarity index 71%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
index 4b1527c..5c895bf 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +543,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +558,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +588,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -515,6 +602,52 @@
   },
   {
     "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -551,7 +684,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +736,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +754,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +783,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -661,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +804,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -702,7 +834,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -714,11 +846,103 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_prod.json
index 3b800d3..d59d1c5 100644
--- a/recipes/packaging/packaging.expected/mac_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_staging.json
index 4b1527c..d370db4 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_flutter.json
similarity index 71%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_flutter.json
index 4b1527c..5c895bf 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_flutter.json
@@ -1,5 +1,91 @@
 [
   {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
@@ -22,7 +108,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +128,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +140,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +166,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +191,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +220,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +245,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +272,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +310,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +342,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +368,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +393,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +422,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +447,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +474,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +499,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +543,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +558,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +588,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -515,6 +602,52 @@
   },
   {
     "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -551,7 +684,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +736,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -621,8 +754,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -651,7 +783,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -661,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +804,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -702,7 +834,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -714,11 +846,103 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_prod.json
index 602698f..d59d1c5 100644
--- a/recipes/packaging/packaging.expected/linux_stable_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -436,7 +436,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -480,7 +481,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -529,7 +530,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -581,7 +582,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -621,7 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=stable"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -629,7 +630,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -679,7 +680,7 @@
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
       "LUCI_PR": "",
-      "OS": "linux",
+      "OS": "darwin",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
       "REVISION": "12345abcde12345abcde12345abcde12345abcde",
       "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_staging.json
index 4b1527c..d370db4 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json
new file mode 100644
index 0000000..be4e887
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json
@@ -0,0 +1,1208 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=master"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_master_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/mac_beta_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_prod.json
index 3b800d3..268d681 100644
--- a/recipes/packaging/packaging.expected/mac_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,11 +714,170 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_master_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_staging.json
index 4b1527c..d370db4 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_master_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_upload_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_upload_flutter.json
new file mode 100644
index 0000000..be4e887
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_upload_flutter.json
@@ -0,0 +1,1208 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=master"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_master_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_upload_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/mac_beta_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_upload_prod.json
index 3b800d3..268d681 100644
--- a/recipes/packaging/packaging.expected/mac_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,11 +714,170 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_master_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_master_upload_staging.json
index 4b1527c..d370db4 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json
new file mode 100644
index 0000000..859599e
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json
@@ -0,0 +1,1164 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "stable",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=stable"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_macos.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/mac_stable_experimental_prod.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_prod.json
index 13f08e0..e183524 100644
--- a/recipes/packaging/packaging.expected/mac_stable_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/mac_stable_experimental_staging.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_staging.json
index daffa08..51ed297 100644
--- a/recipes/packaging/packaging.expected/mac_stable_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_flutter.json
new file mode 100644
index 0000000..859599e
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_flutter.json
@@ -0,0 +1,1164 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "stable",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=stable"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_macos.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental_upload_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/mac_stable_experimental_upload_prod.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_prod.json
index 13f08e0..e183524 100644
--- a/recipes/packaging/packaging.expected/mac_stable_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_stable_experimental_upload_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/mac_stable_experimental_upload_staging.json
rename to recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_staging.json
index daffa08..51ed297 100644
--- a/recipes/packaging/packaging.expected/mac_stable_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -660,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -671,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -713,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json
new file mode 100644
index 0000000..853b9d3
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json
@@ -0,0 +1,1424 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "stable",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=stable"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_macos.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/macos"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_stable_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/mac_beta_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_stable_prod.json
index 3b800d3..568f2c2 100644
--- a/recipes/packaging/packaging.expected/mac_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,11 +714,170 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_stable_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_stable_staging.json
index 4b1527c..51ed297 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_flutter.json
new file mode 100644
index 0000000..853b9d3
--- /dev/null
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_flutter.json
@@ -0,0 +1,1424 @@
+[
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/reporter",
+      "-ensure-file",
+      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "start",
+      "-recipe",
+      "packaging/packaging",
+      "-pid",
+      "12345"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "fetch"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (2)"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision"
+  },
+  {
+    "cmd": [],
+    "name": "determine release revision.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "stable",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "determine release revision.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master"
+  },
+  {
+    "cmd": [],
+    "name": "checkout framework from master.Checkout flutter/flutter",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
+      "--path",
+      "[START_DIR]/flutter",
+      "--url",
+      "https://flutter.googlesource.com/mirrors/flutter"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "fetch",
+      "origin",
+      "master",
+      "--recurse-submodules",
+      "--progress",
+      "--tags"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "env": {
+      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "checkout",
+      "-f",
+      "FETCH_HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "clean",
+      "-f",
+      "-d",
+      "-x"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "sync"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "submodule",
+      "update",
+      "--init",
+      "--recursive"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "rev-parse",
+      "HEAD"
+    ],
+    "cwd": "[START_DIR]/flutter",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "git rev-parse"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "doctor"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "flutter doctor"
+  },
+  {
+    "cmd": [
+      "flutter",
+      "update-packages",
+      "-v"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "download dependencies"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "compile"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (3)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "clean archive work directory"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]/archive"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "(re)create archive work directory"
+  },
+  {
+    "cmd": [
+      "dart",
+      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
+      "--temp_dir=[START_DIR]/archive",
+      "--revision=deadbeef",
+      "--branch=stable"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "prepare and create a flutter archive"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "*flutter*.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (4)"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/archive",
+      "releases_macos.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/releases_linux.json",
+      "[CLEANUP]/tmp_tmp_1/releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/macos"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "file_hash",
+      "[START_DIR]/archive/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Compute file hash",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Hash calculated: 238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-gcs",
+      "-digest",
+      "238444ff6db63b181b98fd7e8dc965764c162f4ec6e4f95bacbc9dc49f32b58f",
+      "-gcs-uri",
+      "gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_gcs"
+  },
+  {
+    "cmd": [
+      "[START_DIR]/reporter/snoopy_broker",
+      "-report-stage",
+      "-stage",
+      "upload-complete"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "snoop: report_stage (5)"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_prod.json
similarity index 79%
copy from recipes/packaging/packaging.expected/mac_beta_prod.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_prod.json
index 3b800d3..568f2c2 100644
--- a/recipes/packaging/packaging.expected/mac_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,11 +714,170 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/macos/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/archive/flutter-archive-package.zip",
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos/experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]/tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]/flutter/bin",
+        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/macos/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/mac_beta_staging.json
copy to recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_staging.json
index 4b1527c..51ed297 100644
--- a/recipes/packaging/packaging.expected/mac_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "beta",
+      "stable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -621,8 +622,7 @@
       "[START_DIR]/flutter/dev/bots/prepare_package.dart",
       "--temp_dir=[START_DIR]/archive",
       "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -661,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -672,7 +672,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]/archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -714,7 +714,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/mac_stable_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_stable_prod.json b/recipes/packaging/packaging.expected/mac_stable_prod.json
deleted file mode 100644
index da670e1..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_prod.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_stable_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_stable_staging.json b/recipes/packaging/packaging.expected/mac_stable_staging.json
deleted file mode 100644
index 0b31cc4..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_staging.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_stable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/mac_stable_upload_prod.json b/recipes/packaging/packaging.expected/mac_stable_upload_prod.json
deleted file mode 100644
index da670e1..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_upload_prod.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/mac_stable_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/mac_stable_upload_staging.json b/recipes/packaging/packaging.expected/mac_stable_upload_staging.json
deleted file mode 100644
index 0b31cc4..0000000
--- a/recipes/packaging/packaging.expected/mac_stable_upload_staging.json
+++ /dev/null
@@ -1,724 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
-      "--path",
-      "[START_DIR]/flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools]:<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "dart",
-      "[START_DIR]/flutter/dev/bots/prepare_package.dart",
-      "--temp_dir=[START_DIR]/archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]/archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]/archive/flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/win_beta_prod.json

diff --git a/recipes/packaging/packaging.expected/win_beta_prod.json b/recipes/packaging/packaging.expected/win_beta_prod.json
deleted file mode 100644
index 2d67bca..0000000
--- a/recipes/packaging/packaging.expected/win_beta_prod.json
+++ /dev/null
@@ -1,791 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/win_beta_staging.json

diff --git a/recipes/packaging/packaging.expected/win_beta_staging.json b/recipes/packaging/packaging.expected/win_beta_staging.json
deleted file mode 100644
index cdf2aec..0000000
--- a/recipes/packaging/packaging.expected/win_beta_staging.json
+++ /dev/null
@@ -1,791 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/win_beta_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_beta_upload_prod.json b/recipes/packaging/packaging.expected/win_beta_upload_prod.json
deleted file mode 100644
index 2d67bca..0000000
--- a/recipes/packaging/packaging.expected/win_beta_upload_prod.json
+++ /dev/null
@@ -1,791 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/win_beta_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_beta_upload_staging.json b/recipes/packaging/packaging.expected/win_beta_upload_staging.json
deleted file mode 100644
index cdf2aec..0000000
--- a/recipes/packaging/packaging.expected/win_beta_upload_staging.json
+++ /dev/null
@@ -1,791 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "beta",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=beta",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/win_invalidbeta_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_experimental_flutter.json
index 92af99b..889a13c 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_experimental_prod.json
index 0cd68d6..adfcf82 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_experimental_staging.json
index 92af99b..5fa335e 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_flutter.json
index 92af99b..889a13c 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_prod.json
index 0cd68d6..adfcf82 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_staging.json
index 92af99b..5fa335e 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_prod.json b/recipes/packaging/packaging.expected/win_invalidbeta_flutter.json
similarity index 93%
copy from recipes/packaging/packaging.expected/win_master_prod.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_flutter.json
index 0cd68d6..889a13c 100644
--- a/recipes/packaging/packaging.expected/win_master_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidbeta_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_prod.json
index 0cd68d6..adfcf82 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidbeta_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_staging.json
index 92af99b..5fa335e 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidbeta_upload_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_upload_flutter.json
index 92af99b..889a13c 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_upload_prod.json b/recipes/packaging/packaging.expected/win_invalidbeta_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_upload_prod.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_upload_prod.json
index 0cd68d6..adfcf82 100644
--- a/recipes/packaging/packaging.expected/win_master_upload_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidbeta_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_upload_staging.json b/recipes/packaging/packaging.expected/win_invalidbeta_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_upload_staging.json
copy to recipes/packaging/packaging.expected/win_invalidbeta_upload_staging.json
index 92af99b..5fa335e 100644
--- a/recipes/packaging/packaging.expected/win_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidbeta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_flutter.json
index 92af99b..9eb4bdc 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_prod.json
index 0cd68d6..f51beba 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_staging.json
index 92af99b..11e0b04 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_flutter.json
index 92af99b..9eb4bdc 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_prod.json
index 0cd68d6..f51beba 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_staging.json
index 92af99b..11e0b04 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_flutter.json
index 92af99b..9eb4bdc 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_prod.json
index 0cd68d6..f51beba 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_staging.json
index 92af99b..11e0b04 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_flutter.json
index 92af99b..9eb4bdc 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_prod.json
index 0cd68d6..f51beba 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_staging.json
index 92af99b..11e0b04 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidflutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidmaster_experimental_flutter.json
index 92af99b..90e4db2 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_master_experimental_prod.json
rename to recipes/packaging/packaging.expected/win_invalidmaster_experimental_prod.json
index 0cd68d6..27a3df2 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidmaster_experimental_staging.json
index 92af99b..8758b67 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_flutter.json
index 92af99b..90e4db2 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
rename to recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_prod.json
index 0cd68d6..27a3df2 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_staging.json
index 92af99b..8758b67 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidmaster_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidmaster_flutter.json
index 92af99b..90e4db2 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_prod.json b/recipes/packaging/packaging.expected/win_invalidmaster_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_master_prod.json
rename to recipes/packaging/packaging.expected/win_invalidmaster_prod.json
index 0cd68d6..27a3df2 100644
--- a/recipes/packaging/packaging.expected/win_master_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_staging.json b/recipes/packaging/packaging.expected/win_invalidmaster_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_master_staging.json
rename to recipes/packaging/packaging.expected/win_invalidmaster_staging.json
index 92af99b..8758b67 100644
--- a/recipes/packaging/packaging.expected/win_master_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidmaster_upload_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidmaster_upload_flutter.json
index 92af99b..90e4db2 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_upload_prod.json b/recipes/packaging/packaging.expected/win_invalidmaster_upload_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_master_upload_prod.json
rename to recipes/packaging/packaging.expected/win_invalidmaster_upload_prod.json
index 0cd68d6..27a3df2 100644
--- a/recipes/packaging/packaging.expected/win_master_upload_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidmaster_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_upload_staging.json b/recipes/packaging/packaging.expected/win_invalidmaster_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_upload_staging.json
copy to recipes/packaging/packaging.expected/win_invalidmaster_upload_staging.json
index 92af99b..8758b67 100644
--- a/recipes/packaging/packaging.expected/win_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidmaster",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidstable_experimental_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidstable_experimental_flutter.json
index 92af99b..a8a8b62 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_experimental_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidstable_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/win_invalidstable_experimental_prod.json
index 0cd68d6..cb6f22c 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidstable_experimental_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_master_experimental_staging.json
rename to recipes/packaging/packaging.expected/win_invalidstable_experimental_staging.json
index 92af99b..380c021 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_flutter.json
index 92af99b..a8a8b62 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json b/recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
copy to recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_prod.json
index 0cd68d6..cb6f22c 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json b/recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
rename to recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_staging.json
index 92af99b..380c021 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidstable_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidstable_flutter.json
index 92af99b..a8a8b62 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_prod.json b/recipes/packaging/packaging.expected/win_invalidstable_prod.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_prod.json
copy to recipes/packaging/packaging.expected/win_invalidstable_prod.json
index 0cd68d6..cb6f22c 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidstable_staging.json
similarity index 97%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidstable_staging.json
index 92af99b..380c021 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_master_experimental_staging.json b/recipes/packaging/packaging.expected/win_invalidstable_upload_flutter.json
similarity index 92%
copy from recipes/packaging/packaging.expected/win_master_experimental_staging.json
copy to recipes/packaging/packaging.expected/win_invalidstable_upload_flutter.json
index 92af99b..a8a8b62 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:staging"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_master_upload_prod.json b/recipes/packaging/packaging.expected/win_invalidstable_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_master_upload_prod.json
copy to recipes/packaging/packaging.expected/win_invalidstable_upload_prod.json
index 0cd68d6..cb6f22c 100644
--- a/recipes/packaging/packaging.expected/win_master_upload_prod.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_invalidstable_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_master_upload_staging.json b/recipes/packaging/packaging.expected/win_invalidstable_upload_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_master_upload_staging.json
rename to recipes/packaging/packaging.expected/win_invalidstable_upload_staging.json
index 92af99b..380c021 100644
--- a/recipes/packaging/packaging.expected/win_master_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "master",
+      "invalidstable",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -428,7 +428,7 @@
   {
     "failure": {
       "failure": {},
-      "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
+      "humanReason": "could not determine the release branch: \"git_ref\"property should be set when manually triggering builds"
     },
     "name": "$result"
   }

recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_flutter.json
similarity index 73%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_flutter.json
index 2652b05..395c073 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,231 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]\\archive",
+      "releases_windows.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\releases_linux.json",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/win_beta_experimental_prod.json
rename to recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_prod.json
index 8e00125..cf3c5c2 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/win_beta_experimental_staging.json
rename to recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_staging.json
index 813a7ee..ca1b74f 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_flutter.json
similarity index 73%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_flutter.json
index 2652b05..395c073 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,231 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]\\archive",
+      "releases_windows.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\releases_linux.json",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_upload_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/win_beta_experimental_upload_prod.json
rename to recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_prod.json
index 8e00125..cf3c5c2 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json
rename to recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_staging.json
index 813a7ee..ca1b74f 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_beta_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_flutter.json
similarity index 62%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_beta_flutter.json
index 2652b05..ac19999 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,393 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]\\archive",
+      "releases_windows.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\releases_linux.json",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/windows"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_beta_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_prod.json
similarity index 80%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_beta_prod.json
index 2652b05..9ca1db4 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_beta_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_beta_staging.json
index 9980b74..ca1b74f 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_beta_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_upload_flutter.json
similarity index 62%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_beta_upload_flutter.json
index 2652b05..ac19999 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,393 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]\\archive",
+      "releases_windows.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\releases_linux.json",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/windows"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_beta_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_upload_prod.json
similarity index 80%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_beta_upload_prod.json
index 2652b05..9ca1db4 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "beta",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=beta"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/beta/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/beta/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_beta_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_upload_staging.json
similarity index 99%
copy from recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_beta_upload_staging.json
index 813a7ee..ca1b74f 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_flutter.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_flutter.json
index 2652b05..ef5aa6a 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_prod.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_stable_prod.json
rename to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_prod.json
index 2652b05..bd64783 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_staging.json
index 9980b74..41f7f61 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_flutter.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_flutter.json
index 2652b05..ef5aa6a 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_prod.json
index 2652b05..bd64783 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_staging.json
index 9980b74..41f7f61 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_flutter.json
similarity index 77%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_flutter.json
index 2652b05..7f924ab 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_prod.json
similarity index 80%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_prod.json
index 2652b05..508a164 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_staging.json
index 9980b74..41f7f61 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_flutter.json
similarity index 77%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_flutter.json
index 2652b05..7f924ab 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_prod.json
similarity index 80%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_prod.json
index 2652b05..508a164 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_staging.json
index 9980b74..41f7f61 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "flutter-release-test",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=flutter-release-test"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_master_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_flutter.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_experimental_flutter.json
index 2652b05..a66b9c2 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_master_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_experimental_prod.json
index 2652b05..308630f 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_master_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_staging.json
similarity index 98%
rename from recipes/packaging/packaging.expected/win_stable_staging.json
rename to recipes/packaging/packaging.expected/win_refs_heads_master_experimental_staging.json
index 9980b74..de3a133 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_flutter.json
similarity index 94%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_flutter.json
index 2652b05..a66b9c2 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_prod.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_prod.json
index 2652b05..308630f 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_staging.json
index 9980b74..de3a133 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_master_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_master_flutter.json
similarity index 77%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_flutter.json
index 2652b05..52400bb 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_master_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_master_prod.json
similarity index 80%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_prod.json
index 2652b05..5dee6bb 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_master_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_master_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_staging.json
index 9980b74..de3a133 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_master_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_master_upload_flutter.json
similarity index 77%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_upload_flutter.json
index 2652b05..52400bb 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_master_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_master_upload_prod.json
similarity index 80%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_upload_prod.json
index 2652b05..5dee6bb 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_upload_prod.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/master/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_master_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_master_upload_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_master_upload_staging.json
index 9980b74..de3a133 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_upload_staging.json
@@ -42,7 +42,7 @@
       "git",
       "fetch",
       "origin",
-      "stable",
+      "master",
       "--recurse-submodules",
       "--progress",
       "--tags"
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=master"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_flutter.json
similarity index 73%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_flutter.json
index 2652b05..4235427 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,231 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]\\archive",
+      "releases_windows.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\releases_linux.json",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/win_stable_experimental_prod.json
rename to recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_prod.json
index cbbf46a..df1292b 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/win_stable_experimental_staging.json
rename to recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_staging.json
index e4c52c2..0b22349 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_flutter.json
similarity index 73%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_flutter.json
index 2652b05..4235427 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,231 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]\\archive",
+      "releases_windows.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\releases_linux.json",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_upload_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_prod.json
similarity index 99%
rename from recipes/packaging/packaging.expected/win_stable_experimental_upload_prod.json
rename to recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_prod.json
index cbbf46a..df1292b 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_upload_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_staging.json
similarity index 99%
rename from recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json
rename to recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_staging.json
index e4c52c2..0b22349 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_stable_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_flutter.json
similarity index 62%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_stable_flutter.json
index 2652b05..4b30b95 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,393 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]\\archive",
+      "releases_windows.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\releases_linux.json",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/windows"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_stable_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_prod.json
similarity index 80%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_stable_prod.json
index 2652b05..f0d14b1 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_stable_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_staging.json
similarity index 98%
copy from recipes/packaging/packaging.expected/win_stable_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_stable_staging.json
index 9980b74..0b22349 100644
--- a/recipes/packaging/packaging.expected/win_stable_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_refs_heads_stable_upload_flutter.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_upload_flutter.json
similarity index 62%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_stable_upload_flutter.json
index 2652b05..4b30b95 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_upload_flutter.json
@@ -22,7 +22,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -54,7 +54,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -80,7 +80,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -105,7 +105,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -134,7 +134,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -159,7 +159,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -186,7 +186,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -224,7 +224,7 @@
     ],
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -256,7 +256,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -282,7 +282,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -307,7 +307,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -336,7 +336,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -361,7 +361,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -388,7 +388,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -413,7 +413,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -457,7 +457,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -501,7 +502,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -551,7 +552,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -603,7 +604,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -655,7 +656,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -717,7 +717,7 @@
     },
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -769,7 +769,7 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": "project:prod"
+        "name": "project:flutter"
       },
       "resultdb": {
         "current_invocation": {
@@ -781,11 +781,393 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]\\archive",
+      "releases_windows.json"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "get flutter archive file name (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\releases_linux.json@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\releases_linux.json",
+      "[CLEANUP]\\tmp_tmp_1\\releases"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/releases_linux.json"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "-h",
+      "Cache-Control:max-age=60",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/releases_linux.json",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/windows"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_2/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_stable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_prod.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_upload_prod.json
similarity index 80%
copy from recipes/packaging/packaging.expected/win_stable_prod.json
copy to recipes/packaging/packaging.expected/win_refs_heads_stable_upload_prod.json
index 2652b05..f0d14b1 100644
--- a/recipes/packaging/packaging.expected/win_stable_prod.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_upload_prod.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -686,8 +687,7 @@
       "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
       "--temp_dir=[START_DIR]\\archive",
       "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
+      "--branch=stable"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -727,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -738,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -781,11 +781,173 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Ensure releases/stable/windows/experimental"
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]\\archive\\flutter-archive-package.zip",
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows\\experimental"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/experimental/flutter-archive-package.zip"
+  },
+  {
+    "cmd": [
+      "python3",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]\\gsutil.py",
+      "----",
+      "cp",
+      "-r",
+      "[CLEANUP]\\tmp_tmp_1/*",
+      "gs://flutter_infra_release/"
+    ],
+    "env": {
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "win",
+      "PUB_CACHE": "[START_DIR]\\.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]\\builder\\7za",
+        "[START_DIR]\\flutter\\bin",
+        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "gsutil releases/stable/windows/experimental/flutter-archive-package.zip",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
+    ]
+  },
+  {
     "name": "$result"
   }
 ]
\ No newline at end of file

recipes/packaging/packaging.expected/win_refs_heads_stable_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_upload_staging.json
similarity index 99%
copy from recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json
copy to recipes/packaging/packaging.expected/win_refs_heads_stable_upload_staging.json
index e4c52c2..0b22349 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_upload_staging.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_upload_staging.json
@@ -472,7 +472,8 @@
   {
     "cmd": [
       "flutter.bat",
-      "update-packages"
+      "update-packages",
+      "-v"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -726,7 +727,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "prepare, create and publish a flutter archive"
+    "name": "prepare and create a flutter archive"
   },
   {
     "cmd": [
@@ -737,7 +738,7 @@
       "/path/to/tmp/json",
       "glob",
       "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
+      "*flutter*.zip"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -780,7 +781,7 @@
     },
     "name": "get flutter archive file name",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.zip@@@",
       "@@@STEP_LOG_END@glob@@@"
     ]
   },

recipes/packaging/packaging.expected/win_stable_upload_prod.json

diff --git a/recipes/packaging/packaging.expected/win_stable_upload_prod.json b/recipes/packaging/packaging.expected/win_stable_upload_prod.json
deleted file mode 100644
index 2652b05..0000000
--- a/recipes/packaging/packaging.expected/win_stable_upload_prod.json
+++ /dev/null
@@ -1,791 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.expected/win_stable_upload_staging.json

diff --git a/recipes/packaging/packaging.expected/win_stable_upload_staging.json b/recipes/packaging/packaging.expected/win_stable_upload_staging.json
deleted file mode 100644
index 9980b74..0000000
--- a/recipes/packaging/packaging.expected/win_stable_upload_staging.json
+++ /dev/null
@@ -1,791 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "determine release revision"
-  },
-  {
-    "cmd": [],
-    "name": "determine release revision.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "stable",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "determine release revision.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master"
-  },
-  {
-    "cmd": [],
-    "name": "checkout framework from master.Checkout flutter/flutter",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py",
-      "--path",
-      "[START_DIR]\\flutter",
-      "--url",
-      "https://flutter.googlesource.com/mirrors/flutter"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git setup",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "fetch",
-      "origin",
-      "master",
-      "--recurse-submodules",
-      "--progress",
-      "--tags"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "env": {
-      "PATH": "RECIPE_REPO[depot_tools];<PATH>"
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git fetch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "checkout",
-      "-f",
-      "FETCH_HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git checkout",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.read revision",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "clean",
-      "-f",
-      "-d",
-      "-x"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.git clean",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "sync"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule sync",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "submodule",
-      "update",
-      "--init",
-      "--recursive"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "checkout framework from master.Checkout flutter/flutter.submodule update",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "rev-parse",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]\\flutter",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "git rev-parse"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "doctor"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "flutter doctor"
-  },
-  {
-    "cmd": [
-      "flutter.bat",
-      "update-packages"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "download dependencies"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "clean archive work directory"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]\\archive"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "(re)create archive work directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\builder\\7za",
-      "-ensure-file",
-      "flutter_internal/tools/7za/${platform} version:19.00",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:19.00---\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"flutter_internal/tools/7za/resolved-platform\"@@@",
-      "@@@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@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "dart.exe",
-      "[START_DIR]\\flutter\\dev\\bots\\prepare_package.dart",
-      "--temp_dir=[START_DIR]\\archive",
-      "--revision=deadbeef",
-      "--branch=stable",
-      "--publish"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "prepare, create and publish a flutter archive"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "glob",
-      "[START_DIR]\\archive",
-      "*flutter*.tar.xz"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get flutter archive file name",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@glob@[START_DIR]\\archive\\flutter-archive-package.tar.xz@@@",
-      "@@@STEP_LOG_END@glob@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file

recipes/packaging/packaging.py

diff --git a/recipes/packaging/packaging.py b/recipes/packaging/packaging.py
index 7f0f70a..17bc3ce 100644
--- a/recipes/packaging/packaging.py
+++ b/recipes/packaging/packaging.py
@@ -9,6 +9,7 @@
 DEPS = [
     'depot_tools/depot_tools',
     'depot_tools/git',
+    'flutter/archives',
     'flutter/flutter_bcid',
     'flutter/flutter_deps',
     'flutter/repo_util',
@@ -23,7 +24,13 @@
     'recipe_engine/step',
 ]
 
-PACKAGED_REF_RE = re.compile(r'^refs/heads/(beta|stable)$')
+PACKAGED_REF_RE = re.compile(r'^refs/heads/(.+)$')
+
+PLATFORMS_MAP = {
+    'win': 'windows',
+    'mac': 'macos',
+    'linux': 'linux'
+}
 
 
 @contextmanager
@@ -43,15 +50,21 @@
 
 
 def CreateAndUploadFlutterPackage(api, git_hash, branch, packaging_script):
-  """Prepares, builds, and uploads an all-inclusive archive package."""
+  """Prepares, builds, and uploads an all-inclusive archive package.
+
+    Args:
+      git_hash(str): Hash corresponding to git commit.
+      branch(str): Name of the flutter branch.
+      packaging_script(str): Script that will prepare, create and publish a flutter archive.
+  """
   flutter_executable = 'flutter' if not api.platform.is_win else 'flutter.bat'
   dart_executable = 'dart' if not api.platform.is_win else 'dart.exe'
   work_dir = api.path['start_dir'].join('archive')
   api.step('flutter doctor', [flutter_executable, 'doctor'])
-  api.step('download dependencies', [flutter_executable, 'update-packages'])
+  api.step('download dependencies', [flutter_executable, 'update-packages', '-v'])
+  api.flutter_bcid.report_stage(BcidStage.COMPILE.value)
   api.file.rmtree('clean archive work directory', work_dir)
   api.file.ensure_directory('(re)create archive work directory', work_dir)
-  api.flutter_bcid.report_stage(BcidStage.COMPILE.value)
   with Install7za(api):
     with api.context(cwd=api.path['start_dir']):
       step_args = [
@@ -60,19 +73,69 @@
           '--revision=%s' % git_hash,
           '--branch=%s' % branch
       ]
-      if not api.runtime.is_experimental:
-        step_args.append('--publish')
-      api.step('prepare, create and publish a flutter archive', step_args)
+      api.step('prepare and create a flutter archive', step_args)
 
-      # TODO(drewroengoogle): Utilize this path later on when we publish to gcs manually
-      flutter_package_absolute_path = GetFlutterPackageAbsolutePath(api, work_dir)
+      flutter_pkg_absolute_path = GetFlutterPackageAbsolutePath(api, work_dir)
+      file_name = api.path.basename(flutter_pkg_absolute_path)
+      platform_name = PLATFORMS_MAP[api.platform.name]
+      dest_archive = '/%s/%s' % (branch, platform_name)
+      dest_gs = 'gs://flutter_infra_release/releases%s' % dest_archive
+      api.flutter_bcid.report_stage(BcidStage.UPLOAD.value)
+      if branch in ('beta', 'stable') and api.flutter_bcid.is_official_build():
+        # only publish using upload_artifact if is branch is beta or stable
+        # publish both package and metadata which has been updated
+        # by the packaging_script
+        pkg_gs_path = '%s/%s' % (dest_gs, file_name)
+        metadata_absolute_path = GetFlutterMetadataAbsolutePath(api, work_dir)
+        metadata_filename = api.path.basename(metadata_absolute_path)
+        metadata_dst = 'gs://flutter_infra_release/releases'
+        metadata_gs_path = "%s/%s" % (metadata_dst, metadata_filename)
+        # This metadata file is used by the website, so we don't want a long
+        # latency between publishing a release and it being available on the
+        # site.
+        headers = {'Cache-Control': 'max-age=60'}
+        api.archives.upload_artifact(metadata_absolute_path, metadata_gs_path, metadata=headers)
+      else:
+        # add experimental subpath if branch is not beta or stable
+        pkg_gs_path = '%s/%s/%s' % (dest_gs, 'experimental', file_name)
+      # Do not upload on presubmit.
+      if ((not api.runtime.is_experimental) and (api.flutter_bcid.is_official_build() or
+          api.flutter_bcid.is_prod_build())):
+        api.archives.upload_artifact(flutter_pkg_absolute_path, pkg_gs_path)
+        api.flutter_bcid.upload_provenance(flutter_pkg_absolute_path, pkg_gs_path)
+      api.flutter_bcid.report_stage(BcidStage.UPLOAD_COMPLETE.value)
 
 
 def GetFlutterPackageAbsolutePath(api, work_dir):
-  """Gets full flutter package directory if it exists."""
-  files = api.file.glob_paths('get flutter archive file name', work_dir, '*flutter*.tar.xz', test_data=['flutter-archive-package.tar.xz'])
+  """Gets full flutter package directory if it exists.
+
+  Args:
+    work_dir(str): Path to working directory.
+
+  Returns:
+    str: Fully qualified path to flutter package directory.
+  """
+  suffix = 'tar.xz' if api.platform.is_linux else 'zip'
+  files = api.file.glob_paths('get flutter archive file name', work_dir,
+                              '*flutter*.%s' % suffix, test_data=['flutter-archive-package.%s' % suffix])
   return files[0] if len(files) == 1 else None
 
+def GetFlutterMetadataAbsolutePath(api, work_dir):
+  """Gets local metadata absolute path.
+
+  Returns:
+    str: Path to the metadata file which contains a platform suffix.
+  """
+  metadata_filename = "releases_"
+  if api.platform.is_linux:
+    metadata_filename += "linux.json"
+  elif api.platform.is_mac:
+    metadata_filename += "macos.json"
+  elif api.platform.is_win:
+    metadata_filename += "windows.json"
+  files = api.file.glob_paths('get flutter archive file name', work_dir,
+                            metadata_filename, test_data=['releases_linux.json'])
+  return files[0] if len(files) == 1 else None
 
 def RunSteps(api):
   api.flutter_bcid.report_stage(BcidStage.START.value)
@@ -105,22 +168,21 @@
   api.flutter_deps.required_deps(
       env, env_prefixes, api.properties.get('dependencies', [])
   )
-  release_ref = api.properties.get('release_ref') or git_ref
 
   packaging_script = checkout_path.join(
       'dev', 'bots', 'prepare_package.dart'
   )
   with api.context(env=env, env_prefixes=env_prefixes):
     with api.depot_tools.on_path():
-      if release_ref:
-        match = PACKAGED_REF_RE.match(release_ref)
-        if match:
-          branch = match.group(1)
-          CreateAndUploadFlutterPackage(api, release_git_hash, branch, packaging_script)
-          # Nothing left to do on a packaging branch.
-          return
+      match = PACKAGED_REF_RE.match(git_ref)
+      if match:
+        branch = match.group(1)
+        CreateAndUploadFlutterPackage(api, release_git_hash, branch, packaging_script)
+        # Nothing left to do on a packaging branch.
+        return
       raise api.step.StepFailure(
-          'could not determine the release branch: either "release_ref" or "git_ref" properties should be set when manually triggering builds'
+          'could not determine the release branch: "git_ref"'
+          'property should be set when manually triggering builds'
       )
 
 
@@ -128,27 +190,28 @@
   for experimental in (True, False):
     for should_upload in (True, False):
       for platform in ('mac', 'linux', 'win'):
-        for branch in ('master', 'beta', 'stable'):
-            for bucket in ('prod', 'staging'):
-              git_ref = 'refs/heads/' + branch
-              test = api.test(
-                  '%s_%s%s%s_%s' % (
-                      platform,
-                      branch,
-                      '_experimental' if experimental else '',
-                      '_upload' if should_upload else '',
-                      bucket
-                  ), api.platform(platform, 64),
-                  api.buildbucket.ci_build(
-                      git_ref=git_ref,
-                      revision=None,
-                      bucket=bucket
-                  ), api.properties(
-                      shard='tests',
-                      fuchsia_ctl_version='version:0.0.2',
-                      upload_packages=should_upload,
-                      gold_tryjob=not should_upload
-                  ), api.runtime(is_experimental=experimental),
-                  api.repo_util.flutter_environment_data()
-              )
-              yield test
+        for branch in ('master', 'beta', 'stable', 'flutter-release-test'):
+            for bucket in ('prod', 'staging', 'flutter'):
+              for git_ref in ('refs/heads/' + branch,
+                'invalid' + branch):
+                  test = api.test(
+                      '%s_%s%s%s_%s' % (
+                          platform,
+                          git_ref,
+                          '_experimental' if experimental else '',
+                          '_upload' if should_upload else '',
+                          bucket
+                      ), api.platform(platform, 64),
+                      api.buildbucket.ci_build(
+                          git_ref=git_ref,
+                          revision=None,
+                          bucket=bucket
+                      ), api.properties(
+                          shard='tests',
+                          fuchsia_ctl_version='version:0.0.2',
+                          upload_packages=should_upload,
+                          gold_tryjob=not should_upload,
+                      ), api.runtime(is_experimental=experimental),
+                      api.repo_util.flutter_environment_data()
+                  )
+                  yield test