| Index: scripts/slave/recipe_modules/cipd/example.expected/mac64.json
|
| diff --git a/scripts/slave/recipe_modules/cipd/example.expected/mac64.json b/scripts/slave/recipe_modules/cipd/example.expected/mac64.json
|
| index b2278006b11c05ecfbbfbb63ff688593ccc20b84..51798ce69f8783cefbbbc70850632f68b66d111f 100644
|
| --- a/scripts/slave/recipe_modules/cipd/example.expected/mac64.json
|
| +++ b/scripts/slave/recipe_modules/cipd/example.expected/mac64.json
|
| @@ -7,16 +7,15 @@
|
| "--platform",
|
| "mac-amd64",
|
| "--dest-directory",
|
| - "[SLAVE_BUILD]/cipd",
|
| + "[CWD]/cipd",
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "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@ \"executable\": \"fake_slave_build/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@@@"
|
| @@ -30,18 +29,17 @@
|
| "--platform",
|
| "mac-amd64",
|
| "--dest-directory",
|
| - "[SLAVE_BUILD]/cipd",
|
| + "[CWD]/cipd",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--version",
|
| "deadbeaf"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "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@ \"executable\": \"fake_slave_build/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@@@"
|
| @@ -49,16 +47,15 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "ensure",
|
| "--root",
|
| - "[SLAVE_BUILD]/packages",
|
| + "[CWD]/packages",
|
| "--list",
|
| "public/package/mac-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_installed",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -74,7 +71,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "search",
|
| "public/package/mac-amd64",
|
| "--tag",
|
| @@ -82,7 +79,6 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cipd search public/package/mac-amd64 git_revision:40-chars-long-hash",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -98,7 +94,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "describe",
|
| "public/package/mac-amd64",
|
| "--version",
|
| @@ -106,7 +102,6 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cipd describe public/package/mac-amd64",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -148,10 +143,10 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "ensure",
|
| "--root",
|
| - "[SLAVE_BUILD]/packages",
|
| + "[CWD]/packages",
|
| "--list",
|
| "private/package/mac-amd64 latest\npublic/package/mac-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
|
| "--json-output",
|
| @@ -159,7 +154,6 @@
|
| "--service-account-json",
|
| "fake-credentials.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_installed (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -179,7 +173,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "search",
|
| "private/package/mac-amd64",
|
| "--tag",
|
| @@ -189,7 +183,6 @@
|
| "--service-account-json",
|
| "fake-credentials.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cipd search private/package/mac-amd64 key:value",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -205,7 +198,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "describe",
|
| "private/package/mac-amd64",
|
| "--version",
|
| @@ -215,7 +208,6 @@
|
| "--service-account-json",
|
| "fake-credentials.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cipd describe private/package/mac-amd64",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -252,7 +244,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "pkg-build",
|
| "--in",
|
| "fake-input-dir",
|
| @@ -263,7 +255,6 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "build fake-package",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -277,7 +268,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "pkg-build",
|
| "--in",
|
| "fake-input-dir",
|
| @@ -290,7 +281,6 @@
|
| "--install-mode",
|
| "copy"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "build fake-package (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -304,7 +294,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "pkg-register",
|
| "fake-package-path",
|
| "--json-output",
|
| @@ -320,7 +310,6 @@
|
| "--tag",
|
| "fake_tag_2:fake_value_2"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "register infra/fake-package",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -334,7 +323,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "set-tag",
|
| "fake-package",
|
| "--version",
|
| @@ -348,7 +337,6 @@
|
| "--tag",
|
| "more:value"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cipd set-tag fake-package",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -365,7 +353,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "set-ref",
|
| "fake-package",
|
| "--version",
|
| @@ -379,7 +367,6 @@
|
| "--ref",
|
| "some"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cipd set-ref fake-package",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -396,7 +383,7 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| + "fake_slave_build/cipd",
|
| "search",
|
| "fake-package/mac-amd64",
|
| "--tag",
|
| @@ -406,7 +393,6 @@
|
| "--service-account-json",
|
| "fake-credentials.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cipd search fake-package/mac-amd64 dead:beaf",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
|
|