Rename integration revision count output property
Using dashes instead of spaces makes it easier to use the same
string in Sponge.
Bug: 41721
Change-Id: I7223484a55675aa9b4a7383a4fefbc7f594a7772
diff --git a/recipe_modules/checkout/api.py b/recipe_modules/checkout/api.py
index 60d76dc..b5acd5d 100644
--- a/recipe_modules/checkout/api.py
+++ b/recipe_modules/checkout/api.py
@@ -14,7 +14,7 @@
# uploader code in google3.
# It's a monotonic integer that corresponds to integration revisions so we
# can stuff our results into systems that expect Piper changelist numbers.
-REVISION_COUNT_PROPERTY = 'integration revision count'
+REVISION_COUNT_PROPERTY = 'integration-revision-count'
class CheckoutResults(object):
diff --git a/recipe_modules/checkout/examples/full.expected/default.json b/recipe_modules/checkout/examples/full.expected/default.json
index dc4e0d0..b399dee 100644
--- a/recipe_modules/checkout/examples/full.expected/default.json
+++ b/recipe_modules/checkout/examples/full.expected/default.json
@@ -284,7 +284,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/from_snapshot_dot_path.json b/recipe_modules/checkout/examples/full.expected/from_snapshot_dot_path.json
index 0448bd8..67fc9b6 100644
--- a/recipe_modules/checkout/examples/full.expected/from_snapshot_dot_path.json
+++ b/recipe_modules/checkout/examples/full.expected/from_snapshot_dot_path.json
@@ -419,7 +419,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/from_snapshot_not_tryjob.json b/recipe_modules/checkout/examples/full.expected/from_snapshot_not_tryjob.json
index 90a16fd..5da47c4 100644
--- a/recipe_modules/checkout/examples/full.expected/from_snapshot_not_tryjob.json
+++ b/recipe_modules/checkout/examples/full.expected/from_snapshot_not_tryjob.json
@@ -321,7 +321,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/from_snapshot_tryjob.json b/recipe_modules/checkout/examples/full.expected/from_snapshot_tryjob.json
index dbd5d38..07abf5d 100644
--- a/recipe_modules/checkout/examples/full.expected/from_snapshot_tryjob.json
+++ b/recipe_modules/checkout/examples/full.expected/from_snapshot_tryjob.json
@@ -419,7 +419,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/global_integration_ci.json b/recipe_modules/checkout/examples/full.expected/global_integration_ci.json
index e0f0b19..2033d4e 100644
--- a/recipe_modules/checkout/examples/full.expected/global_integration_ci.json
+++ b/recipe_modules/checkout/examples/full.expected/global_integration_ci.json
@@ -177,7 +177,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/global_integration_release_ci.json b/recipe_modules/checkout/examples/full.expected/global_integration_release_ci.json
index 3f99134..e0e0982 100644
--- a/recipe_modules/checkout/examples/full.expected/global_integration_release_ci.json
+++ b/recipe_modules/checkout/examples/full.expected/global_integration_release_ci.json
@@ -195,7 +195,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/global_integration_tryjob.json b/recipe_modules/checkout/examples/full.expected/global_integration_tryjob.json
index 6e2cb56..77584ad 100644
--- a/recipe_modules/checkout/examples/full.expected/global_integration_tryjob.json
+++ b/recipe_modules/checkout/examples/full.expected/global_integration_tryjob.json
@@ -306,7 +306,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/local_integration_ci.json b/recipe_modules/checkout/examples/full.expected/local_integration_ci.json
index d187b7d..166aad7 100644
--- a/recipe_modules/checkout/examples/full.expected/local_integration_ci.json
+++ b/recipe_modules/checkout/examples/full.expected/local_integration_ci.json
@@ -195,7 +195,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/local_integration_tryjob.json b/recipe_modules/checkout/examples/full.expected/local_integration_tryjob.json
index dc4e0d0..b399dee 100644
--- a/recipe_modules/checkout/examples/full.expected/local_integration_tryjob.json
+++ b/recipe_modules/checkout/examples/full.expected/local_integration_tryjob.json
@@ -284,7 +284,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/should_ignore_patches_for_non_dependant_projects.json b/recipe_modules/checkout/examples/full.expected/should_ignore_patches_for_non_dependant_projects.json
index 84284c2..c123856 100644
--- a/recipe_modules/checkout/examples/full.expected/should_ignore_patches_for_non_dependant_projects.json
+++ b/recipe_modules/checkout/examples/full.expected/should_ignore_patches_for_non_dependant_projects.json
@@ -332,7 +332,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/sso_manifest_remote.json b/recipe_modules/checkout/examples/full.expected/sso_manifest_remote.json
index 617c06e..b5fac3a 100644
--- a/recipe_modules/checkout/examples/full.expected/sso_manifest_remote.json
+++ b/recipe_modules/checkout/examples/full.expected/sso_manifest_remote.json
@@ -195,7 +195,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/subbuild_from_spec.json b/recipe_modules/checkout/examples/full.expected/subbuild_from_spec.json
index dc4e0d0..b399dee 100644
--- a/recipe_modules/checkout/examples/full.expected/subbuild_from_spec.json
+++ b/recipe_modules/checkout/examples/full.expected/subbuild_from_spec.json
@@ -284,7 +284,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/tryjob_with_patchfile.json b/recipe_modules/checkout/examples/full.expected/tryjob_with_patchfile.json
index 24c9ea6..a4484a6 100644
--- a/recipe_modules/checkout/examples/full.expected/tryjob_with_patchfile.json
+++ b/recipe_modules/checkout/examples/full.expected/tryjob_with_patchfile.json
@@ -356,7 +356,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipe_modules/checkout/examples/full.expected/when_patchfile_host_has_protocol.json b/recipe_modules/checkout/examples/full.expected/when_patchfile_host_has_protocol.json
index 4440ac0..0745b1a 100644
--- a/recipe_modules/checkout/examples/full.expected/when_patchfile_host_has_protocol.json
+++ b/recipe_modules/checkout/examples/full.expected/when_patchfile_host_has_protocol.json
@@ -356,7 +356,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipes/fuchsia/build.expected/build_type_release_not_run_tests.json b/recipes/fuchsia/build.expected/build_type_release_not_run_tests.json
index 3cf2a72..8b23edb 100644
--- a/recipes/fuchsia/build.expected/build_type_release_not_run_tests.json
+++ b/recipes/fuchsia/build.expected/build_type_release_not_run_tests.json
@@ -282,7 +282,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipes/fuchsia/build.expected/default.json b/recipes/fuchsia/build.expected/default.json
index 537939b..0f8471d 100644
--- a/recipes/fuchsia/build.expected/default.json
+++ b/recipes/fuchsia/build.expected/default.json
@@ -292,7 +292,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipes/fuchsia/build.expected/non-numeric-parent-id.json b/recipes/fuchsia/build.expected/non-numeric-parent-id.json
index 100ee91..ddc3774 100644
--- a/recipes/fuchsia/build.expected/non-numeric-parent-id.json
+++ b/recipes/fuchsia/build.expected/non-numeric-parent-id.json
@@ -292,7 +292,7 @@
"cmd": [],
"name": "upload checkout results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
diff --git a/recipes/fuchsia/fuchsia.expected/build_failed.json b/recipes/fuchsia/fuchsia.expected/build_failed.json
index 43f260a..501c5b1 100644
--- a/recipes/fuchsia/fuchsia.expected/build_failed.json
+++ b/recipes/fuchsia/fuchsia.expected/build_failed.json
@@ -286,7 +286,7 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"output\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"integration revision count\": 1, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"integration-revision-count\": 1, @@@",
"@@@STEP_LOG_LINE@json.output@ \"test_orchestration_inputs_hash\": \"abc\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
diff --git a/recipes/fuchsia/fuchsia.expected/build_infra_failure.json b/recipes/fuchsia/fuchsia.expected/build_infra_failure.json
index ecffce7..598c340 100644
--- a/recipes/fuchsia/fuchsia.expected/build_infra_failure.json
+++ b/recipes/fuchsia/fuchsia.expected/build_infra_failure.json
@@ -286,7 +286,7 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"output\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"integration revision count\": 1, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"integration-revision-count\": 1, @@@",
"@@@STEP_LOG_LINE@json.output@ \"test_orchestration_inputs_hash\": \"abc\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
diff --git a/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json b/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
index 85d6745..c7916cf 100644
--- a/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
+++ b/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
@@ -148,7 +148,7 @@
"name": "build",
"~followup_annotations": [
"@@@STEP_LINK@builder-subbuild@https://ci.chromium.org/b/8945511751514863184@@@",
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
@@ -286,7 +286,7 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"output\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"integration revision count\": 1, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"integration-revision-count\": 1, @@@",
"@@@STEP_LOG_LINE@json.output@ \"test_orchestration_inputs_hash\": \"abc\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
diff --git a/recipes/fuchsia/fuchsia.expected/successful_build_and_test_not_in_shards.json b/recipes/fuchsia/fuchsia.expected/successful_build_and_test_not_in_shards.json
index 6a6c427..91c3744 100644
--- a/recipes/fuchsia/fuchsia.expected/successful_build_and_test_not_in_shards.json
+++ b/recipes/fuchsia/fuchsia.expected/successful_build_and_test_not_in_shards.json
@@ -146,7 +146,7 @@
"name": "build",
"~followup_annotations": [
"@@@STEP_LINK@builder-subbuild@https://ci.chromium.org/b/8945511751514863184@@@",
- "@@@SET_BUILD_PROPERTY@integration revision count@1@@@"
+ "@@@SET_BUILD_PROPERTY@integration-revision-count@1@@@"
]
},
{
@@ -284,7 +284,7 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"output\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"integration revision count\": 1, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"integration-revision-count\": 1, @@@",
"@@@STEP_LOG_LINE@json.output@ \"test_orchestration_inputs_hash\": \"abc\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
diff --git a/recipes/fuchsia/fuchsia.py b/recipes/fuchsia/fuchsia.py
index 1a2ce1a..69bee6a 100644
--- a/recipes/fuchsia/fuchsia.py
+++ b/recipes/fuchsia/fuchsia.py
@@ -456,7 +456,7 @@
build=ci_build_message(
api=api,
output_props={
- 'integration revision count': 1,
+ 'integration-revision-count': 1,
'test_orchestration_inputs_hash': 'abc',
},
status='SUCCESS',
@@ -483,7 +483,7 @@
build=ci_build_message(
api=api,
output_props={
- 'integration revision count': 1,
+ 'integration-revision-count': 1,
'test_orchestration_inputs_hash': 'abc',
},
status='SUCCESS',
@@ -518,7 +518,7 @@
build=ci_build_message(
api=api,
output_props={
- 'integration revision count': 1,
+ 'integration-revision-count': 1,
'test_orchestration_inputs_hash': 'abc',
},
status='FAILURE',
@@ -537,7 +537,7 @@
build=ci_build_message(
api=api,
output_props={
- 'integration revision count': 1,
+ 'integration-revision-count': 1,
'test_orchestration_inputs_hash': 'abc',
},
status='INFRA_FAILURE',
