[upload] Include search tag in output properties.
This change makes output properties contains CIPD package search tags.
Change-Id: I77c49af814329341aa58f6abe415a8a92585dc11
diff --git a/recipe_modules/upload/api.py b/recipe_modules/upload/api.py
index 87b4021..bc002c9 100644
--- a/recipe_modules/upload/api.py
+++ b/recipe_modules/upload/api.py
@@ -187,6 +187,8 @@
)
step.presentation.properties.update(cipd_pin._asdict())
+ if search_tag:
+ step.presentation.properties.update(search_tag)
return cipd_pin.instance_id
diff --git a/recipe_modules/upload/examples/full.expected/basic.json b/recipe_modules/upload/examples/full.expected/basic.json
index c8b5b8d..40fe1e8 100644
--- a/recipe_modules/upload/examples/full.expected/basic.json
+++ b/recipe_modules/upload/examples/full.expected/basic.json
@@ -140,6 +140,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"abc1234\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/foo/resolved-platform\"@@@"
]
diff --git a/recipes/3p_prebuilts.expected/ci_cipd_new.json b/recipes/3p_prebuilts.expected/ci_cipd_new.json
index 1b31e98..83b8aaf 100644
--- a/recipes/3p_prebuilts.expected/ci_cipd_new.json
+++ b/recipes/3p_prebuilts.expected/ci_cipd_new.json
@@ -295,6 +295,7 @@
"name": "fuchsia/third_party/foo.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/foo\"@@@"
]
diff --git a/recipes/aemu.expected/cipd_pkg_new.json b/recipes/aemu.expected/cipd_pkg_new.json
index be86505..6eea53c 100644
--- a/recipes/aemu.expected/cipd_pkg_new.json
+++ b/recipes/aemu.expected/cipd_pkg_new.json
@@ -164,6 +164,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/aemu/linux-amd64\"@@@"
]
diff --git a/recipes/bloaty.expected/linux_new.json b/recipes/bloaty.expected/linux_new.json
index 2d46620..54ae5ec 100644
--- a/recipes/bloaty.expected/linux_new.json
+++ b/recipes/bloaty.expected/linux_new.json
@@ -512,6 +512,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/bloaty/linux-amd64\"@@@"
]
diff --git a/recipes/bloaty.expected/mac_new.json b/recipes/bloaty.expected/mac_new.json
index 3fb7474..c96a5d9 100644
--- a/recipes/bloaty.expected/mac_new.json
+++ b/recipes/bloaty.expected/mac_new.json
@@ -511,6 +511,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/bloaty/mac-amd64\"@@@"
]
diff --git a/recipes/breakpad_tools.expected/new_version.json b/recipes/breakpad_tools.expected/new_version.json
index 1034b65..4e476af 100644
--- a/recipes/breakpad_tools.expected/new_version.json
+++ b/recipes/breakpad_tools.expected/new_version.json
@@ -396,6 +396,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"9eac2058b70615519b2c4d8c6bdbfca1bd079e39\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/breakpad/resolved-platform\"@@@"
]
diff --git a/recipes/dart_toolchain.expected/linux_cross.json b/recipes/dart_toolchain.expected/linux_cross.json
index 3948b53..0909f2f 100644
--- a/recipes/dart_toolchain.expected/linux_cross.json
+++ b/recipes/dart_toolchain.expected/linux_cross.json
@@ -1029,6 +1029,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"301b5a1f16414bc031091eb214ddd6c589e6ed9a\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/dart-sdk/linux-arm64\"@@@"
]
diff --git a/recipes/dart_toolchain.expected/linux_new.json b/recipes/dart_toolchain.expected/linux_new.json
index 67f05cf..c09e246 100644
--- a/recipes/dart_toolchain.expected/linux_new.json
+++ b/recipes/dart_toolchain.expected/linux_new.json
@@ -1029,6 +1029,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"301b5a1f16414bc031091eb214ddd6c589e6ed9a\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/dart-sdk/linux-amd64\"@@@"
]
diff --git a/recipes/dart_toolchain.expected/mac_new.json b/recipes/dart_toolchain.expected/mac_new.json
index 5449d31..4f9f205 100644
--- a/recipes/dart_toolchain.expected/mac_new.json
+++ b/recipes/dart_toolchain.expected/mac_new.json
@@ -1098,6 +1098,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"301b5a1f16414bc031091eb214ddd6c589e6ed9a\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/dart-sdk/mac-amd64\"@@@"
]
diff --git a/recipes/fastboot.expected/ci-linux-cipd_pkg_new.json b/recipes/fastboot.expected/ci-linux-cipd_pkg_new.json
index f03820c..4b4217e 100644
--- a/recipes/fastboot.expected/ci-linux-cipd_pkg_new.json
+++ b/recipes/fastboot.expected/ci-linux-cipd_pkg_new.json
@@ -95,6 +95,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/fastboot/resolved-platform\"@@@"
]
diff --git a/recipes/fastboot.expected/ci-mac-cipd_pkg_new.json b/recipes/fastboot.expected/ci-mac-cipd_pkg_new.json
index bcb0043..50ef284 100644
--- a/recipes/fastboot.expected/ci-mac-cipd_pkg_new.json
+++ b/recipes/fastboot.expected/ci-mac-cipd_pkg_new.json
@@ -201,6 +201,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/fastboot/resolved-platform\"@@@"
]
diff --git a/recipes/ffmpeg.expected/default.json b/recipes/ffmpeg.expected/default.json
index 4e4934d..d5639b3 100644
--- a/recipes/ffmpeg.expected/default.json
+++ b/recipes/ffmpeg.expected/default.json
@@ -4299,6 +4299,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/lib/ffmpeg/fuchsia\"@@@"
]
diff --git a/recipes/fonts.expected/existing.json b/recipes/fonts.expected/existing.json
index 2c61f65..de90d54 100644
--- a/recipes/fonts.expected/existing.json
+++ b/recipes/fonts.expected/existing.json
@@ -1819,6 +1819,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef,deadbeef,deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/fonts\"@@@"
]
diff --git a/recipes/gcc_toolchain.expected/prod_linux_arm_new.json b/recipes/gcc_toolchain.expected/prod_linux_arm_new.json
index eac74ff..f413840 100644
--- a/recipes/gcc_toolchain.expected/prod_linux_arm_new.json
+++ b/recipes/gcc_toolchain.expected/prod_linux_arm_new.json
@@ -1297,6 +1297,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"4b5e15daff8b54440e3fda451c318ad31e532fab,3d861fdb826c2f5cf270dd5f585d0e6057e1bf4f\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/gcc/resolved-platform\"@@@"
]
diff --git a/recipes/gcc_toolchain.expected/prod_linux_arm_new999.json b/recipes/gcc_toolchain.expected/prod_linux_arm_new999.json
index eac74ff..f413840 100644
--- a/recipes/gcc_toolchain.expected/prod_linux_arm_new999.json
+++ b/recipes/gcc_toolchain.expected/prod_linux_arm_new999.json
@@ -1297,6 +1297,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"4b5e15daff8b54440e3fda451c318ad31e532fab,3d861fdb826c2f5cf270dd5f585d0e6057e1bf4f\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/gcc/resolved-platform\"@@@"
]
diff --git a/recipes/gcc_toolchain.expected/prod_linux_intel_new.json b/recipes/gcc_toolchain.expected/prod_linux_intel_new.json
index 4684740..6daa1bd 100644
--- a/recipes/gcc_toolchain.expected/prod_linux_intel_new.json
+++ b/recipes/gcc_toolchain.expected/prod_linux_intel_new.json
@@ -1547,6 +1547,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"4b5e15daff8b54440e3fda451c318ad31e532fab,3d861fdb826c2f5cf270dd5f585d0e6057e1bf4f\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/gcc/resolved-platform\"@@@"
]
diff --git a/recipes/gcc_toolchain.expected/prod_linux_intel_new999.json b/recipes/gcc_toolchain.expected/prod_linux_intel_new999.json
index 4684740..6daa1bd 100644
--- a/recipes/gcc_toolchain.expected/prod_linux_intel_new999.json
+++ b/recipes/gcc_toolchain.expected/prod_linux_intel_new999.json
@@ -1547,6 +1547,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"4b5e15daff8b54440e3fda451c318ad31e532fab,3d861fdb826c2f5cf270dd5f585d0e6057e1bf4f\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/gcc/resolved-platform\"@@@"
]
diff --git a/recipes/gcc_toolchain.expected/prod_mac_intel_new.json b/recipes/gcc_toolchain.expected/prod_mac_intel_new.json
index 8891a90..2d1e672 100644
--- a/recipes/gcc_toolchain.expected/prod_mac_intel_new.json
+++ b/recipes/gcc_toolchain.expected/prod_mac_intel_new.json
@@ -1494,6 +1494,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"4b5e15daff8b54440e3fda451c318ad31e532fab,3d861fdb826c2f5cf270dd5f585d0e6057e1bf4f\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/gcc/resolved-platform\"@@@"
]
diff --git a/recipes/gcc_toolchain.expected/prod_mac_intel_new999.json b/recipes/gcc_toolchain.expected/prod_mac_intel_new999.json
index 8891a90..2d1e672 100644
--- a/recipes/gcc_toolchain.expected/prod_mac_intel_new999.json
+++ b/recipes/gcc_toolchain.expected/prod_mac_intel_new999.json
@@ -1494,6 +1494,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"4b5e15daff8b54440e3fda451c318ad31e532fab,3d861fdb826c2f5cf270dd5f585d0e6057e1bf4f\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/gcc/resolved-platform\"@@@"
]
diff --git a/recipes/go_toolchain.expected/linux-amd64_new.json b/recipes/go_toolchain.expected/linux-amd64_new.json
index a7e43ef..e408c1e 100644
--- a/recipes/go_toolchain.expected/linux-amd64_new.json
+++ b/recipes/go_toolchain.expected/linux-amd64_new.json
@@ -519,6 +519,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/go/linux-amd64\"@@@"
]
diff --git a/recipes/go_toolchain.expected/linux-arm64_new.json b/recipes/go_toolchain.expected/linux-arm64_new.json
index d751c44..fe006b5 100644
--- a/recipes/go_toolchain.expected/linux-arm64_new.json
+++ b/recipes/go_toolchain.expected/linux-arm64_new.json
@@ -501,6 +501,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/go/linux-arm64\"@@@"
]
diff --git a/recipes/go_toolchain.expected/mac-amd64_new.json b/recipes/go_toolchain.expected/mac-amd64_new.json
index 7023a04..0104f7a 100644
--- a/recipes/go_toolchain.expected/mac-amd64_new.json
+++ b/recipes/go_toolchain.expected/mac-amd64_new.json
@@ -519,6 +519,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/go/mac-amd64\"@@@"
]
diff --git a/recipes/jiri.expected/ci_new.json b/recipes/jiri.expected/ci_new.json
index 95d8ed7..fc1e92b 100644
--- a/recipes/jiri.expected/ci_new.json
+++ b/recipes/jiri.expected/ci_new.json
@@ -394,6 +394,7 @@
"name": "linux-amd64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/jiri/linux-amd64\"@@@"
]
@@ -654,6 +655,7 @@
"name": "linux-arm64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/jiri/linux-arm64\"@@@"
]
@@ -869,6 +871,7 @@
"name": "mac-amd64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/jiri/mac-amd64\"@@@"
]
diff --git a/recipes/llvm.expected/fuchsia_new_revision.json b/recipes/llvm.expected/fuchsia_new_revision.json
index 3cefd9e..d1ce116 100644
--- a/recipes/llvm.expected/fuchsia_new_revision.json
+++ b/recipes/llvm.expected/fuchsia_new_revision.json
@@ -839,6 +839,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"75b05681239cb309a23fcb4f8864f177e5aa62da\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/lib/llvm/fuchsia\"@@@"
]
diff --git a/recipes/llvm.expected/linux_amd64_new_revision.json b/recipes/llvm.expected/linux_amd64_new_revision.json
index 0294007..525e2c5 100644
--- a/recipes/llvm.expected/linux_amd64_new_revision.json
+++ b/recipes/llvm.expected/linux_amd64_new_revision.json
@@ -691,6 +691,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"75b05681239cb309a23fcb4f8864f177e5aa62da\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/lib/llvm/linux-amd64\"@@@"
]
diff --git a/recipes/llvm.expected/linux_arm64_new_revision.json b/recipes/llvm.expected/linux_arm64_new_revision.json
index c9ea9df..a5b83da 100644
--- a/recipes/llvm.expected/linux_arm64_new_revision.json
+++ b/recipes/llvm.expected/linux_arm64_new_revision.json
@@ -692,6 +692,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"75b05681239cb309a23fcb4f8864f177e5aa62da\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/lib/llvm/linux-arm64\"@@@"
]
diff --git a/recipes/llvm.expected/mac_amd64_new_revision.json b/recipes/llvm.expected/mac_amd64_new_revision.json
index 2911236..0bdeaf0 100644
--- a/recipes/llvm.expected/mac_amd64_new_revision.json
+++ b/recipes/llvm.expected/mac_amd64_new_revision.json
@@ -689,6 +689,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"75b05681239cb309a23fcb4f8864f177e5aa62da\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/lib/llvm/mac-amd64\"@@@"
]
diff --git a/recipes/ovmf.expected/not yet built for current revision.json b/recipes/ovmf.expected/not yet built for current revision.json
index 7a5f4df..7f070a5 100644
--- a/recipes/ovmf.expected/not yet built for current revision.json
+++ b/recipes/ovmf.expected/not yet built for current revision.json
@@ -241,6 +241,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"abc123\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/firmware/ovmf/amd64\"@@@"
]
diff --git a/recipes/prebuilt_host_tool.expected/default.json b/recipes/prebuilt_host_tool.expected/default.json
index a6fbd26..161b45b 100644
--- a/recipes/prebuilt_host_tool.expected/default.json
+++ b/recipes/prebuilt_host_tool.expected/default.json
@@ -1720,6 +1720,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/json_validator/resolved-platform\"@@@"
]
diff --git a/recipes/prebuilt_host_tool.expected/gn_target_with_trailing_fwd_slash.json b/recipes/prebuilt_host_tool.expected/gn_target_with_trailing_fwd_slash.json
index 1b5d75b..0b78d1e 100644
--- a/recipes/prebuilt_host_tool.expected/gn_target_with_trailing_fwd_slash.json
+++ b/recipes/prebuilt_host_tool.expected/gn_target_with_trailing_fwd_slash.json
@@ -1720,6 +1720,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/json_validator/resolved-platform\"@@@"
]
diff --git a/recipes/qemu.expected/linux_new.json b/recipes/qemu.expected/linux_new.json
index 9ce100c..3820c9b 100644
--- a/recipes/qemu.expected/linux_new.json
+++ b/recipes/qemu.expected/linux_new.json
@@ -2409,6 +2409,7 @@
"name": "qemu.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/qemu/linux-amd64\"@@@"
]
diff --git a/recipes/qemu.expected/mac_new.json b/recipes/qemu.expected/mac_new.json
index 5da9478..636044e 100644
--- a/recipes/qemu.expected/mac_new.json
+++ b/recipes/qemu.expected/mac_new.json
@@ -2654,6 +2654,7 @@
"name": "qemu.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/qemu/mac-amd64\"@@@"
]
diff --git a/recipes/rust_toolchain.expected/rust_extra_tools_linux_new.json b/recipes/rust_toolchain.expected/rust_extra_tools_linux_new.json
index 407a789..d343975 100644
--- a/recipes/rust_toolchain.expected/rust_extra_tools_linux_new.json
+++ b/recipes/rust_toolchain.expected/rust_extra_tools_linux_new.json
@@ -689,6 +689,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"75b05681239cb309a23fcb4f8864f177e5aa62da\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/rust_extra_tools/resolved-platform\"@@@"
]
diff --git a/recipes/rust_toolchain.expected/rust_extra_tools_mac_new.json b/recipes/rust_toolchain.expected/rust_extra_tools_mac_new.json
index ad4fda5..6aa9421 100644
--- a/recipes/rust_toolchain.expected/rust_extra_tools_mac_new.json
+++ b/recipes/rust_toolchain.expected/rust_extra_tools_mac_new.json
@@ -762,6 +762,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"75b05681239cb309a23fcb4f8864f177e5aa62da\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/rust_extra_tools/resolved-platform\"@@@"
]
diff --git a/recipes/rust_toolchain.expected/rust_linux_new.json b/recipes/rust_toolchain.expected/rust_linux_new.json
index a87f095..5ebd4e0 100644
--- a/recipes/rust_toolchain.expected/rust_linux_new.json
+++ b/recipes/rust_toolchain.expected/rust_linux_new.json
@@ -688,6 +688,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"75b05681239cb309a23fcb4f8864f177e5aa62da\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/rust/resolved-platform\"@@@"
]
diff --git a/recipes/rust_toolchain.expected/rust_mac_new.json b/recipes/rust_toolchain.expected/rust_mac_new.json
index 42e2ed4..8960d37 100644
--- a/recipes/rust_toolchain.expected/rust_mac_new.json
+++ b/recipes/rust_toolchain.expected/rust_mac_new.json
@@ -761,6 +761,7 @@
"cmd": [],
"name": "cipd",
"~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"75b05681239cb309a23fcb4f8864f177e5aa62da\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/rust/resolved-platform\"@@@"
]
diff --git a/recipes/sdk.expected/release_ci_new_upload.json b/recipes/sdk.expected/release_ci_new_upload.json
index bbf938d..1fb5e19 100644
--- a/recipes/sdk.expected/release_ci_new_upload.json
+++ b/recipes/sdk.expected/release_ci_new_upload.json
@@ -2393,6 +2393,7 @@
"name": "upload raw-core-sdk.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/sdk/core/resolved-platform\"@@@"
]
diff --git a/recipes/tools.expected/publish_new_pkg.json b/recipes/tools.expected/publish_new_pkg.json
index 2578a25..9b9c2b8 100644
--- a/recipes/tools.expected/publish_new_pkg.json
+++ b/recipes/tools.expected/publish_new_pkg.json
@@ -408,6 +408,7 @@
"name": "go.fuchsia.dev/tools/cmd/gndoc.linux-amd64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/gndoc/linux-amd64\"@@@"
]
@@ -571,6 +572,7 @@
"name": "go.fuchsia.dev/tools/cmd/gndoc.linux-arm64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/gndoc/linux-arm64\"@@@"
]
@@ -734,6 +736,7 @@
"name": "go.fuchsia.dev/tools/cmd/gndoc.mac-amd64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/gndoc/mac-amd64\"@@@"
]
@@ -901,6 +904,7 @@
"name": "go.fuchsia.dev/tools/symbolizer/cmd.linux-amd64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/symbolizer/linux-amd64\"@@@"
]
@@ -1064,6 +1068,7 @@
"name": "go.fuchsia.dev/tools/symbolizer/cmd.linux-arm64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/symbolizer/linux-arm64\"@@@"
]
@@ -1227,6 +1232,7 @@
"name": "go.fuchsia.dev/tools/symbolizer/cmd.mac-amd64.cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
+ "@@@SET_BUILD_PROPERTY@git_revision@\"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@SET_BUILD_PROPERTY@package@\"fuchsia/tools/symbolizer/mac-amd64\"@@@"
]
diff --git a/recipes/vulkan_sdk.expected/existing.json b/recipes/vulkan_sdk.expected/existing.json
index 3a24551..e60f695 100644
--- a/recipes/vulkan_sdk.expected/existing.json
+++ b/recipes/vulkan_sdk.expected/existing.json
@@ -49,7 +49,8 @@
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
- "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/vulkansdk/linux-amd64\"@@@"
+ "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/vulkansdk/linux-amd64\"@@@",
+ "@@@SET_BUILD_PROPERTY@version@\"1.2.30.4\"@@@"
]
},
{
@@ -171,7 +172,8 @@
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
- "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/vulkansdk/mac-amd64\"@@@"
+ "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/vulkansdk/mac-amd64\"@@@",
+ "@@@SET_BUILD_PROPERTY@version@\"1.2.30.4\"@@@"
]
},
{
