Index: scripts/slave/recipe_modules/cipd/example.expected/basic.json |
diff --git a/scripts/slave/recipe_modules/cipd/example.expected/basic.json b/scripts/slave/recipe_modules/cipd/example.expected/basic.json |
deleted file mode 100644 |
index 208a5525857dcc89758c7da38325aa5332b32ac8..0000000000000000000000000000000000000000 |
--- a/scripts/slave/recipe_modules/cipd/example.expected/basic.json |
+++ /dev/null |
@@ -1,445 +0,0 @@ |
-[ |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::cipd]/resources/bootstrap.py", |
- "--platform", |
- "linux-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]/cipd", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "name": "install cipd", |
- "~followup_annotations": [ |
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::cipd]/resources/bootstrap.py", |
- "--platform", |
- "linux-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]/cipd", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--version", |
- "deadbeaf" |
- ], |
- "name": "install cipd (2)", |
- "~followup_annotations": [ |
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "ensure", |
- "--root", |
- "[SLAVE_BUILD]/packages", |
- "--list", |
- "public/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-cipd-builder.json" |
- ], |
- "name": "ensure_installed", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"7f751b2237df2fdf3c1405be00590fefffbaea2d\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"public/package/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "search", |
- "public/package/linux-amd64", |
- "--tag", |
- "git_revision:40-chars-long-hash", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-cipd-builder.json" |
- ], |
- "name": "cipd search public/package/linux-amd64 git_revision:40-chars-long-hash", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"public/package/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "describe", |
- "public/package/linux-amd64", |
- "--version", |
- "40-chars-fake-of-the-package-instance_id", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-cipd-builder.json" |
- ], |
- "name": "cipd describe public/package/linux-amd64", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"pin\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"public/package/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"refs\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"modified_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"modified_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"ref\": \"latest\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tags\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tag\": \"buildbot_build:some.waterfall/builder/1234\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tag\": \"git_repository:https://chromium.googlesource.com/some/repo\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tag\": \"git_revision:397a2597cdc237f3026e6143b683be4b9ab60540\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "ensure", |
- "--root", |
- "[SLAVE_BUILD]/packages", |
- "--list", |
- "private/package/linux-amd64 latest\npublic/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "fake-credentials.json" |
- ], |
- "name": "ensure_installed (2)", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"private/package/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"7f751b2237df2fdf3c1405be00590fefffbaea2d\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"public/package/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "search", |
- "private/package/linux-amd64", |
- "--tag", |
- "key:value", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "fake-credentials.json" |
- ], |
- "name": "cipd search private/package/linux-amd64 key:value", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"private/package/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "describe", |
- "private/package/linux-amd64", |
- "--version", |
- "40-chars-fake-of-the-package-instance_id", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "fake-credentials.json" |
- ], |
- "name": "cipd describe private/package/linux-amd64", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"pin\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"private/package/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"refs\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"modified_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"modified_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"ref\": \"latest\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ], @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tags\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tag\": \"custom:tagged\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_by\": \"user:44-blablbla@developer.gserviceaccount.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"registered_ts\": 1446574210, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"tag\": \"key:value\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "pkg-build", |
- "--in", |
- "fake-input-dir", |
- "--name", |
- "infra/fake-package", |
- "--out", |
- "fake-package-path", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "name": "build fake-package", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/fake-package\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "pkg-build", |
- "--in", |
- "fake-input-dir", |
- "--name", |
- "infra/fake-package", |
- "--out", |
- "fake-package-path", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--install-mode", |
- "copy" |
- ], |
- "name": "build fake-package (2)", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/fake-package\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "pkg-register", |
- "fake-package-path", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "fake-credentials.json", |
- "--ref", |
- "fake-ref-1", |
- "--ref", |
- "fake-ref-2", |
- "--tag", |
- "fake_tag_1:fake_value_1", |
- "--tag", |
- "fake_tag_2:fake_value_2" |
- ], |
- "name": "register infra/fake-package", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/fake-package\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "create", |
- "--pkg-def", |
- "[SLAVE_BUILD]/fake-package.yaml", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "fake-credentials.json", |
- "--ref", |
- "fake-ref-1", |
- "--ref", |
- "fake-ref-2", |
- "--tag", |
- "fake_tag_1:fake_value_1", |
- "--tag", |
- "fake_tag_2:fake_value_2" |
- ], |
- "name": "create fake-package.yaml", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
- "@@@STEP_LOG_END@json.output (invalid)@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "set-tag", |
- "fake-package", |
- "--version", |
- "long/weird/ref/which/doesn/not/fit/into/40chars", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "fake-credentials.json", |
- "--tag", |
- "dead:beaf", |
- "--tag", |
- "more:value" |
- ], |
- "name": "cipd set-tag fake-package", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"pin\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-long/weird/ref/w\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "set-ref", |
- "fake-package", |
- "--version", |
- "latest", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "fake-credentials.json", |
- "--ref", |
- "any", |
- "--ref", |
- "some" |
- ], |
- "name": "cipd set-ref fake-package", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"pin\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "search", |
- "fake-package/linux-amd64", |
- "--tag", |
- "dead:beaf", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "fake-credentials.json" |
- ], |
- "name": "cipd search fake-package/linux-amd64 dead:beaf", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "name": "$result", |
- "recipe_result": null, |
- "status_code": 0 |
- } |
-] |