docs_builder, gerrit_comment: Use default tag
Use the default "autogenerated:" tag instead of a custom one. (The
gerrit module now always adds an "autogenerated:" tag to set_review()
calls.)
Bug: b/339023785
Change-Id: I719417cd845c8f89f4757fc408827e6a893cc0aa
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/209974
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
diff --git a/recipe_modules/gerrit_comment/api.py b/recipe_modules/gerrit_comment/api.py
index 6518940..df75d8a 100644
--- a/recipe_modules/gerrit_comment/api.py
+++ b/recipe_modules/gerrit_comment/api.py
@@ -92,5 +92,4 @@
self.m.buildbucket.build.id,
),
notify="OWNER",
- tag="autogenerated:pigweed:gerrit_comment",
)
diff --git a/recipe_modules/gerrit_comment/tests/full.expected/try-build.json b/recipe_modules/gerrit_comment/tests/full.expected/try-build.json
index f311767..d960f2c 100644
--- a/recipe_modules/gerrit_comment/tests/full.expected/try-build.json
+++ b/recipe_modules/gerrit_comment/tests/full.expected/try-build.json
@@ -144,7 +144,7 @@
"-host",
"https://pigweed-review.googlesource.com",
"-input",
- "{\"change_id\": \"123456\", \"input\": {\"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\", \"notify\": \"OWNER\", \"tag\": \"autogenerated:pigweed:gerrit_comment\"}, \"revision_id\": \"current\"}",
+ "{\"change_id\": \"123456\", \"input\": {\"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\", \"notify\": \"OWNER\", \"tag\": \"autogenerated:project:builder:bbid=8945511751514863184\"}, \"revision_id\": \"current\"}",
"-output",
"/path/to/tmp/json"
],
@@ -173,7 +173,7 @@
"@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
"@@@STEP_LOG_LINE@json.input@ \"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@json.input@ \"notify\": \"OWNER\",@@@",
- "@@@STEP_LOG_LINE@json.input@ \"tag\": \"autogenerated:pigweed:gerrit_comment\"@@@",
+ "@@@STEP_LOG_LINE@json.input@ \"tag\": \"autogenerated:project:builder:bbid=8945511751514863184\"@@@",
"@@@STEP_LOG_LINE@json.input@ },@@@",
"@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
@@ -195,7 +195,7 @@
"-host",
"https://pigweed-review.googlesource.com",
"-input",
- "{\"change_id\": \"123456\", \"input\": {\"message\": \"builder completed with status Bad stuff: http://go/bbid/8945511751514863184\", \"notify\": \"OWNER\", \"tag\": \"autogenerated:pigweed:gerrit_comment\"}, \"revision_id\": \"current\"}",
+ "{\"change_id\": \"123456\", \"input\": {\"message\": \"builder completed with status Bad stuff: http://go/bbid/8945511751514863184\", \"notify\": \"OWNER\", \"tag\": \"autogenerated:project:builder:bbid=8945511751514863184\"}, \"revision_id\": \"current\"}",
"-output",
"/path/to/tmp/json"
],
@@ -224,7 +224,7 @@
"@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
"@@@STEP_LOG_LINE@json.input@ \"message\": \"builder completed with status Bad stuff: http://go/bbid/8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@json.input@ \"notify\": \"OWNER\",@@@",
- "@@@STEP_LOG_LINE@json.input@ \"tag\": \"autogenerated:pigweed:gerrit_comment\"@@@",
+ "@@@STEP_LOG_LINE@json.input@ \"tag\": \"autogenerated:project:builder:bbid=8945511751514863184\"@@@",
"@@@STEP_LOG_LINE@json.input@ },@@@",
"@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
index 6a14d3d..3a8b72b 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
@@ -1882,7 +1882,7 @@
"-host",
"https://pigweed-review.googlesource.com",
"-input",
- "{\"change_id\": \"123456\", \"input\": {\"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\", \"notify\": \"OWNER\", \"tag\": \"autogenerated:pigweed:gerrit_comment\"}, \"revision_id\": \"current\"}",
+ "{\"change_id\": \"123456\", \"input\": {\"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\", \"notify\": \"OWNER\", \"tag\": \"autogenerated:project:builder:bbid=8945511751514863184\"}, \"revision_id\": \"current\"}",
"-output",
"/path/to/tmp/json"
],
@@ -1911,7 +1911,7 @@
"@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
"@@@STEP_LOG_LINE@json.input@ \"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@json.input@ \"notify\": \"OWNER\",@@@",
- "@@@STEP_LOG_LINE@json.input@ \"tag\": \"autogenerated:pigweed:gerrit_comment\"@@@",
+ "@@@STEP_LOG_LINE@json.input@ \"tag\": \"autogenerated:project:builder:bbid=8945511751514863184\"@@@",
"@@@STEP_LOG_LINE@json.input@ },@@@",
"@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
@@ -3364,7 +3364,7 @@
"-host",
"https://pigweed-review.googlesource.com",
"-input",
- "{\"change_id\": \"123456\", \"input\": {\"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\", \"notify\": \"OWNER\", \"tag\": \"autogenerated:pigweed:gerrit_comment\"}, \"revision_id\": \"current\"}",
+ "{\"change_id\": \"123456\", \"input\": {\"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\", \"notify\": \"OWNER\", \"tag\": \"autogenerated:project:builder:bbid=8945511751514863184\"}, \"revision_id\": \"current\"}",
"-output",
"/path/to/tmp/json"
],
@@ -3393,7 +3393,7 @@
"@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
"@@@STEP_LOG_LINE@json.input@ \"message\": \"builder completed with status OK: http://go/bbid/8945511751514863184\",@@@",
"@@@STEP_LOG_LINE@json.input@ \"notify\": \"OWNER\",@@@",
- "@@@STEP_LOG_LINE@json.input@ \"tag\": \"autogenerated:pigweed:gerrit_comment\"@@@",
+ "@@@STEP_LOG_LINE@json.input@ \"tag\": \"autogenerated:project:builder:bbid=8945511751514863184\"@@@",
"@@@STEP_LOG_LINE@json.input@ },@@@",
"@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
diff --git a/recipes/docs_builder.py b/recipes/docs_builder.py
index 91ed8e8..92eba59 100644
--- a/recipes/docs_builder.py
+++ b/recipes/docs_builder.py
@@ -153,7 +153,6 @@
message=f'Docs available at: {joined_links}',
notify='NONE',
ignore_automatic_attention_set_rules=True,
- tag='autogenerated:pigweed:docs',
)
return result.RawResult(
