[recipes] Remove references to build.infra.swarming

This will be safe to land after swarming as a task backend is rolled out
at 100%.

Change-Id: Ib875f0259e16e96150739c7047073149ebf1ea01
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1016793
Commit-Queue: Oliver Newman <olivernewman@google.com>
Reviewed-by: Ina Huh <ihuh@google.com>
diff --git a/recipe_modules/gce/tests/full.py b/recipe_modules/gce/tests/full.py
index 165e49c..fbf7fce 100644
--- a/recipe_modules/gce/tests/full.py
+++ b/recipe_modules/gce/tests/full.py
@@ -35,7 +35,7 @@
     yield api.test("basic") + api.buildbucket.build(
         build_pb2.Build(
             infra=build_pb2.BuildInfra(
-                swarming=build_pb2.BuildInfra.Swarming(
+                backend=build_pb2.BuildInfra.Backend(
                     hostname="chrome-swarming.appspot.com",
                 )
             )
diff --git a/recipe_modules/recipe_testing/api.py b/recipe_modules/recipe_testing/api.py
index 8fb48c1..d4bf06b 100644
--- a/recipe_modules/recipe_testing/api.py
+++ b/recipe_modules/recipe_testing/api.py
@@ -29,11 +29,6 @@
 
         build = led_data.result.buildbucket.bbagent_args.build
         self._infra_pb = build.infra
-        self._original_priority = (
-            build.infra.backend.config["priority"]
-            if "priority" in build.infra.backend.config
-            else build.infra.swarming.priority
-        )
 
     def include_cl(self, cl):
         self._led_data = self._led_data.then("edit-gerrit-cl", cl)
diff --git a/recipe_modules/subbuild/test_api.py b/recipe_modules/subbuild/test_api.py
index b3e07b4..b4cc24a 100644
--- a/recipe_modules/subbuild/test_api.py
+++ b/recipe_modules/subbuild/test_api.py
@@ -90,13 +90,9 @@
         i = 0
         for build in builds:
             i += 1
-            suffix = ""
-            if i > 1:
-                suffix = f" ({int(i)})"
-
             task_id = f"fake-task-id-{int(i)}"
 
-            # led launch mock will take ....infra.swarming.task_id as this
+            # led launch mock will take ....infra.backend.task.id.id as this
             # build's launched swarming ID.
             jd = job_pb2.Definition()
             jd.buildbucket.bbagent_args.build.CopyFrom(build)
diff --git a/recipe_modules/testing_requests/api.py b/recipe_modules/testing_requests/api.py
index 17ddd04..db4fe91 100644
--- a/recipe_modules/testing_requests/api.py
+++ b/recipe_modules/testing_requests/api.py
@@ -466,7 +466,7 @@
                     test_spec.gce_mediator.endpoint,
                     test_spec.gce_mediator.cloud_project,
                     test_spec.gce_mediator.machine_shape,
-                    self.m.buildbucket.swarming_parent_run_id,
+                    self.m.buildbucket.backend_task_id_from_build(buildbucket_build),
                     build_results.build_dir.join(config_basename),
                 )
                 cleanup_upload_paths.append(
diff --git a/recipe_modules/testing_requests/tests/full.expected/gce_dev.json b/recipe_modules/testing_requests/tests/full.expected/gce_dev.json
index 80e7436..a7d7c3d 100644
--- a/recipe_modules/testing_requests/tests/full.expected/gce_dev.json
+++ b/recipe_modules/testing_requests/tests/full.expected/gce_dev.json
@@ -13,10 +13,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,10 +54,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -97,10 +99,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -134,10 +137,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -158,16 +162,17 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"build_id\": \"50a11839dfdb5911\",\n    \"cloud_project\": \"gcem-cloud-project\",\n    \"machine_shape\": \"n2-standard-4\",\n    \"mediator_url\": \"gcem-endpoint\",\n    \"swarming_server\": \"chrome-swarming\",\n    \"type\": \"gce\"\n  }\n]",
+      "[\n  {\n    \"build_id\": \"\",\n    \"cloud_project\": \"gcem-cloud-project\",\n    \"machine_shape\": \"n2-standard-4\",\n    \"mediator_url\": \"gcem-endpoint\",\n    \"swarming_server\": \"\",\n    \"type\": \"gce\"\n  }\n]",
       "[START_DIR]/out/not-default/NAME.botanist.json"
     ],
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -178,11 +183,11 @@
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@[@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@  {@@@",
-      "@@@STEP_LOG_LINE@NAME.botanist.json@    \"build_id\": \"50a11839dfdb5911\",@@@",
+      "@@@STEP_LOG_LINE@NAME.botanist.json@    \"build_id\": \"\",@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@    \"cloud_project\": \"gcem-cloud-project\",@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@    \"machine_shape\": \"n2-standard-4\",@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@    \"mediator_url\": \"gcem-endpoint\",@@@",
-      "@@@STEP_LOG_LINE@NAME.botanist.json@    \"swarming_server\": \"chrome-swarming\",@@@",
+      "@@@STEP_LOG_LINE@NAME.botanist.json@    \"swarming_server\": \"\",@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@    \"type\": \"gce\"@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@  }@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@]@@@",
@@ -203,10 +208,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -237,10 +243,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -281,10 +288,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -318,10 +326,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -355,10 +364,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -393,10 +403,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -423,10 +434,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -464,10 +476,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -493,10 +506,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -520,10 +534,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -550,10 +565,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -579,10 +595,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -601,7 +618,7 @@
       "@@@STEP_LOG_LINE@requests@  {@@@",
       "@@@STEP_LOG_LINE@requests@    \"name\": \"NAME\",@@@",
       "@@@STEP_LOG_LINE@requests@    \"priority\": \"200\",@@@",
-      "@@@STEP_LOG_LINE@requests@    \"realm\": \":\",@@@",
+      "@@@STEP_LOG_LINE@requests@    \"realm\": \"fuchsia:ci\",@@@",
       "@@@STEP_LOG_LINE@requests@    \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@requests@      \"enable\": true@@@",
       "@@@STEP_LOG_LINE@requests@    },@@@",
@@ -609,11 +626,13 @@
       "@@@STEP_LOG_LINE@requests@    \"tags\": [@@@",
       "@@@STEP_LOG_LINE@requests@      \"board:boards/bar.gni\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"build_type:release\",@@@",
+      "@@@STEP_LOG_LINE@requests@      \"buildbucket_bucket:ci\",@@@",
+      "@@@STEP_LOG_LINE@requests@      \"buildbucket_builder:builder\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"product:products/foo.gni\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"role:tester\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"task_name:NAME\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"test_environment_name:GCE-x64\",@@@",
-      "@@@STEP_LOG_LINE@requests@      \"test_shard_hash:8074d899f238197f795d40d78e1b9891635646c1eacca4dd76987be8af6caa19\"@@@",
+      "@@@STEP_LOG_LINE@requests@      \"test_shard_hash:0450fead93cf687a5005598045d8d4edb608c315111ecb300827f92c5d6caa8a\"@@@",
       "@@@STEP_LOG_LINE@requests@    ],@@@",
       "@@@STEP_LOG_LINE@requests@    \"task_slices\": [@@@",
       "@@@STEP_LOG_LINE@requests@      {@@@",
@@ -649,7 +668,7 @@
       "@@@STEP_LOG_LINE@requests@            \"./rdb\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"stream\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-var\",@@@",
-      "@@@STEP_LOG_LINE@requests@            \"builder:\",@@@",
+      "@@@STEP_LOG_LINE@requests@            \"builder:builder\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"--\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"./luci-auth\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"context\",@@@",
@@ -661,7 +680,7 @@
       "@@@STEP_LOG_LINE@requests@            \"debug\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"run\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-images\",@@@",
-      "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/builds/0/images/images.json\",@@@",
+      "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/builds/8945511751514863184/images/images.json\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-timeout\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"1800s\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-ffx\",@@@",
@@ -671,7 +690,7 @@
       "@@@STEP_LOG_LINE@requests@            \"-product-bundle-name\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"foo.bar\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-repo\",@@@",
-      "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/builds/0/packages/repository\",@@@",
+      "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/builds/8945511751514863184/packages/repository\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-blobs\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/blobs\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-local-repo\",@@@",
@@ -721,8 +740,16 @@
       "@@@STEP_LOG_LINE@requests@              \"value\": \"./linux_x64/bootserver_new\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILDBUCKET_ID\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILDER_NAME\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"builder\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILD_CREATE_TIME\",@@@",
-      "@@@STEP_LOG_LINE@requests@              \"value\": \"1337000001\"@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"1527292217\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"FUCHSIA_DEVICE_TYPE\",@@@",
@@ -734,7 +761,11 @@
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"IMAGE_MANIFEST_PATH\",@@@",
-      "@@@STEP_LOG_LINE@requests@              \"value\": \"gs://fuchsia-artifacts/builds/0/images/images.json\"@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"gs://fuchsia-artifacts/builds/8945511751514863184/images/images.json\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"INPUT_COMMIT_HOST\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"fuchsia.googlesource.com\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"LSAN_SYMBOLIZER_PATH\",@@@",
@@ -783,7 +814,7 @@
       "@@@STEP_LOG_LINE@requests@  {@@@",
       "@@@STEP_LOG_LINE@requests@    \"name\": \"NAME2\",@@@",
       "@@@STEP_LOG_LINE@requests@    \"priority\": \"200\",@@@",
-      "@@@STEP_LOG_LINE@requests@    \"realm\": \":\",@@@",
+      "@@@STEP_LOG_LINE@requests@    \"realm\": \"fuchsia:ci\",@@@",
       "@@@STEP_LOG_LINE@requests@    \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@requests@      \"enable\": true@@@",
       "@@@STEP_LOG_LINE@requests@    },@@@",
@@ -791,11 +822,13 @@
       "@@@STEP_LOG_LINE@requests@    \"tags\": [@@@",
       "@@@STEP_LOG_LINE@requests@      \"board:boards/bar.gni\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"build_type:release\",@@@",
+      "@@@STEP_LOG_LINE@requests@      \"buildbucket_bucket:ci\",@@@",
+      "@@@STEP_LOG_LINE@requests@      \"buildbucket_builder:builder\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"product:products/foo.gni\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"role:tester\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"task_name:NAME2\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"test_environment_name:Linux-x64\",@@@",
-      "@@@STEP_LOG_LINE@requests@      \"test_shard_hash:df47093aece564ab70c629cbc89fe68cd37e438128280d8acc065dc9c9c0b197\"@@@",
+      "@@@STEP_LOG_LINE@requests@      \"test_shard_hash:a8a9d04b7f649ad6f0380f724015c0404d7d69a87fe2f52414ee4319f1ff3b20\"@@@",
       "@@@STEP_LOG_LINE@requests@    ],@@@",
       "@@@STEP_LOG_LINE@requests@    \"task_slices\": [@@@",
       "@@@STEP_LOG_LINE@requests@      {@@@",
@@ -831,7 +864,7 @@
       "@@@STEP_LOG_LINE@requests@            \"./rdb\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"stream\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-var\",@@@",
-      "@@@STEP_LOG_LINE@requests@            \"builder:\",@@@",
+      "@@@STEP_LOG_LINE@requests@            \"builder:builder\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"--\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"./luci-auth\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"context\",@@@",
@@ -888,8 +921,16 @@
       "@@@STEP_LOG_LINE@requests@              \"value\": \"./linux_x64/bootserver_new\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILDBUCKET_ID\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILDER_NAME\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"builder\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILD_CREATE_TIME\",@@@",
-      "@@@STEP_LOG_LINE@requests@              \"value\": \"1337000003\"@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"1527292217\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"FUCHSIA_TEST_OUTDIR\",@@@",
@@ -897,7 +938,11 @@
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"IMAGE_MANIFEST_PATH\",@@@",
-      "@@@STEP_LOG_LINE@requests@              \"value\": \"gs://fuchsia-artifacts/builds/0/images/images.json\"@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"gs://fuchsia-artifacts/builds/8945511751514863184/images/images.json\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"INPUT_COMMIT_HOST\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"fuchsia.googlesource.com\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"LSAN_SYMBOLIZER_PATH\",@@@",
diff --git a/recipe_modules/testing_requests/tests/full.expected/gce_prod.json b/recipe_modules/testing_requests/tests/full.expected/gce_prod.json
index 2f89985..229a05c 100644
--- a/recipe_modules/testing_requests/tests/full.expected/gce_prod.json
+++ b/recipe_modules/testing_requests/tests/full.expected/gce_prod.json
@@ -13,10 +13,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -53,10 +54,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -97,10 +99,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -134,10 +137,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -158,16 +162,17 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"build_id\": \"50a11839dfdb5911\",\n    \"cloud_project\": \"gcem-cloud-project\",\n    \"machine_shape\": \"n2-standard-4\",\n    \"mediator_url\": \"gcem-endpoint\",\n    \"swarming_server\": \"chrome-swarming\",\n    \"type\": \"gce\"\n  }\n]",
+      "[\n  {\n    \"build_id\": \"\",\n    \"cloud_project\": \"gcem-cloud-project\",\n    \"machine_shape\": \"n2-standard-4\",\n    \"mediator_url\": \"gcem-endpoint\",\n    \"swarming_server\": \"\",\n    \"type\": \"gce\"\n  }\n]",
       "[START_DIR]/out/not-default/NAME.botanist.json"
     ],
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -178,11 +183,11 @@
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@[@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@  {@@@",
-      "@@@STEP_LOG_LINE@NAME.botanist.json@    \"build_id\": \"50a11839dfdb5911\",@@@",
+      "@@@STEP_LOG_LINE@NAME.botanist.json@    \"build_id\": \"\",@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@    \"cloud_project\": \"gcem-cloud-project\",@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@    \"machine_shape\": \"n2-standard-4\",@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@    \"mediator_url\": \"gcem-endpoint\",@@@",
-      "@@@STEP_LOG_LINE@NAME.botanist.json@    \"swarming_server\": \"chrome-swarming\",@@@",
+      "@@@STEP_LOG_LINE@NAME.botanist.json@    \"swarming_server\": \"\",@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@    \"type\": \"gce\"@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@  }@@@",
       "@@@STEP_LOG_LINE@NAME.botanist.json@]@@@",
@@ -203,10 +208,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -237,10 +243,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -281,10 +288,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -318,10 +326,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -355,10 +364,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -393,10 +403,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -423,10 +434,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -464,10 +476,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -493,10 +506,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -520,10 +534,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -550,10 +565,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -579,10 +595,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -601,7 +618,7 @@
       "@@@STEP_LOG_LINE@requests@  {@@@",
       "@@@STEP_LOG_LINE@requests@    \"name\": \"NAME\",@@@",
       "@@@STEP_LOG_LINE@requests@    \"priority\": \"200\",@@@",
-      "@@@STEP_LOG_LINE@requests@    \"realm\": \":\",@@@",
+      "@@@STEP_LOG_LINE@requests@    \"realm\": \"fuchsia:ci\",@@@",
       "@@@STEP_LOG_LINE@requests@    \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@requests@      \"enable\": true@@@",
       "@@@STEP_LOG_LINE@requests@    },@@@",
@@ -609,11 +626,13 @@
       "@@@STEP_LOG_LINE@requests@    \"tags\": [@@@",
       "@@@STEP_LOG_LINE@requests@      \"board:boards/bar.gni\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"build_type:release\",@@@",
+      "@@@STEP_LOG_LINE@requests@      \"buildbucket_bucket:ci\",@@@",
+      "@@@STEP_LOG_LINE@requests@      \"buildbucket_builder:builder\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"product:products/foo.gni\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"role:tester\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"task_name:NAME\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"test_environment_name:GCE-x64\",@@@",
-      "@@@STEP_LOG_LINE@requests@      \"test_shard_hash:8074d899f238197f795d40d78e1b9891635646c1eacca4dd76987be8af6caa19\"@@@",
+      "@@@STEP_LOG_LINE@requests@      \"test_shard_hash:0450fead93cf687a5005598045d8d4edb608c315111ecb300827f92c5d6caa8a\"@@@",
       "@@@STEP_LOG_LINE@requests@    ],@@@",
       "@@@STEP_LOG_LINE@requests@    \"task_slices\": [@@@",
       "@@@STEP_LOG_LINE@requests@      {@@@",
@@ -649,7 +668,7 @@
       "@@@STEP_LOG_LINE@requests@            \"./rdb\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"stream\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-var\",@@@",
-      "@@@STEP_LOG_LINE@requests@            \"builder:\",@@@",
+      "@@@STEP_LOG_LINE@requests@            \"builder:builder\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"--\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"./luci-auth\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"context\",@@@",
@@ -661,7 +680,7 @@
       "@@@STEP_LOG_LINE@requests@            \"debug\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"run\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-images\",@@@",
-      "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/builds/0/images/images.json\",@@@",
+      "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/builds/8945511751514863184/images/images.json\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-timeout\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"1800s\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-ffx\",@@@",
@@ -671,7 +690,7 @@
       "@@@STEP_LOG_LINE@requests@            \"-product-bundle-name\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"foo.bar\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-repo\",@@@",
-      "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/builds/0/packages/repository\",@@@",
+      "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/builds/8945511751514863184/packages/repository\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-blobs\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"gs://fuchsia-artifacts/blobs\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-local-repo\",@@@",
@@ -721,8 +740,16 @@
       "@@@STEP_LOG_LINE@requests@              \"value\": \"./linux_x64/bootserver_new\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILDBUCKET_ID\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILDER_NAME\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"builder\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILD_CREATE_TIME\",@@@",
-      "@@@STEP_LOG_LINE@requests@              \"value\": \"1337000001\"@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"1527292217\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"FUCHSIA_DEVICE_TYPE\",@@@",
@@ -734,7 +761,11 @@
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"IMAGE_MANIFEST_PATH\",@@@",
-      "@@@STEP_LOG_LINE@requests@              \"value\": \"gs://fuchsia-artifacts/builds/0/images/images.json\"@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"gs://fuchsia-artifacts/builds/8945511751514863184/images/images.json\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"INPUT_COMMIT_HOST\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"fuchsia.googlesource.com\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"LSAN_SYMBOLIZER_PATH\",@@@",
@@ -783,7 +814,7 @@
       "@@@STEP_LOG_LINE@requests@  {@@@",
       "@@@STEP_LOG_LINE@requests@    \"name\": \"NAME2\",@@@",
       "@@@STEP_LOG_LINE@requests@    \"priority\": \"200\",@@@",
-      "@@@STEP_LOG_LINE@requests@    \"realm\": \":\",@@@",
+      "@@@STEP_LOG_LINE@requests@    \"realm\": \"fuchsia:ci\",@@@",
       "@@@STEP_LOG_LINE@requests@    \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@requests@      \"enable\": true@@@",
       "@@@STEP_LOG_LINE@requests@    },@@@",
@@ -791,11 +822,13 @@
       "@@@STEP_LOG_LINE@requests@    \"tags\": [@@@",
       "@@@STEP_LOG_LINE@requests@      \"board:boards/bar.gni\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"build_type:release\",@@@",
+      "@@@STEP_LOG_LINE@requests@      \"buildbucket_bucket:ci\",@@@",
+      "@@@STEP_LOG_LINE@requests@      \"buildbucket_builder:builder\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"product:products/foo.gni\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"role:tester\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"task_name:NAME2\",@@@",
       "@@@STEP_LOG_LINE@requests@      \"test_environment_name:Linux-x64\",@@@",
-      "@@@STEP_LOG_LINE@requests@      \"test_shard_hash:df47093aece564ab70c629cbc89fe68cd37e438128280d8acc065dc9c9c0b197\"@@@",
+      "@@@STEP_LOG_LINE@requests@      \"test_shard_hash:a8a9d04b7f649ad6f0380f724015c0404d7d69a87fe2f52414ee4319f1ff3b20\"@@@",
       "@@@STEP_LOG_LINE@requests@    ],@@@",
       "@@@STEP_LOG_LINE@requests@    \"task_slices\": [@@@",
       "@@@STEP_LOG_LINE@requests@      {@@@",
@@ -831,7 +864,7 @@
       "@@@STEP_LOG_LINE@requests@            \"./rdb\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"stream\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"-var\",@@@",
-      "@@@STEP_LOG_LINE@requests@            \"builder:\",@@@",
+      "@@@STEP_LOG_LINE@requests@            \"builder:builder\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"--\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"./luci-auth\",@@@",
       "@@@STEP_LOG_LINE@requests@            \"context\",@@@",
@@ -888,8 +921,16 @@
       "@@@STEP_LOG_LINE@requests@              \"value\": \"./linux_x64/bootserver_new\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILDBUCKET_ID\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"8945511751514863184\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILDER_NAME\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"builder\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"BUILD_CREATE_TIME\",@@@",
-      "@@@STEP_LOG_LINE@requests@              \"value\": \"1337000003\"@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"1527292217\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"FUCHSIA_TEST_OUTDIR\",@@@",
@@ -897,7 +938,11 @@
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"IMAGE_MANIFEST_PATH\",@@@",
-      "@@@STEP_LOG_LINE@requests@              \"value\": \"gs://fuchsia-artifacts/builds/0/images/images.json\"@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"gs://fuchsia-artifacts/builds/8945511751514863184/images/images.json\"@@@",
+      "@@@STEP_LOG_LINE@requests@            },@@@",
+      "@@@STEP_LOG_LINE@requests@            {@@@",
+      "@@@STEP_LOG_LINE@requests@              \"key\": \"INPUT_COMMIT_HOST\",@@@",
+      "@@@STEP_LOG_LINE@requests@              \"value\": \"fuchsia.googlesource.com\"@@@",
       "@@@STEP_LOG_LINE@requests@            },@@@",
       "@@@STEP_LOG_LINE@requests@            {@@@",
       "@@@STEP_LOG_LINE@requests@              \"key\": \"LSAN_SYMBOLIZER_PATH\",@@@",
diff --git a/recipe_modules/testing_requests/tests/full.py b/recipe_modules/testing_requests/tests/full.py
index 7ea45f3..5e10fd5 100644
--- a/recipe_modules/testing_requests/tests/full.py
+++ b/recipe_modules/testing_requests/tests/full.py
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from PB.go.chromium.org.luci.buildbucket.proto import build as build_pb2
 from PB.go.fuchsia.dev.fuchsia.tools.integration.fint.proto import (
     set_artifacts as fint_set_artifacts_pb2,
 )
@@ -327,29 +326,11 @@
         test_on_gce=True,
         device_type="GCE",
         pool="fuchsia.dev.tests",
-    ) + api.buildbucket.build(
-        build_pb2.Build(
-            infra=build_pb2.BuildInfra(
-                swarming=build_pb2.BuildInfra.Swarming(
-                    hostname="chrome-swarming.appspot.com",
-                    parent_run_id="50a11839dfdb5911",
-                )
-            )
-        )
     )
     yield api.buildbucket_util.test("gce_prod") + api.properties(
         test_on_gce=True,
         device_type="GCE",
         pool="fuchsia.tests",
-    ) + api.buildbucket.build(
-        build_pb2.Build(
-            infra=build_pb2.BuildInfra(
-                swarming=build_pb2.BuildInfra.Swarming(
-                    hostname="chrome-swarming.appspot.com",
-                    parent_run_id="50a11839dfdb5911",
-                )
-            )
-        )
     )
     yield api.buildbucket_util.test("cas_delivery_enabled") + api.properties(
         use_cas=True
diff --git a/recipes/fuchsia/build.expected/test_on_gce.json b/recipes/fuchsia/build.expected/test_on_gce.json
index 7838f38..8f37561 100644
--- a/recipes/fuchsia/build.expected/test_on_gce.json
+++ b/recipes/fuchsia/build.expected/test_on_gce.json
@@ -53,12 +53,31 @@
       "@@@STEP_LOG_LINE@properties@  },@@@",
       "@@@STEP_LOG_LINE@properties@  \"$recipe_engine/buildbucket\": {@@@",
       "@@@STEP_LOG_LINE@properties@    \"build\": {@@@",
+      "@@@STEP_LOG_LINE@properties@      \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@properties@      \"builder\": {@@@",
+      "@@@STEP_LOG_LINE@properties@        \"project\": \"fuchsia\",@@@",
+      "@@@STEP_LOG_LINE@properties@        \"bucket\": \"ci\",@@@",
+      "@@@STEP_LOG_LINE@properties@        \"builder\": \"builder\"@@@",
+      "@@@STEP_LOG_LINE@properties@      },@@@",
+      "@@@STEP_LOG_LINE@properties@      \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
+      "@@@STEP_LOG_LINE@properties@      \"createTime\": \"2018-05-25T23:50:17Z\",@@@",
+      "@@@STEP_LOG_LINE@properties@      \"input\": {@@@",
+      "@@@STEP_LOG_LINE@properties@        \"gitilesCommit\": {@@@",
+      "@@@STEP_LOG_LINE@properties@          \"host\": \"fuchsia.googlesource.com\",@@@",
+      "@@@STEP_LOG_LINE@properties@          \"project\": \"fuchsia\",@@@",
+      "@@@STEP_LOG_LINE@properties@          \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",@@@",
+      "@@@STEP_LOG_LINE@properties@          \"ref\": \"refs/heads/main\"@@@",
+      "@@@STEP_LOG_LINE@properties@        }@@@",
+      "@@@STEP_LOG_LINE@properties@      },@@@",
       "@@@STEP_LOG_LINE@properties@      \"infra\": {@@@",
       "@@@STEP_LOG_LINE@properties@        \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@properties@          \"hostname\": \"chrome-swarming.appspot.com\",@@@",
-      "@@@STEP_LOG_LINE@properties@          \"parentRunId\": \" 50a11839dfdb5911\"@@@",
+      "@@@STEP_LOG_LINE@properties@          \"priority\": 30@@@",
+      "@@@STEP_LOG_LINE@properties@        },@@@",
+      "@@@STEP_LOG_LINE@properties@        \"resultdb\": {@@@",
+      "@@@STEP_LOG_LINE@properties@          \"invocation\": \"invocations/build:8945511751514863184\"@@@",
       "@@@STEP_LOG_LINE@properties@        }@@@",
-      "@@@STEP_LOG_LINE@properties@      }@@@",
+      "@@@STEP_LOG_LINE@properties@      },@@@",
+      "@@@STEP_LOG_LINE@properties@      \"executionTimeout\": \"36000s\"@@@",
       "@@@STEP_LOG_LINE@properties@    }@@@",
       "@@@STEP_LOG_LINE@properties@  }@@@",
       "@@@STEP_LOG_LINE@properties@}@@@",
@@ -89,10 +108,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -115,10 +135,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -161,10 +182,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -200,10 +222,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -231,10 +254,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -277,10 +301,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -308,10 +333,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -343,10 +369,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -361,6 +388,41 @@
   },
   {
     "cmd": [
+      "[START_DIR]/cipd_tool/fuchsia/tools/jiri/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/jiri",
+      "override",
+      "-vv",
+      "-time",
+      "-timefile",
+      "/path/to/tmp/",
+      "-j=8",
+      "-revision",
+      "2d72510e447ab60a9728aeea2362d8be2cbd7789",
+      "fuchsia",
+      "https://fuchsia.googlesource.com/fuchsia"
+    ],
+    "cwd": "[START_DIR]/fuchsia",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "checkout.jiri override",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text[timing_stats]@@@",
+      "@@@STEP_LOG_END@raw_io.output_text[stderr]@@@"
+    ]
+  },
+  {
+    "cmd": [
       "vpython3",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -375,10 +437,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -404,10 +467,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -437,10 +501,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -468,10 +533,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -497,10 +563,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -533,10 +600,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -565,10 +633,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -611,10 +680,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -642,10 +712,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -670,10 +741,11 @@
     "cwd": "[START_DIR]/fuchsia",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -728,10 +800,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -766,10 +839,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -796,10 +870,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -836,10 +911,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -861,10 +937,11 @@
     "cwd": "[START_DIR]/fuchsia/integration",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -890,10 +967,11 @@
     "cwd": "[START_DIR]/fuchsia",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -939,10 +1017,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -963,8 +1042,7 @@
       "@@@STEP_LOG_END@some_cmd_stdout@@@",
       "@@@SET_BUILD_PROPERTY@fint_params_path@\"fint_params/core.textproto\"@@@",
       "@@@SET_BUILD_PROPERTY@ninja_action_metrics@{}@@@",
-      "@@@SET_BUILD_PROPERTY@ninja_duration_seconds@900@@@",
-      "@@@STEP_EXCEPTION@@@"
+      "@@@SET_BUILD_PROPERTY@ninja_duration_seconds@900@@@"
     ]
   },
   {
@@ -981,10 +1059,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1006,10 +1085,11 @@
     "cwd": "[START_DIR]/fuchsia",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1035,10 +1115,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1065,10 +1146,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1108,10 +1190,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1147,10 +1230,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1178,10 +1262,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1232,10 +1317,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1271,10 +1357,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1302,10 +1389,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1372,10 +1460,11 @@
     "cwd": "[START_DIR]/fuchsia",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1395,10 +1484,11 @@
     "cwd": "[START_DIR]/fuchsia",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1536,9 +1626,9 @@
       "--symlink",
       "/proc/self/fd/1:/dev/stdout",
       "--env",
-      "BUILDBUCKET_BUILDER=//",
+      "BUILDBUCKET_BUILDER=fuchsia/ci/builder",
       "--env",
-      "BUILDBUCKET_ID=0",
+      "BUILDBUCKET_ID=8945511751514863184",
       "--env",
       "HOME=/tmp",
       "--env",
@@ -1567,10 +1657,11 @@
     "cwd": "[START_DIR]/fuchsia",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1604,10 +1695,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1634,12 +1726,31 @@
     ]
   },
   {
-    "cmd": [],
+    "cmd": [
+      "rdb",
+      "stream",
+      "--",
+      "vpython3",
+      "RECIPE_MODULE[fuchsia::reported_step]/resources/resultdb.py",
+      "{\"testId\": \"gn_gen\", \"expected\": true, \"summaryHtml\": \"<ul><li><a href=\\\"https://cr-buildbucket.appspot.com/log/8945511751514863184/build|gn gen?log=raw_io.output_text[nsjail_log]\\\" target=\\\"_blank\\\">raw_io.output_text[nsjail_log]</a></li>\\n<li><a href=\\\"https://cr-buildbucket.appspot.com/log/8945511751514863184/build|gn gen?log=context.textproto\\\" target=\\\"_blank\\\">context.textproto</a></li>\\n<li><a href=\\\"https://cr-buildbucket.appspot.com/log/8945511751514863184/build|gn gen?log=stdout\\\" target=\\\"_blank\\\">stdout</a></li></ul>\", \"status\": \"PASS\"}"
+    ],
+    "cwd": "[START_DIR]/fuchsia",
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
     "name": "build.gn gen - upload to resultdb",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@ResultDB integration was not enabled for this build@@@",
-      "@@@STEP_EXCEPTION@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
@@ -1657,10 +1768,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1694,10 +1806,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1723,10 +1836,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1790,10 +1904,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1840,10 +1955,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1882,10 +1998,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1928,10 +2045,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1961,10 +2079,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -1996,7 +2115,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2011,10 +2130,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2044,7 +2164,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2059,10 +2179,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2090,7 +2211,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2105,10 +2226,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2161,7 +2283,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2176,10 +2298,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2219,7 +2342,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2234,10 +2357,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2269,7 +2393,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2284,10 +2408,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2342,7 +2467,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2357,10 +2482,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2400,7 +2526,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2415,10 +2541,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2450,7 +2577,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2465,10 +2592,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2510,8 +2638,8 @@
       "[CLEANUP]/tmp_tmp_3"
     ],
     "env": {
-      "BUILDBUCKET_BUILDER": "//",
-      "BUILDBUCKET_ID": "0",
+      "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",
@@ -2521,7 +2649,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2540,10 +2668,11 @@
     },
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2584,7 +2713,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2599,10 +2728,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2632,7 +2762,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2647,10 +2777,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2681,7 +2812,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2696,10 +2827,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2730,7 +2862,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2745,10 +2877,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2779,7 +2912,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2794,10 +2927,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2828,7 +2962,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2843,10 +2977,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2877,7 +3012,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2892,10 +3027,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2926,7 +3062,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2941,10 +3077,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -2975,7 +3112,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -2990,10 +3127,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3025,7 +3163,7 @@
       "RBE_enable_deps_cache": "true",
       "RBE_experimental_credentials_helper": "",
       "RBE_instance": "fake_rbe_instance",
-      "RBE_invocation_id": "bbid:0",
+      "RBE_invocation_id": "bbid:8945511751514863184",
       "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
       "RBE_log_format": "reducedtext",
       "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
@@ -3040,10 +3178,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3056,6 +3195,388 @@
     ]
   },
   {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[CLEANUP]/rbe_tmp_1/rbe_metrics.pb",
+      "/path/to/tmp/pb"
+    ],
+    "env": {
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "RBE_cache_dir": "[CACHE]/rbe/deps",
+      "RBE_deps_cache_max_mb": "512",
+      "RBE_enable_deps_cache": "true",
+      "RBE_experimental_credentials_helper": "",
+      "RBE_instance": "fake_rbe_instance",
+      "RBE_invocation_id": "bbid:8945511751514863184",
+      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_log_format": "reducedtext",
+      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_platform": "fake_rbe_platform",
+      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_service": "remotebuildexecution.googleapis.com:443",
+      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_use_application_default_credentials": "false",
+      "RBE_use_gce_credentials": "true"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "build.teardown remote execution.read rbe_metrics.pb",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "build.teardown remote execution.ensure infra/tools/bqupload/${platform}",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "build.teardown remote execution.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
+    ],
+    "env": {
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "RBE_cache_dir": "[CACHE]/rbe/deps",
+      "RBE_deps_cache_max_mb": "512",
+      "RBE_enable_deps_cache": "true",
+      "RBE_experimental_credentials_helper": "",
+      "RBE_instance": "fake_rbe_instance",
+      "RBE_invocation_id": "bbid:8945511751514863184",
+      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_log_format": "reducedtext",
+      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_platform": "fake_rbe_platform",
+      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_service": "remotebuildexecution.googleapis.com:443",
+      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_use_application_default_credentials": "false",
+      "RBE_use_gce_credentials": "true"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "build.teardown remote execution.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "build.teardown remote execution.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0o777",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
+    ],
+    "env": {
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "RBE_cache_dir": "[CACHE]/rbe/deps",
+      "RBE_deps_cache_max_mb": "512",
+      "RBE_enable_deps_cache": "true",
+      "RBE_experimental_credentials_helper": "",
+      "RBE_instance": "fake_rbe_instance",
+      "RBE_invocation_id": "bbid:8945511751514863184",
+      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_log_format": "reducedtext",
+      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_platform": "fake_rbe_platform",
+      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_service": "remotebuildexecution.googleapis.com:443",
+      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_use_application_default_credentials": "false",
+      "RBE_use_gce_credentials": "true"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "build.teardown remote execution.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@4@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
+      "-ensure-file",
+      "infra/tools/bqupload/${platform} version:pinned-version",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "env": {
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "RBE_cache_dir": "[CACHE]/rbe/deps",
+      "RBE_deps_cache_max_mb": "512",
+      "RBE_enable_deps_cache": "true",
+      "RBE_experimental_credentials_helper": "",
+      "RBE_instance": "fake_rbe_instance",
+      "RBE_invocation_id": "bbid:8945511751514863184",
+      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_log_format": "reducedtext",
+      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_platform": "fake_rbe_platform",
+      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_service": "remotebuildexecution.googleapis.com:443",
+      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_use_application_default_credentials": "false",
+      "RBE_use_gce_credentials": "true"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "build.teardown remote execution.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
+      "fuchsia-engprod-metrics-prod.metrics.rbe_client_metrics_raw",
+      "{\"build_id\": \"8945511751514863184\", \"builder_name\": \"builder\", \"created_at\": \"2012-05-14T12:53:24.500Z\", \"instance\": \"fake_rbe_instance\", \"stats\": \"{\\\"environment\\\": {\\\"bar\\\": \\\"42\\\", \\\"foo\\\": \\\"false\\\"}}\"}"
+    ],
+    "env": {
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "RBE_cache_dir": "[CACHE]/rbe/deps",
+      "RBE_deps_cache_max_mb": "512",
+      "RBE_enable_deps_cache": "true",
+      "RBE_experimental_credentials_helper": "",
+      "RBE_instance": "fake_rbe_instance",
+      "RBE_invocation_id": "bbid:8945511751514863184",
+      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_log_format": "reducedtext",
+      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_platform": "fake_rbe_platform",
+      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_service": "remotebuildexecution.googleapis.com:443",
+      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_use_application_default_credentials": "false",
+      "RBE_use_gce_credentials": "true"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "build.teardown remote execution.upload metrics",
+    "tags": {
+      "fuchsia.failure_alert_emails": "olivernewman@google.com"
+    },
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"environment\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"bar\": \"42\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"foo\": \"false\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/fuchsia/out/not-default/linux_x64/logdump",
+      "--proxy_log_dir",
+      "[CLEANUP]/rbe_tmp_1",
+      "--output_dir",
+      "[CLEANUP]/rbe_tmp_1"
+    ],
+    "env": {
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "RBE_cache_dir": "[CACHE]/rbe/deps",
+      "RBE_deps_cache_max_mb": "512",
+      "RBE_enable_deps_cache": "true",
+      "RBE_experimental_credentials_helper": "",
+      "RBE_instance": "fake_rbe_instance",
+      "RBE_invocation_id": "bbid:8945511751514863184",
+      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_log_format": "reducedtext",
+      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_platform": "fake_rbe_platform",
+      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_service": "remotebuildexecution.googleapis.com:443",
+      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_use_application_default_credentials": "false",
+      "RBE_use_gce_credentials": "true"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "build.teardown remote execution.convert reproxy command log to binary proto",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython3",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[CLEANUP]/rbe_tmp_1/reproxy_log.pb",
+      "/path/to/tmp/pb"
+    ],
+    "env": {
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False",
+      "RBE_cache_dir": "[CACHE]/rbe/deps",
+      "RBE_deps_cache_max_mb": "512",
+      "RBE_enable_deps_cache": "true",
+      "RBE_experimental_credentials_helper": "",
+      "RBE_instance": "fake_rbe_instance",
+      "RBE_invocation_id": "bbid:8945511751514863184",
+      "RBE_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_log_format": "reducedtext",
+      "RBE_output_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_platform": "fake_rbe_platform",
+      "RBE_proxy_log_dir": "[CLEANUP]/rbe_tmp_1",
+      "RBE_server_address": "unix://[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_service": "remotebuildexecution.googleapis.com:443",
+      "RBE_socket_path": "[CLEANUP]/rbe_tmp_1/reproxy.sock",
+      "RBE_use_application_default_credentials": "false",
+      "RBE_use_gce_credentials": "true"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "build.teardown remote execution.read reproxy_log.pb",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [],
     "name": "build.teardown goma",
     "~followup_annotations": [
@@ -3084,10 +3605,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3123,10 +3645,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3158,10 +3681,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3190,10 +3714,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3224,10 +3749,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3235,6 +3761,43 @@
     },
     "name": "build.teardown goma.read goma_stats.json",
     "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"build_info\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"build_id\": 8945511751514863184,@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"builder\": \"builder\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp\": \"2012-05-14 12:53:26\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"time_stamp_int\": 1337000007500@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
+      "fuchsia-infra.artifacts.builds_beta_goma",
+      "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:26\", \"time_stamp_int\": 1337000007500}}"
+    ],
+    "env": {
+      "GOMA_TMP_DIR": "[CLEANUP]/goma",
+      "GOMA_USE_LOCAL": "False"
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "build.teardown goma.upload goma stats to bigquery",
+    "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
@@ -3252,10 +3815,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3291,12 +3855,30 @@
     ]
   },
   {
-    "cmd": [],
+    "cmd": [
+      "rdb",
+      "stream",
+      "--",
+      "vpython3",
+      "RECIPE_MODULE[fuchsia::reported_step]/resources/resultdb.py",
+      "{\"testId\": \"ninja\", \"expected\": true, \"summaryHtml\": \"<ul><li><a href=\\\"https://cr-buildbucket.appspot.com/log/8945511751514863184/build|ninja?log=context.textproto\\\" target=\\\"_blank\\\">context.textproto</a></li>\\n<li><a href=\\\"https://cr-buildbucket.appspot.com/log/8945511751514863184/build|ninja?log=stdout\\\" target=\\\"_blank\\\">stdout</a></li></ul>\", \"status\": \"PASS\"}"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
     "name": "build.ninja - upload to resultdb",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@ResultDB integration was not enabled for this build@@@",
-      "@@@STEP_EXCEPTION@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
@@ -3320,10 +3902,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3349,10 +3932,11 @@
     "cwd": "[START_DIR]/fuchsia/out/not-default",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3367,7 +3951,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:24.500000Z",
+      "Custom-Time:2012-05-14T12:53:29.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -3378,10 +3962,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3408,10 +3993,11 @@
     ],
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3434,7 +4020,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:26.000000Z",
+      "Custom-Time:2012-05-14T12:53:30.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -3445,10 +4031,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3465,7 +4052,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:27.500000Z",
+      "Custom-Time:2012-05-14T12:53:32.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -3476,10 +4063,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3497,7 +4085,7 @@
     "name": "build.sponge links",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@sponge invocations@http://sponge/invocations/?q=BUILDBUCKET_ID:0@@@"
+      "@@@STEP_LINK@sponge invocations@http://sponge/invocations/?q=BUILDBUCKET_ID:8945511751514863184@@@"
     ]
   },
   {
@@ -3513,10 +4101,11 @@
     "cwd": "[START_DIR]/fuchsia",
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3545,7 +4134,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:29.000000Z",
+      "Custom-Time:2012-05-14T12:53:33.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -3556,10 +4145,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3596,10 +4186,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3630,10 +4221,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3666,10 +4258,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3694,10 +4287,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3732,10 +4326,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3762,10 +4357,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3803,10 +4399,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3836,10 +4433,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3900,10 +4498,11 @@
     ],
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -3970,10 +4569,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4011,10 +4611,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4048,10 +4649,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4085,10 +4687,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4117,10 +4720,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4146,10 +4750,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4174,10 +4779,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4210,10 +4816,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4234,16 +4841,17 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"name\": \"Vim2\",\n    \"priority\": \"200\",\n    \"realm\": \":\",\n    \"resultdb\": {\n      \"enable\": true\n    },\n    \"service_account\": \"service_account\",\n    \"tags\": [\n      \"board:boards/x64.gni\",\n      \"build_type:debug\",\n      \"product:products/core.gni\",\n      \"role:tester\",\n      \"task_name:Vim2\",\n      \"test_environment_name:Khadas Vim2 Max-x64\",\n      \"test_shard_hash:13fefbe47e5a17018b8bf41f1ce5e414caa20490537d73abae7396a6924bcfc7\",\n      \"variants:asan\"\n    ],\n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\",\n        \"properties\": {\n          \"cas_input_root\": {\n            \"cas_instance\": \"projects/example-cas-server/instances/default_instance\",\n            \"digest\": {\n              \"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\",\n              \"size_bytes\": \"0\"\n            }\n          },\n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"package_name\": \"infra/tools/rdb/${platform}\",\n                \"path\": \"out/not-default\",\n                \"version\": \"version:pinned-version\"\n              },\n              {\n                \"package_name\": \"infra/tools/luci-auth/${platform}\",\n                \"path\": \"out/not-default\",\n                \"version\": \"version:pinned-version\"\n              },\n              {\n                \"package_name\": \"infra/3pp/tools/nsjail/${platform}\",\n                \"path\": \"out/not-default\",\n                \"version\": \"version:pinned-version\"\n              }\n            ]\n          },\n          \"command\": [\n            \"./rdb\",\n            \"stream\",\n            \"-var\",\n            \"builder:\",\n            \"--\",\n            \"./luci-auth\",\n            \"context\",\n            \"-scopes\",\n            \"https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/firebase https://www.googleapis.com/auth/gerritcodereview https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/nest-account\",\n            \"--\",\n            \"./linux_x64/botanist\",\n            \"-level\",\n            \"debug\",\n            \"run\",\n            \"-images\",\n            \"gs://fuchsia-infra-artifacts/builds/8945511751514863184/images/images.json\",\n            \"-timeout\",\n            \"1800s\",\n            \"-ffx\",\n            \"./linux_x64/ffx\",\n            \"-product-bundles\",\n            \"product_bundles.json\",\n            \"-product-bundle-name\",\n            \"core.x64\",\n            \"-serial-log-dir\",\n            \"../../serial_logs\",\n            \"-syslog-dir\",\n            \"../../syslogs\",\n            \"-config\",\n            \"/etc/botanist/config.json\",\n            \"-out-dir\",\n            \"out\",\n            \"-snapshot-output\",\n            \"snapshot.zip\",\n            \"Vim2_tests.json\"\n          ],\n          \"containment\": {\n            \"containment_type\": \"NONE\"\n          },\n          \"dimensions\": [\n            {\n              \"key\": \"device_type\",\n              \"value\": \"Khadas Vim2 Max\"\n            },\n            {\n              \"key\": \"kvm\",\n              \"value\": \"1\"\n            },\n            {\n              \"key\": \"pool\",\n              \"value\": \"fuchsia.tests\"\n            },\n            {\n              \"key\": \"serial\",\n              \"value\": \"1\"\n            }\n          ],\n          \"env\": [\n            {\n              \"key\": \"ASAN_SYMBOLIZER_PATH\",\n              \"value\": \"linux_x64/llvm-symbolizer\"\n            },\n            {\n              \"key\": \"BOOTSERVER_PATH\",\n              \"value\": \"./linux_x64/bootserver_new\"\n            },\n            {\n              \"key\": \"BUILDBUCKET_ID\",\n              \"value\": \"8945511751514863184\"\n            },\n            {\n              \"key\": \"BUILD_CREATE_TIME\",\n              \"value\": \"1337000010\"\n            },\n            {\n              \"key\": \"FUCHSIA_DEVICE_TYPE\",\n              \"value\": \"Khadas Vim2 Max\"\n            },\n            {\n              \"key\": \"FUCHSIA_TEST_OUTDIR\",\n              \"value\": \"${ISOLATED_OUTDIR}\"\n            },\n            {\n              \"key\": \"IMAGE_MANIFEST_PATH\",\n              \"value\": \"gs://fuchsia-infra-artifacts/builds/8945511751514863184/images/images.json\"\n            },\n            {\n              \"key\": \"LSAN_SYMBOLIZER_PATH\",\n              \"value\": \"linux_x64/llvm-symbolizer\"\n            },\n            {\n              \"key\": \"SWARMING_BOT_FILE\",\n              \"value\": \"${SWARMING_BOT_FILE}\"\n            },\n            {\n              \"key\": \"TSAN_OPTIONS\",\n              \"value\": \"external_symbolizer_path=linux_x64/llvm-symbolizer\"\n            },\n            {\n              \"key\": \"UBSAN_SYMBOLIZER_PATH\",\n              \"value\": \"linux_x64/llvm-symbolizer\"\n            }\n          ],\n          \"env_prefixes\": [\n            {\n              \"key\": \"PATH\",\n              \"value\": [\n                \"out/not-default/linux_x64\"\n              ]\n            }\n          ],\n          \"execution_timeout_secs\": \"1860\",\n          \"grace_period_secs\": \"30\",\n          \"idempotent\": false,\n          \"io_timeout_secs\": \"300\",\n          \"outputs\": [\n            \"serial_logs\",\n            \"syslogs\"\n          ],\n          \"relative_cwd\": \"out/not-default\"\n        },\n        \"wait_for_capacity\": false\n      }\n    ]\n  }\n]",
+      "[\n  {\n    \"name\": \"Vim2\",\n    \"priority\": \"200\",\n    \"realm\": \"fuchsia:ci\",\n    \"resultdb\": {\n      \"enable\": true\n    },\n    \"service_account\": \"service_account\",\n    \"tags\": [\n      \"board:boards/x64.gni\",\n      \"build_type:debug\",\n      \"product:products/core.gni\",\n      \"role:tester\",\n      \"task_name:Vim2\",\n      \"test_environment_name:Khadas Vim2 Max-x64\",\n      \"test_shard_hash:13fefbe47e5a17018b8bf41f1ce5e414caa20490537d73abae7396a6924bcfc7\",\n      \"variants:asan\"\n    ],\n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\",\n        \"properties\": {\n          \"cas_input_root\": {\n            \"cas_instance\": \"projects/example-cas-server/instances/default_instance\",\n            \"digest\": {\n              \"hash\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\",\n              \"size_bytes\": \"0\"\n            }\n          },\n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"package_name\": \"infra/tools/rdb/${platform}\",\n                \"path\": \"out/not-default\",\n                \"version\": \"version:pinned-version\"\n              },\n              {\n                \"package_name\": \"infra/tools/luci-auth/${platform}\",\n                \"path\": \"out/not-default\",\n                \"version\": \"version:pinned-version\"\n              },\n              {\n                \"package_name\": \"infra/3pp/tools/nsjail/${platform}\",\n                \"path\": \"out/not-default\",\n                \"version\": \"version:pinned-version\"\n              }\n            ]\n          },\n          \"command\": [\n            \"./rdb\",\n            \"stream\",\n            \"-var\",\n            \"builder:\",\n            \"--\",\n            \"./luci-auth\",\n            \"context\",\n            \"-scopes\",\n            \"https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/firebase https://www.googleapis.com/auth/gerritcodereview https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/nest-account\",\n            \"--\",\n            \"./linux_x64/botanist\",\n            \"-level\",\n            \"debug\",\n            \"run\",\n            \"-images\",\n            \"gs://fuchsia-infra-artifacts/builds/8945511751514863184/images/images.json\",\n            \"-timeout\",\n            \"1800s\",\n            \"-ffx\",\n            \"./linux_x64/ffx\",\n            \"-product-bundles\",\n            \"product_bundles.json\",\n            \"-product-bundle-name\",\n            \"core.x64\",\n            \"-serial-log-dir\",\n            \"../../serial_logs\",\n            \"-syslog-dir\",\n            \"../../syslogs\",\n            \"-config\",\n            \"/etc/botanist/config.json\",\n            \"-out-dir\",\n            \"out\",\n            \"-snapshot-output\",\n            \"snapshot.zip\",\n            \"Vim2_tests.json\"\n          ],\n          \"containment\": {\n            \"containment_type\": \"NONE\"\n          },\n          \"dimensions\": [\n            {\n              \"key\": \"device_type\",\n              \"value\": \"Khadas Vim2 Max\"\n            },\n            {\n              \"key\": \"kvm\",\n              \"value\": \"1\"\n            },\n            {\n              \"key\": \"pool\",\n              \"value\": \"fuchsia.tests\"\n            },\n            {\n              \"key\": \"serial\",\n              \"value\": \"1\"\n            }\n          ],\n          \"env\": [\n            {\n              \"key\": \"ASAN_SYMBOLIZER_PATH\",\n              \"value\": \"linux_x64/llvm-symbolizer\"\n            },\n            {\n              \"key\": \"BOOTSERVER_PATH\",\n              \"value\": \"./linux_x64/bootserver_new\"\n            },\n            {\n              \"key\": \"BUILDBUCKET_ID\",\n              \"value\": \"8945511751514863184\"\n            },\n            {\n              \"key\": \"BUILD_CREATE_TIME\",\n              \"value\": \"1337000015\"\n            },\n            {\n              \"key\": \"FUCHSIA_DEVICE_TYPE\",\n              \"value\": \"Khadas Vim2 Max\"\n            },\n            {\n              \"key\": \"FUCHSIA_TEST_OUTDIR\",\n              \"value\": \"${ISOLATED_OUTDIR}\"\n            },\n            {\n              \"key\": \"IMAGE_MANIFEST_PATH\",\n              \"value\": \"gs://fuchsia-infra-artifacts/builds/8945511751514863184/images/images.json\"\n            },\n            {\n              \"key\": \"INPUT_COMMIT_HOST\",\n              \"value\": \"fuchsia.googlesource.com\"\n            },\n            {\n              \"key\": \"LSAN_SYMBOLIZER_PATH\",\n              \"value\": \"linux_x64/llvm-symbolizer\"\n            },\n            {\n              \"key\": \"SWARMING_BOT_FILE\",\n              \"value\": \"${SWARMING_BOT_FILE}\"\n            },\n            {\n              \"key\": \"TSAN_OPTIONS\",\n              \"value\": \"external_symbolizer_path=linux_x64/llvm-symbolizer\"\n            },\n            {\n              \"key\": \"UBSAN_SYMBOLIZER_PATH\",\n              \"value\": \"linux_x64/llvm-symbolizer\"\n            }\n          ],\n          \"env_prefixes\": [\n            {\n              \"key\": \"PATH\",\n              \"value\": [\n                \"out/not-default/linux_x64\"\n              ]\n            }\n          ],\n          \"execution_timeout_secs\": \"1860\",\n          \"grace_period_secs\": \"30\",\n          \"idempotent\": false,\n          \"io_timeout_secs\": \"300\",\n          \"outputs\": [\n            \"serial_logs\",\n            \"syslogs\"\n          ],\n          \"relative_cwd\": \"out/not-default\"\n        },\n        \"wait_for_capacity\": false\n      }\n    ]\n  }\n]",
       "[CLEANUP]/test_orchestration_inputs_tmp_1/task_requests.json"
     ],
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4256,7 +4864,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@  {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@    \"name\": \"Vim2\",@@@",
       "@@@STEP_LOG_LINE@task_requests.json@    \"priority\": \"200\",@@@",
-      "@@@STEP_LOG_LINE@task_requests.json@    \"realm\": \":\",@@@",
+      "@@@STEP_LOG_LINE@task_requests.json@    \"realm\": \"fuchsia:ci\",@@@",
       "@@@STEP_LOG_LINE@task_requests.json@    \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@      \"enable\": true@@@",
       "@@@STEP_LOG_LINE@task_requests.json@    },@@@",
@@ -4374,7 +4982,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            },@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              \"key\": \"BUILD_CREATE_TIME\",@@@",
-      "@@@STEP_LOG_LINE@task_requests.json@              \"value\": \"1337000010\"@@@",
+      "@@@STEP_LOG_LINE@task_requests.json@              \"value\": \"1337000015\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            },@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              \"key\": \"FUCHSIA_DEVICE_TYPE\",@@@",
@@ -4389,6 +4997,10 @@
       "@@@STEP_LOG_LINE@task_requests.json@              \"value\": \"gs://fuchsia-infra-artifacts/builds/8945511751514863184/images/images.json\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            },@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            {@@@",
+      "@@@STEP_LOG_LINE@task_requests.json@              \"key\": \"INPUT_COMMIT_HOST\",@@@",
+      "@@@STEP_LOG_LINE@task_requests.json@              \"value\": \"fuchsia.googlesource.com\"@@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            },@@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              \"key\": \"LSAN_SYMBOLIZER_PATH\",@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              \"value\": \"linux_x64/llvm-symbolizer\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            },@@@",
@@ -4445,10 +5057,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4483,10 +5096,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4513,10 +5127,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4543,10 +5158,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4572,10 +5188,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4609,10 +5226,11 @@
     ],
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4654,10 +5272,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4692,10 +5311,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4722,10 +5342,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4775,10 +5396,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4813,10 +5435,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4843,10 +5466,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4879,10 +5503,11 @@
     ],
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4906,10 +5531,11 @@
     ],
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4942,10 +5568,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -4972,10 +5599,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5006,18 +5634,19 @@
       "-project",
       "gcem-cloud-project",
       "-swarming-host",
-      "chrome-swarming",
+      "",
       "-build-id",
-      " 50a11839dfdb5911",
+      "",
       "-gcs-path",
       ""
     ],
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5054,10 +5683,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5089,10 +5719,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5119,10 +5750,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5151,10 +5783,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5194,10 +5827,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5232,10 +5866,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5262,10 +5897,11 @@
     "infra_step": true,
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5296,10 +5932,11 @@
     ],
     "luci_context": {
       "realm": {
-        "name": ":"
+        "name": "fuchsia:ci"
       },
       "resultdb": {
         "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
           "update_token": "token"
         },
         "hostname": "rdbhost"
@@ -5308,12 +5945,28 @@
     "name": "check budgets"
   },
   {
-    "cmd": [],
-    "name": "check budgets - upload to resultdb",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@ResultDB integration was not enabled for this build@@@",
-      "@@@STEP_EXCEPTION@@@"
-    ]
+    "cmd": [
+      "rdb",
+      "stream",
+      "--",
+      "vpython3",
+      "RECIPE_MODULE[fuchsia::reported_step]/resources/resultdb.py",
+      "{\"testId\": \"check_budgets\", \"expected\": true, \"summaryHtml\": \"<ul><li><a href=\\\"https://cr-buildbucket.appspot.com/log/8945511751514863184/check budgets?log=stdout\\\" target=\\\"_blank\\\">stdout</a></li></ul>\", \"status\": \"PASS\"}"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "fuchsia:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "check budgets - upload to resultdb"
   },
   {
     "name": "$result"
diff --git a/recipes/fuchsia/build.py b/recipes/fuchsia/build.py
index fbfd1ad..21d624d 100644
--- a/recipes/fuchsia/build.py
+++ b/recipes/fuchsia/build.py
@@ -5,7 +5,6 @@
 
 from recipe_engine import post_process
 
-from PB.go.chromium.org.luci.buildbucket.proto import build as build_pb2
 from PB.go.chromium.org.luci.buildbucket.proto import common as common_pb2
 from PB.infra.coverage import CoverageCollectionType
 from PB.recipe_engine.result import RawResult
@@ -425,7 +424,7 @@
                 spec.test.gce_mediator.endpoint,
                 spec.test.gce_mediator.cloud_project,
                 build_results.images,
-                api.buildbucket.swarming_parent_run_id,
+                api.buildbucket.backend_task_id_from_build(buildbucket_build),
                 spec.artifact_gcs_bucket,
                 upload_namespace,
             )
@@ -901,16 +900,6 @@
             ),
             test_on_gce=True,
         )
-        + api.buildbucket.build(
-            build_pb2.Build(
-                infra=build_pb2.BuildInfra(
-                    swarming=build_pb2.BuildInfra.Swarming(
-                        hostname="chrome-swarming.appspot.com",
-                        parent_run_id=" 50a11839dfdb5911",
-                    )
-                )
-            )
-        )
         + api.build.create_shards()
     )