[build] pass BUILDBUCKET_ID in build env

Intended for passing to bazel build invocation metadata.

Also BUILDBUCKET_BUILDER with the builder name.

Bug: b/319744557
Change-Id: I5a710a4ac551995f6c1cef156d4ae200a23fdcec
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/973337
Reviewed-by: Rahul Bangar <rahulbn@google.com>
Reviewed-by: Danielle Kay <danikay@google.com>
Commit-Queue: David Fang <fangism@google.com>
diff --git a/recipe_modules/artifacts/tests/full.expected/basic.json b/recipe_modules/artifacts/tests/full.expected/basic.json
index 055a82d..1fcfd21 100644
--- a/recipe_modules/artifacts/tests/full.expected/basic.json
+++ b/recipe_modules/artifacts/tests/full.expected/basic.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/artifacts/tests/full.expected/build_cancelled.json b/recipe_modules/artifacts/tests/full.expected/build_cancelled.json
index ab61010..6d3e022 100644
--- a/recipe_modules/artifacts/tests/full.expected/build_cancelled.json
+++ b/recipe_modules/artifacts/tests/full.expected/build_cancelled.json
@@ -858,6 +858,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=//",
+      "--env",
+      "BUILDBUCKET_ID=0",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1323,6 +1327,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1375,6 +1381,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1419,6 +1427,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1486,6 +1496,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1538,6 +1550,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1582,6 +1596,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1641,6 +1657,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/artifacts/tests/full.expected/non_transient_failure.json b/recipe_modules/artifacts/tests/full.expected/non_transient_failure.json
index 6173799..18010b4 100644
--- a/recipe_modules/artifacts/tests/full.expected/non_transient_failure.json
+++ b/recipe_modules/artifacts/tests/full.expected/non_transient_failure.json
@@ -858,6 +858,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=//",
+      "--env",
+      "BUILDBUCKET_ID=0",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1323,6 +1327,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1375,6 +1381,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1419,6 +1427,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1486,6 +1496,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1538,6 +1550,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1582,6 +1596,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1641,6 +1657,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/artifacts/tests/full.expected/timeout.json b/recipe_modules/artifacts/tests/full.expected/timeout.json
index d6d2cd2..4c2147a 100644
--- a/recipe_modules/artifacts/tests/full.expected/timeout.json
+++ b/recipe_modules/artifacts/tests/full.expected/timeout.json
@@ -858,6 +858,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=//",
+      "--env",
+      "BUILDBUCKET_ID=0",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1323,6 +1327,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1375,6 +1381,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1419,6 +1427,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1486,6 +1496,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1538,6 +1550,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1582,6 +1596,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1641,6 +1657,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/artifacts/tests/full.expected/transient_failure.json b/recipe_modules/artifacts/tests/full.expected/transient_failure.json
index 301c901..937d5e8 100644
--- a/recipe_modules/artifacts/tests/full.expected/transient_failure.json
+++ b/recipe_modules/artifacts/tests/full.expected/transient_failure.json
@@ -858,6 +858,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=//",
+      "--env",
+      "BUILDBUCKET_ID=0",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1323,6 +1327,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1375,6 +1381,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1419,6 +1427,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1486,6 +1496,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1538,6 +1550,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1582,6 +1596,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1641,6 +1657,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/api.py b/recipe_modules/build/api.py
index 5cc3796..0ea329b 100644
--- a/recipe_modules/build/api.py
+++ b/recipe_modules/build/api.py
@@ -1146,6 +1146,8 @@
             "XDG_STATE_HOME",
         ]
         env = self.m.context.env
+        env["BUILDBUCKET_ID"] = self.m.buildbucket_util.id
+        env["BUILDBUCKET_BUILDER"] = self.m.buildbucket_util.full_builder_name()
         fint_cmd = [
             fint_path,
             command,
diff --git a/recipe_modules/build/tests/full.expected/default.json b/recipe_modules/build/tests/full.expected/default.json
index 35c073e..a796176 100644
--- a/recipe_modules/build/tests/full.expected/default.json
+++ b/recipe_modules/build/tests/full.expected/default.json
@@ -581,6 +581,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1218,6 +1222,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1282,6 +1288,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1338,6 +1346,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1417,6 +1427,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1481,6 +1493,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1537,6 +1551,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1608,6 +1624,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/default_cq.json b/recipe_modules/build/tests/full.expected/default_cq.json
index 9ba31a5..16dbe94 100644
--- a/recipe_modules/build/tests/full.expected/default_cq.json
+++ b/recipe_modules/build/tests/full.expected/default_cq.json
@@ -790,6 +790,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1433,6 +1437,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1497,6 +1503,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1553,6 +1561,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1632,6 +1642,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1696,6 +1708,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1752,6 +1766,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1823,6 +1839,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/duplicate_tool.json b/recipe_modules/build/tests/full.expected/duplicate_tool.json
index f217ebb..934bce4 100644
--- a/recipe_modules/build/tests/full.expected/duplicate_tool.json
+++ b/recipe_modules/build/tests/full.expected/duplicate_tool.json
@@ -579,6 +579,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
diff --git a/recipe_modules/build/tests/full.expected/extract_artifacts.json b/recipe_modules/build/tests/full.expected/extract_artifacts.json
index a422b37..fb2ab89 100644
--- a/recipe_modules/build/tests/full.expected/extract_artifacts.json
+++ b/recipe_modules/build/tests/full.expected/extract_artifacts.json
@@ -581,6 +581,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1218,6 +1222,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1282,6 +1288,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1338,6 +1346,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1417,6 +1427,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1481,6 +1493,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1537,6 +1551,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1608,6 +1624,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/fint_build_failure.json b/recipe_modules/build/tests/full.expected/fint_build_failure.json
index 52523a5..51f37a6 100644
--- a/recipe_modules/build/tests/full.expected/fint_build_failure.json
+++ b/recipe_modules/build/tests/full.expected/fint_build_failure.json
@@ -585,6 +585,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1222,6 +1226,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1286,6 +1292,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1342,6 +1350,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1421,6 +1431,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1485,6 +1497,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1541,6 +1555,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1612,6 +1628,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/fint_build_timeout.json b/recipe_modules/build/tests/full.expected/fint_build_timeout.json
index 4a83a1d..59606c6 100644
--- a/recipe_modules/build/tests/full.expected/fint_build_timeout.json
+++ b/recipe_modules/build/tests/full.expected/fint_build_timeout.json
@@ -579,6 +579,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1216,6 +1220,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1280,6 +1286,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1336,6 +1344,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1415,6 +1425,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1479,6 +1491,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1535,6 +1549,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1606,6 +1622,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/fint_build_unexpected_failure_summary.json b/recipe_modules/build/tests/full.expected/fint_build_unexpected_failure_summary.json
index 1e588d4..3718bb4 100644
--- a/recipe_modules/build/tests/full.expected/fint_build_unexpected_failure_summary.json
+++ b/recipe_modules/build/tests/full.expected/fint_build_unexpected_failure_summary.json
@@ -584,6 +584,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1221,6 +1225,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1285,6 +1291,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1341,6 +1349,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1420,6 +1430,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1484,6 +1496,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1540,6 +1554,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1611,6 +1627,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/fint_build_unrecognized_failure.json b/recipe_modules/build/tests/full.expected/fint_build_unrecognized_failure.json
index b146dc3..3f5a931 100644
--- a/recipe_modules/build/tests/full.expected/fint_build_unrecognized_failure.json
+++ b/recipe_modules/build/tests/full.expected/fint_build_unrecognized_failure.json
@@ -582,6 +582,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1219,6 +1223,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1283,6 +1289,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1339,6 +1347,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1418,6 +1428,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1482,6 +1494,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1538,6 +1552,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1609,6 +1625,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/fint_set_failure.json b/recipe_modules/build/tests/full.expected/fint_set_failure.json
index 4d94f14..721a389 100644
--- a/recipe_modules/build/tests/full.expected/fint_set_failure.json
+++ b/recipe_modules/build/tests/full.expected/fint_set_failure.json
@@ -581,6 +581,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
diff --git a/recipe_modules/build/tests/full.expected/fint_set_unexpected_failure_summary.json b/recipe_modules/build/tests/full.expected/fint_set_unexpected_failure_summary.json
index ff14c06..4e7adf5 100644
--- a/recipe_modules/build/tests/full.expected/fint_set_unexpected_failure_summary.json
+++ b/recipe_modules/build/tests/full.expected/fint_set_unexpected_failure_summary.json
@@ -581,6 +581,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
diff --git a/recipe_modules/build/tests/full.expected/fint_set_unrecognized_failure.json b/recipe_modules/build/tests/full.expected/fint_set_unrecognized_failure.json
index 902b656..e518f2a 100644
--- a/recipe_modules/build/tests/full.expected/fint_set_unrecognized_failure.json
+++ b/recipe_modules/build/tests/full.expected/fint_set_unrecognized_failure.json
@@ -579,6 +579,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
diff --git a/recipe_modules/build/tests/full.expected/generate_skipped_shards.json b/recipe_modules/build/tests/full.expected/generate_skipped_shards.json
index a806997..63c0ba3 100644
--- a/recipe_modules/build/tests/full.expected/generate_skipped_shards.json
+++ b/recipe_modules/build/tests/full.expected/generate_skipped_shards.json
@@ -581,6 +581,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1218,6 +1222,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1282,6 +1288,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1338,6 +1346,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1417,6 +1427,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1481,6 +1493,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1537,6 +1551,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1608,6 +1624,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/incremental_build.json b/recipe_modules/build/tests/full.expected/incremental_build.json
index 8b67ad8..681a6f7 100644
--- a/recipe_modules/build/tests/full.expected/incremental_build.json
+++ b/recipe_modules/build/tests/full.expected/incremental_build.json
@@ -641,6 +641,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1278,6 +1282,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1342,6 +1348,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1398,6 +1406,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1477,6 +1487,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1541,6 +1553,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1597,6 +1611,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1668,6 +1684,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/mac__release_version.json b/recipe_modules/build/tests/full.expected/mac__release_version.json
index 6d45a0c..23e787d 100644
--- a/recipe_modules/build/tests/full.expected/mac__release_version.json
+++ b/recipe_modules/build/tests/full.expected/mac__release_version.json
@@ -271,6 +271,8 @@
       "[CLEANUP]/tmp_tmp_1"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
@@ -891,6 +893,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -955,6 +959,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1011,6 +1017,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1090,6 +1098,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1154,6 +1164,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1210,6 +1222,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1281,6 +1295,8 @@
       "[CLEANUP]/tmp_tmp_2"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/ninjatrace_fails.json b/recipe_modules/build/tests/full.expected/ninjatrace_fails.json
index 76756b4..8e98fe4 100644
--- a/recipe_modules/build/tests/full.expected/ninjatrace_fails.json
+++ b/recipe_modules/build/tests/full.expected/ninjatrace_fails.json
@@ -582,6 +582,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1219,6 +1223,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1283,6 +1289,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1339,6 +1347,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1418,6 +1428,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1482,6 +1494,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1538,6 +1552,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1609,6 +1625,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/no_fint_build_artifacts.json b/recipe_modules/build/tests/full.expected/no_fint_build_artifacts.json
index f9b03ab..2bd6f1e 100644
--- a/recipe_modules/build/tests/full.expected/no_fint_build_artifacts.json
+++ b/recipe_modules/build/tests/full.expected/no_fint_build_artifacts.json
@@ -581,6 +581,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1218,6 +1222,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1282,6 +1288,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1338,6 +1346,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1417,6 +1427,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1481,6 +1493,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1537,6 +1551,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1608,6 +1624,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/no_fint_set_artifacts.json b/recipe_modules/build/tests/full.expected/no_fint_set_artifacts.json
index d0a413e..c75a47cf 100644
--- a/recipe_modules/build/tests/full.expected/no_fint_set_artifacts.json
+++ b/recipe_modules/build/tests/full.expected/no_fint_set_artifacts.json
@@ -579,6 +579,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
diff --git a/recipe_modules/build/tests/full.expected/no_goma.json b/recipe_modules/build/tests/full.expected/no_goma.json
index 85840c1..5aa8f3c 100644
--- a/recipe_modules/build/tests/full.expected/no_goma.json
+++ b/recipe_modules/build/tests/full.expected/no_goma.json
@@ -581,6 +581,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1363,6 +1367,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "FOO=[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "--env",
       "HOME=/tmp",
diff --git a/recipe_modules/build/tests/full.expected/no_skip_for_integration_change.json b/recipe_modules/build/tests/full.expected/no_skip_for_integration_change.json
index 9146f00..107a0cb 100644
--- a/recipe_modules/build/tests/full.expected/no_skip_for_integration_change.json
+++ b/recipe_modules/build/tests/full.expected/no_skip_for_integration_change.json
@@ -790,6 +790,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1277,6 +1281,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1327,6 +1333,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1369,6 +1377,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1434,6 +1444,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1484,6 +1496,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1526,6 +1540,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1583,6 +1599,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/no_skip_if_recipe_testing_enabled.json b/recipe_modules/build/tests/full.expected/no_skip_if_recipe_testing_enabled.json
index 568a75c..88b002a 100644
--- a/recipe_modules/build/tests/full.expected/no_skip_if_recipe_testing_enabled.json
+++ b/recipe_modules/build/tests/full.expected/no_skip_if_recipe_testing_enabled.json
@@ -790,6 +790,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1277,6 +1281,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1327,6 +1333,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1369,6 +1377,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1434,6 +1444,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1484,6 +1496,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1526,6 +1540,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1583,6 +1599,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/size_creep_label_not_approved.json b/recipe_modules/build/tests/full.expected/size_creep_label_not_approved.json
index 28dbf80..c15a5d2 100644
--- a/recipe_modules/build/tests/full.expected/size_creep_label_not_approved.json
+++ b/recipe_modules/build/tests/full.expected/size_creep_label_not_approved.json
@@ -790,6 +790,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1433,6 +1437,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1497,6 +1503,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1553,6 +1561,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1632,6 +1642,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1696,6 +1708,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1752,6 +1766,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1823,6 +1839,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/skip_if_unaffected.json b/recipe_modules/build/tests/full.expected/skip_if_unaffected.json
index 3816548..30dd356 100644
--- a/recipe_modules/build/tests/full.expected/skip_if_unaffected.json
+++ b/recipe_modules/build/tests/full.expected/skip_if_unaffected.json
@@ -787,6 +787,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
diff --git a/recipe_modules/build/tests/full.expected/subbuild.json b/recipe_modules/build/tests/full.expected/subbuild.json
index c9ee6c2..8433826 100644
--- a/recipe_modules/build/tests/full.expected/subbuild.json
+++ b/recipe_modules/build/tests/full.expected/subbuild.json
@@ -581,6 +581,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder-subbuild",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1218,6 +1222,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder-subbuild",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1282,6 +1288,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder-subbuild",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1338,6 +1346,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder-subbuild",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1417,6 +1427,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder-subbuild",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1481,6 +1493,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder-subbuild",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1537,6 +1551,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder-subbuild",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1608,6 +1624,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder-subbuild",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/build/tests/full.expected/upload_buildstats_failure.json b/recipe_modules/build/tests/full.expected/upload_buildstats_failure.json
index 757bf42..356c134 100644
--- a/recipe_modules/build/tests/full.expected/upload_buildstats_failure.json
+++ b/recipe_modules/build/tests/full.expected/upload_buildstats_failure.json
@@ -582,6 +582,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1219,6 +1223,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1283,6 +1289,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1339,6 +1347,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1418,6 +1428,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1482,6 +1494,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1538,6 +1552,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1609,6 +1625,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/clang_format.json b/recipe_modules/tricium_analyze/tests/full.expected/clang_format.json
index 0188a43..93f3ea6 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/clang_format.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/clang_format.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy.json b/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy.json
index dbe261a..b9e7fff 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy_bad_offset.json b/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy_bad_offset.json
index e7ea274..4f85cb1 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy_bad_offset.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy_bad_offset.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy_error.json b/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy_error.json
index 2a5b551..685458d 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy_error.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/clang_tidy_error.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/go_vet.json b/recipe_modules/tricium_analyze/tests/full.expected/go_vet.json
index bcc4a5a..dabdb57 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/go_vet.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/go_vet.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/go_vet_build_fails.json b/recipe_modules/tricium_analyze/tests/full.expected/go_vet_build_fails.json
index 2f450f6..77c65fc 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/go_vet_build_fails.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/go_vet_build_fails.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/go_vet_no_warnings.json b/recipe_modules/tricium_analyze/tests/full.expected/go_vet_no_warnings.json
index fbabd5c..c7e666c 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/go_vet_no_warnings.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/go_vet_no_warnings.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/gofmt.json b/recipe_modules/tricium_analyze/tests/full.expected/gofmt.json
index 2ffef37..86353c7 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/gofmt.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/gofmt.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/no_analysis.json b/recipe_modules/tricium_analyze/tests/full.expected/no_analysis.json
index 5ae4b84..dfff5d4 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/no_analysis.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/no_analysis.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/no_commit_message.json b/recipe_modules/tricium_analyze/tests/full.expected/no_commit_message.json
index 1e69af8..fcf6a32 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/no_commit_message.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/no_commit_message.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/no_commit_tag.json b/recipe_modules/tricium_analyze/tests/full.expected/no_commit_tag.json
index 8548d52..accd695 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/no_commit_tag.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/no_commit_tag.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/non_inclusive_word.json b/recipe_modules/tricium_analyze/tests/full.expected/non_inclusive_word.json
index aadb9af..cacd5a7 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/non_inclusive_word.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/non_inclusive_word.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipe_modules/tricium_analyze/tests/full.expected/valid_commit_tag.json b/recipe_modules/tricium_analyze/tests/full.expected/valid_commit_tag.json
index 5ae4b84..dfff5d4 100644
--- a/recipe_modules/tricium_analyze/tests/full.expected/valid_commit_tag.json
+++ b/recipe_modules/tricium_analyze/tests/full.expected/valid_commit_tag.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/cobalt_config.expected/ci.json b/recipes/cobalt_config.expected/ci.json
index 896cc2b..520b945 100644
--- a/recipes/cobalt_config.expected/ci.json
+++ b/recipes/cobalt_config.expected/ci.json
@@ -1297,6 +1297,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1937,6 +1941,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2001,6 +2007,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2057,6 +2065,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2136,6 +2146,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2200,6 +2212,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2256,6 +2270,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2327,6 +2343,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/cobalt_config.expected/cq_try.json b/recipes/cobalt_config.expected/cq_try.json
index 8472068..c459165 100644
--- a/recipes/cobalt_config.expected/cq_try.json
+++ b/recipes/cobalt_config.expected/cq_try.json
@@ -1707,6 +1707,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2353,6 +2357,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2417,6 +2423,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2473,6 +2481,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2552,6 +2562,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2616,6 +2628,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2672,6 +2686,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2743,6 +2759,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/cobalt_config.expected/cq_try_not_cobalt_config.json b/recipes/cobalt_config.expected/cq_try_not_cobalt_config.json
index 54df245..85e3c0b 100644
--- a/recipes/cobalt_config.expected/cq_try_not_cobalt_config.json
+++ b/recipes/cobalt_config.expected/cq_try_not_cobalt_config.json
@@ -1707,6 +1707,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2353,6 +2357,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2417,6 +2423,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2473,6 +2481,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2552,6 +2562,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2616,6 +2628,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2672,6 +2686,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2743,6 +2759,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/clang_ml_training.expected/default.json b/recipes/contrib/clang_ml_training.expected/default.json
index 3df3fae..7af884c 100644
--- a/recipes/contrib/clang_ml_training.expected/default.json
+++ b/recipes/contrib/clang_ml_training.expected/default.json
@@ -7511,6 +7511,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/prod/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -8152,6 +8156,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8216,6 +8222,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8272,6 +8280,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8351,6 +8361,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8415,6 +8427,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8471,6 +8485,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8542,6 +8558,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -10302,6 +10320,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/prod/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -10721,6 +10743,8 @@
       "[CLEANUP]/tmp_tmp_6"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_2/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -15250,6 +15274,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/prod/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -15669,6 +15697,8 @@
       "[CLEANUP]/tmp_tmp_9"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_3/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -17120,6 +17150,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/prod/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -17539,6 +17573,8 @@
       "[CLEANUP]/tmp_tmp_12"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_4/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/clang_ml_training.expected/num_iterations.json b/recipes/contrib/clang_ml_training.expected/num_iterations.json
index c0f7542..7eb2a08 100644
--- a/recipes/contrib/clang_ml_training.expected/num_iterations.json
+++ b/recipes/contrib/clang_ml_training.expected/num_iterations.json
@@ -7511,6 +7511,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/prod/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -8152,6 +8156,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8216,6 +8222,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8272,6 +8280,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8351,6 +8361,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8415,6 +8427,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8471,6 +8485,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -8542,6 +8558,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -10302,6 +10320,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/prod/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -10721,6 +10743,8 @@
       "[CLEANUP]/tmp_tmp_6"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_2/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -15251,6 +15275,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/prod/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -15670,6 +15698,8 @@
       "[CLEANUP]/tmp_tmp_9"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_3/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -17121,6 +17151,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/prod/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -17540,6 +17574,8 @@
       "[CLEANUP]/tmp_tmp_12"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/prod/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_4/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/docsgen.expected/dryrun.json b/recipes/contrib/docsgen.expected/dryrun.json
index 0cff478..88fa303 100644
--- a/recipes/contrib/docsgen.expected/dryrun.json
+++ b/recipes/contrib/docsgen.expected/dryrun.json
@@ -1252,6 +1252,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1892,6 +1896,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1956,6 +1962,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2012,6 +2020,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2091,6 +2101,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2155,6 +2167,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2211,6 +2225,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2282,6 +2298,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/docsgen.expected/main.json b/recipes/contrib/docsgen.expected/main.json
index 33657a1..e369dfc 100644
--- a/recipes/contrib/docsgen.expected/main.json
+++ b/recipes/contrib/docsgen.expected/main.json
@@ -1252,6 +1252,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1892,6 +1896,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1956,6 +1962,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2012,6 +2020,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2091,6 +2101,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2155,6 +2167,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2211,6 +2225,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2282,6 +2298,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/ffmpeg.expected/cq.json b/recipes/contrib/ffmpeg.expected/cq.json
index 2a401ea..74d8c87 100644
--- a/recipes/contrib/ffmpeg.expected/cq.json
+++ b/recipes/contrib/ffmpeg.expected/cq.json
@@ -1667,6 +1667,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2313,6 +2317,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2377,6 +2383,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2433,6 +2441,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2512,6 +2522,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2576,6 +2588,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2632,6 +2646,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2703,6 +2719,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -5158,6 +5176,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -5582,6 +5604,8 @@
       "[CLEANUP]/tmp_tmp_6"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_2/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -7487,6 +7511,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -7911,6 +7939,8 @@
       "[CLEANUP]/tmp_tmp_9"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_3/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -9816,6 +9846,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -10240,6 +10274,8 @@
       "[CLEANUP]/tmp_tmp_12"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_4/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/ffmpeg.expected/default.json b/recipes/contrib/ffmpeg.expected/default.json
index d28738d..2bca6f3 100644
--- a/recipes/contrib/ffmpeg.expected/default.json
+++ b/recipes/contrib/ffmpeg.expected/default.json
@@ -1257,6 +1257,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1897,6 +1901,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1961,6 +1967,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2017,6 +2025,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2096,6 +2106,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2160,6 +2172,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2216,6 +2230,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2287,6 +2303,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -4732,6 +4750,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -5150,6 +5172,8 @@
       "[CLEANUP]/tmp_tmp_6"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_2/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -7045,6 +7069,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -7463,6 +7491,8 @@
       "[CLEANUP]/tmp_tmp_9"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_3/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -9358,6 +9388,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -9776,6 +9810,8 @@
       "[CLEANUP]/tmp_tmp_12"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_4/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/firebase_docs.expected/firebase_docs.json b/recipes/contrib/firebase_docs.expected/firebase_docs.json
index 2fd729e..11f1fa1 100644
--- a/recipes/contrib/firebase_docs.expected/firebase_docs.json
+++ b/recipes/contrib/firebase_docs.expected/firebase_docs.json
@@ -1933,6 +1933,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2573,6 +2577,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2637,6 +2643,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2693,6 +2701,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2772,6 +2782,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2836,6 +2848,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2892,6 +2906,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2963,6 +2979,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/firebase_docs.expected/firebase_docs_failing_rustdoc.json b/recipes/contrib/firebase_docs.expected/firebase_docs_failing_rustdoc.json
index 09e0ee8..f99ce05 100644
--- a/recipes/contrib/firebase_docs.expected/firebase_docs_failing_rustdoc.json
+++ b/recipes/contrib/firebase_docs.expected/firebase_docs_failing_rustdoc.json
@@ -1933,6 +1933,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2573,6 +2577,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2637,6 +2643,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2693,6 +2701,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2772,6 +2782,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2836,6 +2848,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2892,6 +2906,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2963,6 +2979,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/kythe.expected/basic.json b/recipes/contrib/kythe.expected/basic.json
index f71c7e9..92ccb9f 100644
--- a/recipes/contrib/kythe.expected/basic.json
+++ b/recipes/contrib/kythe.expected/basic.json
@@ -1252,6 +1252,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1892,6 +1896,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1956,6 +1962,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2012,6 +2020,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2091,6 +2101,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2155,6 +2167,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2211,6 +2225,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2282,6 +2298,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/kythe.expected/try.json b/recipes/contrib/kythe.expected/try.json
index 8772700..30fcae8 100644
--- a/recipes/contrib/kythe.expected/try.json
+++ b/recipes/contrib/kythe.expected/try.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/contrib/linux_sysroot.expected/basic.json b/recipes/contrib/linux_sysroot.expected/basic.json
index a978560..d150a82 100644
--- a/recipes/contrib/linux_sysroot.expected/basic.json
+++ b/recipes/contrib/linux_sysroot.expected/basic.json
@@ -1252,6 +1252,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1892,6 +1896,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1956,6 +1962,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2012,6 +2020,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2091,6 +2101,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2155,6 +2167,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2211,6 +2225,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2282,6 +2298,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/cts_artifacts.expected/canary.json b/recipes/cts_artifacts.expected/canary.json
index 0acaa92..cc87285 100644
--- a/recipes/cts_artifacts.expected/canary.json
+++ b/recipes/cts_artifacts.expected/canary.json
@@ -1211,6 +1211,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1852,6 +1856,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1916,6 +1922,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1972,6 +1980,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2051,6 +2061,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2115,6 +2127,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2171,6 +2185,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2242,6 +2258,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/cts_artifacts.expected/ci.json b/recipes/cts_artifacts.expected/ci.json
index 82017dc..01e460d 100644
--- a/recipes/cts_artifacts.expected/ci.json
+++ b/recipes/cts_artifacts.expected/ci.json
@@ -1252,6 +1252,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1892,6 +1896,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1956,6 +1962,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2012,6 +2020,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2091,6 +2101,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2155,6 +2167,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2211,6 +2225,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2282,6 +2298,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/cts_artifacts.expected/cq.json b/recipes/cts_artifacts.expected/cq.json
index 3882c81..406bc69 100644
--- a/recipes/cts_artifacts.expected/cq.json
+++ b/recipes/cts_artifacts.expected/cq.json
@@ -1662,6 +1662,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2308,6 +2312,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2372,6 +2378,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2428,6 +2436,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2507,6 +2517,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2571,6 +2583,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2627,6 +2641,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2698,6 +2714,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/cts_artifacts.expected/milestone.json b/recipes/cts_artifacts.expected/milestone.json
index 1aef92f..f51533e 100644
--- a/recipes/cts_artifacts.expected/milestone.json
+++ b/recipes/cts_artifacts.expected/milestone.json
@@ -1211,6 +1211,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1852,6 +1856,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1916,6 +1922,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1972,6 +1980,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2051,6 +2061,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2115,6 +2127,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2171,6 +2185,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2242,6 +2258,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/docs_roller.expected/basic.json b/recipes/docs_roller.expected/basic.json
index 93cc484..b98593c 100644
--- a/recipes/docs_roller.expected/basic.json
+++ b/recipes/docs_roller.expected/basic.json
@@ -804,6 +804,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
@@ -1018,6 +1020,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/build.expected/affected_tests_no_work.json b/recipes/fuchsia/build.expected/affected_tests_no_work.json
index 6427f46..fc4100f 100644
--- a/recipes/fuchsia/build.expected/affected_tests_no_work.json
+++ b/recipes/fuchsia/build.expected/affected_tests_no_work.json
@@ -2077,6 +2077,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2723,6 +2727,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2787,6 +2793,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2843,6 +2851,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2922,6 +2932,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2986,6 +2998,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3042,6 +3056,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3113,6 +3129,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/catapult_dashboard_upload_enabled.json b/recipes/fuchsia/build.expected/catapult_dashboard_upload_enabled.json
index 3afc793..7bf5f40 100644
--- a/recipes/fuchsia/build.expected/catapult_dashboard_upload_enabled.json
+++ b/recipes/fuchsia/build.expected/catapult_dashboard_upload_enabled.json
@@ -1623,6 +1623,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2263,6 +2267,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2327,6 +2333,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2383,6 +2391,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2462,6 +2472,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2526,6 +2538,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2582,6 +2596,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2653,6 +2669,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/collect_absolute_coverage.json b/recipes/fuchsia/build.expected/collect_absolute_coverage.json
index 1771a45..e34240d 100644
--- a/recipes/fuchsia/build.expected/collect_absolute_coverage.json
+++ b/recipes/fuchsia/build.expected/collect_absolute_coverage.json
@@ -2070,6 +2070,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2716,6 +2720,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2780,6 +2786,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2836,6 +2844,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2915,6 +2925,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2979,6 +2991,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3035,6 +3049,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3106,6 +3122,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/collect_selective_coverage.json b/recipes/fuchsia/build.expected/collect_selective_coverage.json
index 49b709b..d8b383d 100644
--- a/recipes/fuchsia/build.expected/collect_selective_coverage.json
+++ b/recipes/fuchsia/build.expected/collect_selective_coverage.json
@@ -2070,6 +2070,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2717,6 +2721,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2781,6 +2787,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2837,6 +2845,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2916,6 +2926,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2980,6 +2992,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3036,6 +3050,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3107,6 +3123,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/cq_perfcompare.json b/recipes/fuchsia/build.expected/cq_perfcompare.json
index 5500b66..2534669 100644
--- a/recipes/fuchsia/build.expected/cq_perfcompare.json
+++ b/recipes/fuchsia/build.expected/cq_perfcompare.json
@@ -2096,6 +2096,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2742,6 +2746,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2806,6 +2812,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2862,6 +2870,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2941,6 +2951,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3005,6 +3017,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3061,6 +3075,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3132,6 +3148,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -6573,6 +6591,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -6997,6 +7019,8 @@
       "[CLEANUP]/tmp_tmp_6"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_2/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/default.json b/recipes/fuchsia/build.expected/default.json
index 96d4cce..7c2ec71 100644
--- a/recipes/fuchsia/build.expected/default.json
+++ b/recipes/fuchsia/build.expected/default.json
@@ -1621,6 +1621,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2111,6 +2115,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2161,6 +2167,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2203,6 +2211,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2268,6 +2278,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2318,6 +2330,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2360,6 +2374,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2417,6 +2433,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/default_cq.json b/recipes/fuchsia/build.expected/default_cq.json
index c6a1b4c..c59f4ec 100644
--- a/recipes/fuchsia/build.expected/default_cq.json
+++ b/recipes/fuchsia/build.expected/default_cq.json
@@ -2081,6 +2081,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2727,6 +2731,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2791,6 +2797,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2847,6 +2855,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2926,6 +2936,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2990,6 +3002,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3046,6 +3060,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3117,6 +3133,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/default_cq_no_affected_retry_task_on_test_failure.json b/recipes/fuchsia/build.expected/default_cq_no_affected_retry_task_on_test_failure.json
index ce4300a..f803b3c 100644
--- a/recipes/fuchsia/build.expected/default_cq_no_affected_retry_task_on_test_failure.json
+++ b/recipes/fuchsia/build.expected/default_cq_no_affected_retry_task_on_test_failure.json
@@ -2078,6 +2078,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2724,6 +2728,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2788,6 +2794,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2844,6 +2852,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2923,6 +2933,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2987,6 +2999,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3043,6 +3057,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3114,6 +3130,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/default_multipliers.json b/recipes/fuchsia/build.expected/default_multipliers.json
index 1048e56..d1fa660 100644
--- a/recipes/fuchsia/build.expected/default_multipliers.json
+++ b/recipes/fuchsia/build.expected/default_multipliers.json
@@ -2183,6 +2183,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=integration/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2829,6 +2833,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2893,6 +2899,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2949,6 +2957,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3028,6 +3038,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3092,6 +3104,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3148,6 +3162,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3219,6 +3235,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/failed_build_cq.json b/recipes/fuchsia/build.expected/failed_build_cq.json
index 11dc12c..4de00b5 100644
--- a/recipes/fuchsia/build.expected/failed_build_cq.json
+++ b/recipes/fuchsia/build.expected/failed_build_cq.json
@@ -2065,6 +2065,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2711,6 +2715,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2775,6 +2781,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2831,6 +2839,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2910,6 +2920,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2974,6 +2986,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3030,6 +3044,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3101,6 +3117,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/non_numeric_parent_id.json b/recipes/fuchsia/build.expected/non_numeric_parent_id.json
index 6a6b755..7face27 100644
--- a/recipes/fuchsia/build.expected/non_numeric_parent_id.json
+++ b/recipes/fuchsia/build.expected/non_numeric_parent_id.json
@@ -1621,6 +1621,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2261,6 +2265,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2325,6 +2331,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2381,6 +2389,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2460,6 +2470,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2524,6 +2536,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2580,6 +2594,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2651,6 +2667,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/run_all_tests.json b/recipes/fuchsia/build.expected/run_all_tests.json
index 08785df..6023443 100644
--- a/recipes/fuchsia/build.expected/run_all_tests.json
+++ b/recipes/fuchsia/build.expected/run_all_tests.json
@@ -2173,6 +2173,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=integration/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2667,6 +2671,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2717,6 +2723,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2759,6 +2767,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2824,6 +2834,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2874,6 +2886,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2916,6 +2930,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2973,6 +2989,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "integration/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/sdk.json b/recipes/fuchsia/build.expected/sdk.json
index 59a8cc3..7b4c706 100644
--- a/recipes/fuchsia/build.expected/sdk.json
+++ b/recipes/fuchsia/build.expected/sdk.json
@@ -1649,6 +1649,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2291,6 +2295,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2355,6 +2361,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2411,6 +2419,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2490,6 +2500,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2554,6 +2566,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2610,6 +2624,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2681,6 +2697,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/build.expected/skip_if_unaffected.json b/recipes/fuchsia/build.expected/skip_if_unaffected.json
index b7d66c1..6be9194 100644
--- a/recipes/fuchsia/build.expected/skip_if_unaffected.json
+++ b/recipes/fuchsia/build.expected/skip_if_unaffected.json
@@ -2074,6 +2074,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
diff --git a/recipes/fuchsia/build.expected/test_on_gce.json b/recipes/fuchsia/build.expected/test_on_gce.json
index 33d7277..93e3c32 100644
--- a/recipes/fuchsia/build.expected/test_on_gce.json
+++ b/recipes/fuchsia/build.expected/test_on_gce.json
@@ -1536,6 +1536,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=//",
+      "--env",
+      "BUILDBUCKET_ID=0",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2144,6 +2148,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2207,6 +2213,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2262,6 +2270,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2340,6 +2350,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2403,6 +2415,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2458,6 +2472,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2528,6 +2544,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/coverage.expected/collect_absolute.json b/recipes/fuchsia/coverage.expected/collect_absolute.json
index 14f5752..4503e9e 100644
--- a/recipes/fuchsia/coverage.expected/collect_absolute.json
+++ b/recipes/fuchsia/coverage.expected/collect_absolute.json
@@ -1324,6 +1324,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/default.json b/recipes/fuchsia/coverage.expected/default.json
index 1bd9639..ca91eda 100644
--- a/recipes/fuchsia/coverage.expected/default.json
+++ b/recipes/fuchsia/coverage.expected/default.json
@@ -911,6 +911,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/default_ctf.json b/recipes/fuchsia/coverage.expected/default_ctf.json
index 43dbd81..9e2a321 100644
--- a/recipes/fuchsia/coverage.expected/default_ctf.json
+++ b/recipes/fuchsia/coverage.expected/default_ctf.json
@@ -911,6 +911,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/fuchsia-ctf-coverage",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/default_led.json b/recipes/fuchsia/coverage.expected/default_led.json
index f7ec951..ec48794 100644
--- a/recipes/fuchsia/coverage.expected/default_led.json
+++ b/recipes/fuchsia/coverage.expected/default_led.json
@@ -1536,6 +1536,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "led/user_example.com/abc123",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/led_with_child_build_ids.json b/recipes/fuchsia/coverage.expected/led_with_child_build_ids.json
index 52d14f0..555fe16 100644
--- a/recipes/fuchsia/coverage.expected/led_with_child_build_ids.json
+++ b/recipes/fuchsia/coverage.expected/led_with_child_build_ids.json
@@ -1125,6 +1125,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "led/user_example.com/abc123",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/no_orchestration_inputs.json b/recipes/fuchsia/coverage.expected/no_orchestration_inputs.json
index c00bd9a..5d3e703 100644
--- a/recipes/fuchsia/coverage.expected/no_orchestration_inputs.json
+++ b/recipes/fuchsia/coverage.expected/no_orchestration_inputs.json
@@ -911,6 +911,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/no_test_tasks.json b/recipes/fuchsia/coverage.expected/no_test_tasks.json
index 8175919..391e778 100644
--- a/recipes/fuchsia/coverage.expected/no_test_tasks.json
+++ b/recipes/fuchsia/coverage.expected/no_test_tasks.json
@@ -899,6 +899,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/skipped_build.json b/recipes/fuchsia/coverage.expected/skipped_build.json
index dded12f..a1261fb 100644
--- a/recipes/fuchsia/coverage.expected/skipped_build.json
+++ b/recipes/fuchsia/coverage.expected/skipped_build.json
@@ -1344,6 +1344,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/skipped_testing.json b/recipes/fuchsia/coverage.expected/skipped_testing.json
index 10035bf..ae61e61 100644
--- a/recipes/fuchsia/coverage.expected/skipped_testing.json
+++ b/recipes/fuchsia/coverage.expected/skipped_testing.json
@@ -1297,6 +1297,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/too_many_unexpected_malformed_tests.json b/recipes/fuchsia/coverage.expected/too_many_unexpected_malformed_tests.json
index a01d406..8df5a14 100644
--- a/recipes/fuchsia/coverage.expected/too_many_unexpected_malformed_tests.json
+++ b/recipes/fuchsia/coverage.expected/too_many_unexpected_malformed_tests.json
@@ -911,6 +911,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/coverage.expected/unexpected_malformed_tests.json b/recipes/fuchsia/coverage.expected/unexpected_malformed_tests.json
index 0bc2bdc..1438c0a 100644
--- a/recipes/fuchsia/coverage.expected/unexpected_malformed_tests.json
+++ b/recipes/fuchsia/coverage.expected/unexpected_malformed_tests.json
@@ -911,6 +911,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/determinism_check.expected/deterministic_build.json b/recipes/fuchsia/determinism_check.expected/deterministic_build.json
index 0ba55db..0255b9d 100644
--- a/recipes/fuchsia/determinism_check.expected/deterministic_build.json
+++ b/recipes/fuchsia/determinism_check.expected/deterministic_build.json
@@ -1257,6 +1257,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1897,6 +1901,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1961,6 +1967,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2017,6 +2025,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2096,6 +2106,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2160,6 +2172,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2216,6 +2230,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2287,6 +2303,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3827,6 +3845,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -4245,6 +4267,8 @@
       "[CLEANUP]/tmp_tmp_7"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_2/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/determinism_check.expected/differences_found.json b/recipes/fuchsia/determinism_check.expected/differences_found.json
index a0b903c..7995b02 100644
--- a/recipes/fuchsia/determinism_check.expected/differences_found.json
+++ b/recipes/fuchsia/determinism_check.expected/differences_found.json
@@ -1257,6 +1257,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1897,6 +1901,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1961,6 +1967,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2017,6 +2025,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2096,6 +2106,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2160,6 +2172,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2216,6 +2230,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2287,6 +2303,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3827,6 +3845,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -4245,6 +4267,8 @@
       "[CLEANUP]/tmp_tmp_7"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_2/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/fuchsia/profile.expected/default.json b/recipes/fuchsia/profile.expected/default.json
index 9560761..88b2b3c 100644
--- a/recipes/fuchsia/profile.expected/default.json
+++ b/recipes/fuchsia/profile.expected/default.json
@@ -902,6 +902,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/profile.expected/default_cas.json b/recipes/fuchsia/profile.expected/default_cas.json
index 30d82c3..a8deed3 100644
--- a/recipes/fuchsia/profile.expected/default_cas.json
+++ b/recipes/fuchsia/profile.expected/default_cas.json
@@ -902,6 +902,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/profile.expected/default_led.json b/recipes/fuchsia/profile.expected/default_led.json
index 8810635..e66ec5d 100644
--- a/recipes/fuchsia/profile.expected/default_led.json
+++ b/recipes/fuchsia/profile.expected/default_led.json
@@ -1606,6 +1606,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "led/user_example.com/abc123",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/fuchsia/profile.expected/led_with_child_build_ids.json b/recipes/fuchsia/profile.expected/led_with_child_build_ids.json
index 6992f19..13980ee 100644
--- a/recipes/fuchsia/profile.expected/led_with_child_build_ids.json
+++ b/recipes/fuchsia/profile.expected/led_with_child_build_ids.json
@@ -1125,6 +1125,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "led/user_example.com/abc123",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/prebuilt_host_tool.expected/ci.json b/recipes/prebuilt_host_tool.expected/ci.json
index 00de278..dfffee3 100644
--- a/recipes/prebuilt_host_tool.expected/ci.json
+++ b/recipes/prebuilt_host_tool.expected/ci.json
@@ -1187,6 +1187,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1827,6 +1831,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1891,6 +1897,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1947,6 +1955,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2026,6 +2036,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2090,6 +2102,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2146,6 +2160,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2217,6 +2233,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/prebuilt_host_tool.expected/cq.json b/recipes/prebuilt_host_tool.expected/cq.json
index 1018136..070f208 100644
--- a/recipes/prebuilt_host_tool.expected/cq.json
+++ b/recipes/prebuilt_host_tool.expected/cq.json
@@ -1760,6 +1760,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2406,6 +2410,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2470,6 +2476,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2526,6 +2534,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2605,6 +2615,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2669,6 +2681,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2725,6 +2739,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2796,6 +2812,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/release/platform_version_roller.expected/dry_run.json b/recipes/release/platform_version_roller.expected/dry_run.json
index 3a561ef..8b5b144 100644
--- a/recipes/release/platform_version_roller.expected/dry_run.json
+++ b/recipes/release/platform_version_roller.expected/dry_run.json
@@ -1360,6 +1360,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=//",
+      "--env",
+      "BUILDBUCKET_ID=0",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1825,6 +1829,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1877,6 +1883,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1921,6 +1929,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1988,6 +1998,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2040,6 +2052,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2084,6 +2098,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2143,6 +2159,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/release/platform_version_roller.expected/freeze.json b/recipes/release/platform_version_roller.expected/freeze.json
index 5590df2..58c3cf6 100644
--- a/recipes/release/platform_version_roller.expected/freeze.json
+++ b/recipes/release/platform_version_roller.expected/freeze.json
@@ -1318,6 +1318,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=//",
+      "--env",
+      "BUILDBUCKET_ID=0",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1783,6 +1787,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1835,6 +1841,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1879,6 +1887,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1946,6 +1956,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1998,6 +2010,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2042,6 +2056,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2101,6 +2117,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/release/platform_version_roller.expected/roll.json b/recipes/release/platform_version_roller.expected/roll.json
index ea7ce59..5197c25 100644
--- a/recipes/release/platform_version_roller.expected/roll.json
+++ b/recipes/release/platform_version_roller.expected/roll.json
@@ -1354,6 +1354,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=//",
+      "--env",
+      "BUILDBUCKET_ID=0",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1819,6 +1823,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1871,6 +1877,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1915,6 +1923,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1982,6 +1992,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2034,6 +2046,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2078,6 +2092,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2137,6 +2153,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "//",
+      "BUILDBUCKET_ID": "0",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/run_script.expected/ci_with_fuchsia_build.json b/recipes/run_script.expected/ci_with_fuchsia_build.json
index 80e65c3..0e8cc2f 100644
--- a/recipes/run_script.expected/ci_with_fuchsia_build.json
+++ b/recipes/run_script.expected/ci_with_fuchsia_build.json
@@ -1252,6 +1252,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=project/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1892,6 +1896,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1956,6 +1962,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2012,6 +2020,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2091,6 +2101,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2155,6 +2167,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2211,6 +2225,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2282,6 +2298,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "project/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/sdk.expected/explicit_tryjobs.json b/recipes/sdk.expected/explicit_tryjobs.json
index 6ac5bdb..3b45715 100644
--- a/recipes/sdk.expected/explicit_tryjobs.json
+++ b/recipes/sdk.expected/explicit_tryjobs.json
@@ -1180,6 +1180,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/sdk.expected/explicit_tryjobs_without_cl.json b/recipes/sdk.expected/explicit_tryjobs_without_cl.json
index 25e90e8..d3dbf0d 100644
--- a/recipes/sdk.expected/explicit_tryjobs_without_cl.json
+++ b/recipes/sdk.expected/explicit_tryjobs_without_cl.json
@@ -1330,6 +1330,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/sdk.expected/external_testing.json b/recipes/sdk.expected/external_testing.json
index 47a9af3..9c3bc7d 100644
--- a/recipes/sdk.expected/external_testing.json
+++ b/recipes/sdk.expected/external_testing.json
@@ -1180,6 +1180,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/sdk.expected/fxt_tests.json b/recipes/sdk.expected/fxt_tests.json
index 876be88..8615f46 100644
--- a/recipes/sdk.expected/fxt_tests.json
+++ b/recipes/sdk.expected/fxt_tests.json
@@ -1180,6 +1180,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/sdk.expected/release_with_companion_images.json b/recipes/sdk.expected/release_with_companion_images.json
index 9f1baa4..761b623 100644
--- a/recipes/sdk.expected/release_with_companion_images.json
+++ b/recipes/sdk.expected/release_with_companion_images.json
@@ -1430,6 +1430,8 @@
     ],
     "cwd": "[START_DIR]/fuchsia",
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "HOME": "[CLEANUP]",
       "XDG_CACHE_HOME": "[CLEANUP]",
       "XDG_CONFIG_HOME": "[CLEANUP]",
diff --git a/recipes/static_checks.expected/default_ci.json b/recipes/static_checks.expected/default_ci.json
index d304bbd..4099fea 100644
--- a/recipes/static_checks.expected/default_ci.json
+++ b/recipes/static_checks.expected/default_ci.json
@@ -1265,6 +1265,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -1905,6 +1909,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -1969,6 +1975,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2025,6 +2033,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2104,6 +2114,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2168,6 +2180,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2224,6 +2238,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2295,6 +2311,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/ci/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/static_checks.expected/default_cq.json b/recipes/static_checks.expected/default_cq.json
index 68dcf24..3607704 100644
--- a/recipes/static_checks.expected/default_cq.json
+++ b/recipes/static_checks.expected/default_cq.json
@@ -1675,6 +1675,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2321,6 +2325,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2385,6 +2391,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2441,6 +2449,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2520,6 +2530,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2584,6 +2596,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2640,6 +2654,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2711,6 +2727,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/static_checks.expected/failed_build.json b/recipes/static_checks.expected/failed_build.json
index cec07fb..bab42ad 100644
--- a/recipes/static_checks.expected/failed_build.json
+++ b/recipes/static_checks.expected/failed_build.json
@@ -1676,6 +1676,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2322,6 +2326,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2386,6 +2392,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2442,6 +2450,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2521,6 +2531,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2585,6 +2597,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2641,6 +2655,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2712,6 +2728,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/static_checks.expected/failed_licenses_check.json b/recipes/static_checks.expected/failed_licenses_check.json
index b4b8b1c..0eb2047 100644
--- a/recipes/static_checks.expected/failed_licenses_check.json
+++ b/recipes/static_checks.expected/failed_licenses_check.json
@@ -1675,6 +1675,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2321,6 +2325,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2385,6 +2391,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2441,6 +2449,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2520,6 +2530,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2584,6 +2596,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2640,6 +2654,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2711,6 +2727,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/static_checks.expected/failed_metadata_textproto_check.json b/recipes/static_checks.expected/failed_metadata_textproto_check.json
index 974a86c..b1f96fa 100644
--- a/recipes/static_checks.expected/failed_metadata_textproto_check.json
+++ b/recipes/static_checks.expected/failed_metadata_textproto_check.json
@@ -1675,6 +1675,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2321,6 +2325,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2385,6 +2391,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2441,6 +2449,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2520,6 +2530,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2584,6 +2596,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2640,6 +2654,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2711,6 +2727,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/static_checks.expected/failed_shac.json b/recipes/static_checks.expected/failed_shac.json
index 32efe47..7ca3982 100644
--- a/recipes/static_checks.expected/failed_shac.json
+++ b/recipes/static_checks.expected/failed_shac.json
@@ -1675,6 +1675,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2321,6 +2325,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2385,6 +2391,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2441,6 +2449,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2520,6 +2530,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2584,6 +2596,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2640,6 +2654,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2711,6 +2727,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/tricium/tricium.expected/attribute_disable.json b/recipes/tricium/tricium.expected/attribute_disable.json
index 60d78de..60ded8e 100644
--- a/recipes/tricium/tricium.expected/attribute_disable.json
+++ b/recipes/tricium/tricium.expected/attribute_disable.json
@@ -1767,6 +1767,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2413,6 +2417,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2477,6 +2483,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2533,6 +2541,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2612,6 +2622,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2676,6 +2688,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2732,6 +2746,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2803,6 +2819,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/tricium/tricium.expected/default.json b/recipes/tricium/tricium.expected/default.json
index e466ee5..62c8570 100644
--- a/recipes/tricium/tricium.expected/default.json
+++ b/recipes/tricium/tricium.expected/default.json
@@ -2049,6 +2049,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2695,6 +2699,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2759,6 +2765,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2815,6 +2823,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2894,6 +2904,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2958,6 +2970,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3014,6 +3028,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -3085,6 +3101,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
diff --git a/recipes/tricium/tricium.expected/one_analysis_fails.json b/recipes/tricium/tricium.expected/one_analysis_fails.json
index b80fd30..bdb80de 100644
--- a/recipes/tricium/tricium.expected/one_analysis_fails.json
+++ b/recipes/tricium/tricium.expected/one_analysis_fails.json
@@ -1767,6 +1767,10 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
+      "BUILDBUCKET_BUILDER=fuchsia/try/builder",
+      "--env",
+      "BUILDBUCKET_ID=8945511751514863184",
+      "--env",
       "HOME=/tmp",
       "--env",
       "PATH=/usr/bin:/bin",
@@ -2413,6 +2417,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2477,6 +2483,8 @@
       "[START_DIR]/cipd_tool/fuchsia/infra/buildproxywrap/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2533,6 +2541,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2612,6 +2622,8 @@
       "/path/to/tmp/"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2676,6 +2688,8 @@
       "[START_DIR]/cipd_tool/fuchsia/third_party/socat/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2732,6 +2746,8 @@
       "/path/to/tmp/json"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",
@@ -2803,6 +2819,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
+      "BUILDBUCKET_BUILDER": "fuchsia/try/builder",
+      "BUILDBUCKET_ID": "8945511751514863184",
       "FOO": "[CLEANUP]/buildproxy_socket_dir_tmp_1/foo.sock",
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
       "GOMA_USE_LOCAL": "False",