[gcc_toolchain] Fix builder names of triggered builds.
Bug: 43619
Change-Id: Ic0a1fbe128cd46031ff604064b20f1380909dabd
diff --git a/recipes/gcc_toolchain.expected/ci_linux_intel.json b/recipes/gcc_toolchain.expected/ci_linux_intel.json
index 8ad585a..e704511 100644
--- a/recipes/gcc_toolchain.expected/ci_linux_intel.json
+++ b/recipes/gcc_toolchain.expected/ci_linux_intel.json
@@ -1601,26 +1601,26 @@
],
"infra_step": true,
"name": "luci-scheduler.EmitTriggers",
- "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"gcc.bringup.arm64-gcc-qemu_kvm\", \"project\": \"fuchsia\"}, {\"job\": \"gcc.bringup.x64-gcc-qemu_kvm\", \"project\": \"fuchsia\"}, {\"job\": \"gcc.zbi_tests-arm64-gcc\", \"project\": \"fuchsia\"}, {\"job\": \"gcc.zbi_tests-x64-gcc\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"build.gcc_toolchain\": {\"instance\": \"[dummy hash]\", \"type\": \"isolated\"}, \"checkout.buildset\": \"commit/gitiles/fuchsia.googlesource.com/fuchsia/+/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\", \"gcc_toolchain\": {\"git_repository\": \"https://gnu.googlesource.com/gcc,https://gnu.googlesource.com/binutils-gdb\", \"git_revision\": \"4b5e15daff8b54440e3fda451c318ad31e532fab,3d861fdb826c2f5cf270dd5f585d0e6057e1bf4f\"}}, \"tags\": [\"buildset:commit/gitiles/gnu.googlesource.com/gcc/+/4b5e15daff8b54440e3fda451c318ad31e532fab\", \"gitiles_ref:refs/heads/master\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000004500000}",
+ "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"gcc_toolchain.bringup.arm64-gcc-qemu_kvm\", \"project\": \"fuchsia\"}, {\"job\": \"gcc_toolchain.bringup.x64-gcc-qemu_kvm\", \"project\": \"fuchsia\"}, {\"job\": \"gcc_toolchain.zbi_tests-arm64-gcc\", \"project\": \"fuchsia\"}, {\"job\": \"gcc_toolchain.zbi_tests-x64-gcc\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"build.gcc_toolchain\": {\"instance\": \"[dummy hash]\", \"type\": \"isolated\"}, \"checkout.buildset\": \"commit/gitiles/fuchsia.googlesource.com/fuchsia/+/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\", \"gcc_toolchain\": {\"git_repository\": \"https://gnu.googlesource.com/gcc,https://gnu.googlesource.com/binutils-gdb\", \"git_revision\": \"4b5e15daff8b54440e3fda451c318ad31e532fab,3d861fdb826c2f5cf270dd5f585d0e6057e1bf4f\"}}, \"tags\": [\"buildset:commit/gitiles/gnu.googlesource.com/gcc/+/4b5e15daff8b54440e3fda451c318ad31e532fab\", \"gitiles_ref:refs/heads/master\", \"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000004500000}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@input@{@@@",
"@@@STEP_LOG_LINE@input@ \"batches\": [@@@",
"@@@STEP_LOG_LINE@input@ {@@@",
"@@@STEP_LOG_LINE@input@ \"jobs\": [@@@",
"@@@STEP_LOG_LINE@input@ {@@@",
- "@@@STEP_LOG_LINE@input@ \"job\": \"gcc.bringup.arm64-gcc-qemu_kvm\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"gcc_toolchain.bringup.arm64-gcc-qemu_kvm\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ {@@@",
- "@@@STEP_LOG_LINE@input@ \"job\": \"gcc.bringup.x64-gcc-qemu_kvm\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"gcc_toolchain.bringup.x64-gcc-qemu_kvm\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ {@@@",
- "@@@STEP_LOG_LINE@input@ \"job\": \"gcc.zbi_tests-arm64-gcc\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"gcc_toolchain.zbi_tests-arm64-gcc\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ {@@@",
- "@@@STEP_LOG_LINE@input@ \"job\": \"gcc.zbi_tests-x64-gcc\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"gcc_toolchain.zbi_tests-x64-gcc\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }@@@",
"@@@STEP_LOG_LINE@input@ ], @@@",
diff --git a/recipes/gcc_toolchain.py b/recipes/gcc_toolchain.py
index 1c9667a..971046f 100644
--- a/recipes/gcc_toolchain.py
+++ b/recipes/gcc_toolchain.py
@@ -394,7 +394,7 @@
}),
project=project,
jobs=[
- 'gcc.%s' % bot for bot in [
+ 'gcc_toolchain.%s' % bot for bot in [
'bringup.arm64-gcc-qemu_kvm',
'bringup.x64-gcc-qemu_kvm',
'zbi_tests-arm64-gcc',
