Update CIPD module tests
This reflects the changes to the bootstrap script.
Change-Id: Ib8ab41354ac1cf93c33971324141390c25760252
diff --git a/recipe_modules/cipd/api.py b/recipe_modules/cipd/api.py
index b1e26d1..d6c831b 100644
--- a/recipe_modules/cipd/api.py
+++ b/recipe_modules/cipd/api.py
@@ -56,7 +56,7 @@
self._cipd_executable = step.json.output['executable']
step.presentation.step_text = (
- 'cipd instance_id: %s' % step.json.output['instance_id'])
+ 'cipd version: %s' % step.json.output['version'])
return step
def get_executable(self):
diff --git a/recipe_modules/cipd/example.expected/basic.json b/recipe_modules/cipd/example.expected/basic.json
index fc1558f..62448d3 100644
--- a/recipe_modules/cipd/example.expected/basic.json
+++ b/recipe_modules/cipd/example.expected/basic.json
@@ -13,10 +13,10 @@
],
"name": "install cipd",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -33,14 +33,14 @@
"--json-output",
"/path/to/tmp/json",
"--version",
- "deadbeaf"
+ "git_revision:f1234567890"
],
"name": "install cipd (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:f1234567890@@@",
"@@@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@ \"version\": \"git_revision:f1234567890\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/cipd/example.expected/describe-failed.json b/recipe_modules/cipd/example.expected/describe-failed.json
index 01cae4a..1108dbe 100644
--- a/recipe_modules/cipd/example.expected/describe-failed.json
+++ b/recipe_modules/cipd/example.expected/describe-failed.json
@@ -13,10 +13,10 @@
],
"name": "install cipd",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -33,14 +33,14 @@
"--json-output",
"/path/to/tmp/json",
"--version",
- "deadbeaf"
+ "git_revision:f1234567890"
],
"name": "install cipd (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:f1234567890@@@",
"@@@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@ \"version\": \"git_revision:f1234567890\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/cipd/example.expected/describe-many-instances.json b/recipe_modules/cipd/example.expected/describe-many-instances.json
index 45fe049..6614696 100644
--- a/recipe_modules/cipd/example.expected/describe-many-instances.json
+++ b/recipe_modules/cipd/example.expected/describe-many-instances.json
@@ -13,10 +13,10 @@
],
"name": "install cipd",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -33,14 +33,14 @@
"--json-output",
"/path/to/tmp/json",
"--version",
- "deadbeaf"
+ "git_revision:f1234567890"
],
"name": "install cipd (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:f1234567890@@@",
"@@@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@ \"version\": \"git_revision:f1234567890\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/cipd/example.expected/install-failed.json b/recipe_modules/cipd/example.expected/install-failed.json
index a884d27..62d84ec 100644
--- a/recipe_modules/cipd/example.expected/install-failed.json
+++ b/recipe_modules/cipd/example.expected/install-failed.json
@@ -16,7 +16,7 @@
"step returned non-zero exit code: 1",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@STEP_FAILURE@@@"
diff --git a/recipe_modules/cipd/example.expected/mac64.json b/recipe_modules/cipd/example.expected/mac64.json
index 9fd54f2..9271873 100644
--- a/recipe_modules/cipd/example.expected/mac64.json
+++ b/recipe_modules/cipd/example.expected/mac64.json
@@ -13,10 +13,10 @@
],
"name": "install cipd",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -33,14 +33,14 @@
"--json-output",
"/path/to/tmp/json",
"--version",
- "deadbeaf"
+ "git_revision:f1234567890"
],
"name": "install cipd (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:f1234567890@@@",
"@@@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@ \"version\": \"git_revision:f1234567890\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/cipd/example.expected/win64.json b/recipe_modules/cipd/example.expected/win64.json
deleted file mode 100644
index 129fd8e..0000000
--- a/recipe_modules/cipd/example.expected/win64.json
+++ /dev/null
@@ -1,445 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[infra::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-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[infra::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-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/windows-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/windows-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/windows-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/windows-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/windows-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/windows-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/windows-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/windows-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/windows-amd64 latest\npublic/package/windows-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/windows-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/windows-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/windows-amd64",
- "--tag",
- "key:value",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "fake-credentials.json"
- ],
- "name": "cipd search private/package/windows-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/windows-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/windows-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/windows-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/windows-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/windows-amd64",
- "--tag",
- "dead:beaf",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "fake-credentials.json"
- ],
- "name": "cipd search fake-package/windows-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/windows-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
- }
-]
\ No newline at end of file
diff --git a/recipe_modules/cipd/example.py b/recipe_modules/cipd/example.py
index 616e9c6..b420e9f 100644
--- a/recipe_modules/cipd/example.py
+++ b/recipe_modules/cipd/example.py
@@ -14,7 +14,7 @@
def RunSteps(api):
# First, you need a cipd client.
api.cipd.install_client('install cipd')
- api.cipd.install_client('install cipd', version='deadbeaf')
+ api.cipd.install_client('install cipd', version='git_revision:f1234567890')
assert api.cipd.get_executable()
# Need to set service account credentials.
diff --git a/recipe_modules/cipd/test_api.py b/recipe_modules/cipd/test_api.py
index ac858fe..0bc5fa4 100644
--- a/recipe_modules/cipd/test_api.py
+++ b/recipe_modules/cipd/test_api.py
@@ -33,16 +33,21 @@
def make_test_executable(self):
return str(self.m.path['slave_build'].join('cipd', 'cipd'))
+ def make_test_version(self, v):
+ if v:
+ return v
+ return 'git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25'
+
def example_error(self, error, retcode=None):
return self._resultify(
result=None,
error=error,
retcode=1 if retcode is None else retcode)
- def example_install_client(self, package_name, version=None, retcode=None):
+ def example_install_client(self, version=None, retcode=None):
return self.m.json.output({
'executable': self.make_test_executable(),
- 'instance_id': self.make_resolved_version(version),
+ 'version': self.make_test_version(version),
}, retcode=retcode)
def example_build(self, package_name, version=None):
diff --git a/recipe_modules/goma/example.expected/linux.json b/recipe_modules/goma/example.expected/linux.json
index f3ca7f6..f3d39e6 100644
--- a/recipe_modules/goma/example.expected/linux.json
+++ b/recipe_modules/goma/example.expected/linux.json
@@ -18,10 +18,10 @@
"name": "ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -72,10 +72,10 @@
"name": "ensure_goma.install cipd (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/goma/example.expected/mac.json b/recipe_modules/goma/example.expected/mac.json
index e198e5e..263336d 100644
--- a/recipe_modules/goma/example.expected/mac.json
+++ b/recipe_modules/goma/example.expected/mac.json
@@ -18,10 +18,10 @@
"name": "ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -72,10 +72,10 @@
"name": "ensure_goma.install cipd (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/jiri/example.expected/basic.json b/recipe_modules/jiri/example.expected/basic.json
index 2df91e4..4183e6b 100644
--- a/recipe_modules/jiri/example.expected/basic.json
+++ b/recipe_modules/jiri/example.expected/basic.json
@@ -13,10 +13,10 @@
],
"name": "install cipd",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/jiri/example.expected/basic_fuchsia.json b/recipe_modules/jiri/example.expected/basic_fuchsia.json
index 2df91e4..4183e6b 100644
--- a/recipe_modules/jiri/example.expected/basic_fuchsia.json
+++ b/recipe_modules/jiri/example.expected/basic_fuchsia.json
@@ -13,10 +13,10 @@
],
"name": "install cipd",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/jiri/example.expected/basic_jiri.json b/recipe_modules/jiri/example.expected/basic_jiri.json
index 2df91e4..4183e6b 100644
--- a/recipe_modules/jiri/example.expected/basic_jiri.json
+++ b/recipe_modules/jiri/example.expected/basic_jiri.json
@@ -13,10 +13,10 @@
],
"name": "install cipd",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
diff --git a/recipe_modules/jiri/example.expected/basic_magenta.json b/recipe_modules/jiri/example.expected/basic_magenta.json
index 2df91e4..4183e6b 100644
--- a/recipe_modules/jiri/example.expected/basic_magenta.json
+++ b/recipe_modules/jiri/example.expected/basic_magenta.json
@@ -13,10 +13,10 @@
],
"name": "install cipd",
"~followup_annotations": [
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
"@@@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@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
