[clang_toolchain] Really fix clang_toolchain.git_revision property of canary builds
The last change was broken and had no effect.
Fixed: 43680
Change-Id: I66e4c7a811bcacefc64e6bbe6ed5d3760b86eb6b
diff --git a/recipes/clang_toolchain.expected/prod-linux-x64.json b/recipes/clang_toolchain.expected/prod-linux-x64.json
index e11596c..2c8699b 100644
--- a/recipes/clang_toolchain.expected/prod-linux-x64.json
+++ b/recipes/clang_toolchain.expected/prod-linux-x64.json
@@ -1718,7 +1718,7 @@
],
"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\": \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\"}}, \"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\": \"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}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@input@{@@@",
"@@@STEP_LOG_LINE@input@ \"batches\": [@@@",
@@ -1750,7 +1750,7 @@
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ \"clang_toolchain\": {@@@",
"@@@STEP_LOG_LINE@input@ \"git_repository\": \"https://fuchsia.googlesource.com/third_party/llvm-project\", @@@",
- "@@@STEP_LOG_LINE@input@ \"git_revision\": \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\"@@@",
+ "@@@STEP_LOG_LINE@input@ \"git_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@STEP_LOG_LINE@input@ }@@@",
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ \"tags\": [@@@",
diff --git a/recipes/clang_toolchain.expected/prod-mac-x64.json b/recipes/clang_toolchain.expected/prod-mac-x64.json
index 594bdde..4a9d58c 100644
--- a/recipes/clang_toolchain.expected/prod-mac-x64.json
+++ b/recipes/clang_toolchain.expected/prod-mac-x64.json
@@ -1778,7 +1778,7 @@
],
"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\": \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\"}}, \"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\": \"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}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@input@{@@@",
"@@@STEP_LOG_LINE@input@ \"batches\": [@@@",
@@ -1798,7 +1798,7 @@
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ \"clang_toolchain\": {@@@",
"@@@STEP_LOG_LINE@input@ \"git_repository\": \"https://fuchsia.googlesource.com/third_party/llvm-project\", @@@",
- "@@@STEP_LOG_LINE@input@ \"git_revision\": \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\"@@@",
+ "@@@STEP_LOG_LINE@input@ \"git_revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@",
"@@@STEP_LOG_LINE@input@ }@@@",
"@@@STEP_LOG_LINE@input@ }, @@@",
"@@@STEP_LOG_LINE@input@ \"tags\": [@@@",
diff --git a/recipes/clang_toolchain.py b/recipes/clang_toolchain.py
index cb19121..1e63687 100644
--- a/recipes/clang_toolchain.py
+++ b/recipes/clang_toolchain.py
@@ -509,7 +509,7 @@
properties={
'clang_toolchain': {
'git_repository': repository,
- 'git_revision': fuchsia_rev,
+ 'git_revision': revision,
},
'build.clang_toolchain': {
'type': 'isolated',
