[clang_toolchain] Update triggered builders with new names.
Bug: 43619
Change-Id: I891f95051accab70b5c1f8298cb057ee7f9c30ed
diff --git a/recipes/clang_toolchain.expected/prod-linux-x64.json b/recipes/clang_toolchain.expected/prod-linux-x64.json
index 2c8699b..9803ea3 100644
--- a/recipes/clang_toolchain.expected/prod-linux-x64.json
+++ b/recipes/clang_toolchain.expected/prod-linux-x64.json
@@ -1718,26 +1718,26 @@
],
"infra_step": true,
"name": "luci-scheduler.EmitTriggers",
- "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"fuchsia-arm64-debug-clang\", \"project\": \"fuchsia\"}, {\"job\": \"fuchsia-arm64-release-clang\", \"project\": \"fuchsia\"}, {\"job\": \"fuchsia-x64-debug-clang\", \"project\": \"fuchsia\"}, {\"job\": \"fuchsia-x64-release-clang\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"build.clang_toolchain\": {\"instance\": \"[dummy hash]\", \"type\": \"isolated\"}, \"clang_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/llvm-project\", \"git_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/fuchsia/+/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\", \"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\": \"clang_toolchain.fuchsia-arm64-debug\", \"project\": \"fuchsia\"}, {\"job\": \"clang_toolchain.fuchsia-arm64-release\", \"project\": \"fuchsia\"}, {\"job\": \"clang_toolchain.fuchsia-x64-debug\", \"project\": \"fuchsia\"}, {\"job\": \"clang_toolchain.fuchsia-x64-release\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"build.clang_toolchain\": {\"instance\": \"[dummy hash]\", \"type\": \"isolated\"}, \"clang_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/llvm-project\", \"git_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/fuchsia/+/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\", \"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\": \"fuchsia-arm64-debug-clang\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"clang_toolchain.fuchsia-arm64-debug\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ {@@@",
- "@@@STEP_LOG_LINE@input@ \"job\": \"fuchsia-arm64-release-clang\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"clang_toolchain.fuchsia-arm64-release\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ {@@@",
- "@@@STEP_LOG_LINE@input@ \"job\": \"fuchsia-x64-debug-clang\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"clang_toolchain.fuchsia-x64-debug\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ {@@@",
- "@@@STEP_LOG_LINE@input@ \"job\": \"fuchsia-x64-release-clang\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"clang_toolchain.fuchsia-x64-release\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }@@@",
"@@@STEP_LOG_LINE@input@ ], @@@",
diff --git a/recipes/clang_toolchain.expected/prod-mac-x64.json b/recipes/clang_toolchain.expected/prod-mac-x64.json
index 4a9d58c..5ae79ea 100644
--- a/recipes/clang_toolchain.expected/prod-mac-x64.json
+++ b/recipes/clang_toolchain.expected/prod-mac-x64.json
@@ -1778,14 +1778,14 @@
],
"infra_step": true,
"name": "luci-scheduler.EmitTriggers",
- "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"fuchsia-host-mac-clang\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"build.clang_toolchain\": {\"instance\": \"[dummy hash]\", \"type\": \"isolated\"}, \"clang_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/llvm-project\", \"git_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/fuchsia/+/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\", \"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\": \"clang_toolchain.fuchsia-host-mac\", \"project\": \"fuchsia\"}], \"trigger\": {\"buildbucket\": {\"properties\": {\"build.clang_toolchain\": {\"instance\": \"[dummy hash]\", \"type\": \"isolated\"}, \"clang_toolchain\": {\"git_repository\": \"https://fuchsia.googlesource.com/third_party/llvm-project\", \"git_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"}}, \"tags\": [\"buildset:commit/gitiles/fuchsia.googlesource.com/fuchsia/+/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\", \"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\": \"fuchsia-host-mac-clang\", @@@",
+ "@@@STEP_LOG_LINE@input@ \"job\": \"clang_toolchain.fuchsia-host-mac\", @@@",
"@@@STEP_LOG_LINE@input@ \"project\": \"fuchsia\"@@@",
"@@@STEP_LOG_LINE@input@ }@@@",
"@@@STEP_LOG_LINE@input@ ], @@@",
diff --git a/recipes/clang_toolchain.py b/recipes/clang_toolchain.py
index 1e63687..85582e7 100644
--- a/recipes/clang_toolchain.py
+++ b/recipes/clang_toolchain.py
@@ -526,12 +526,12 @@
project='fuchsia',
jobs={
'linux-amd64': (
- 'fuchsia-arm64-debug-clang',
- 'fuchsia-arm64-release-clang',
- 'fuchsia-x64-debug-clang',
- 'fuchsia-x64-release-clang',
+ 'clang_toolchain.fuchsia-arm64-debug',
+ 'clang_toolchain.fuchsia-arm64-release',
+ 'clang_toolchain.fuchsia-x64-debug',
+ 'clang_toolchain.fuchsia-x64-release',
),
- 'mac-amd64': ('fuchsia-host-mac-clang',),
+ 'mac-amd64': ('clang_toolchain.fuchsia-host-mac',),
}[target_platform])
