Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(846)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-inner.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/infra/cipd_test.py ('k') | scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-inner-win.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-inner.json
diff --git a/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-inner.json b/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-inner.json
index 4b847ade04288c28ea32225c364a1f80f0fc6c8e..5d003c106e6473d7d3b53582c8ae620e219cbac5 100644
--- a/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-inner.json
+++ b/scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-inner.json
@@ -7,16 +7,15 @@
"--platform",
"linux-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@@@"
@@ -24,20 +23,19 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"pkg-build",
"--in",
"[SLAVE_BUILD]/build/scripts/slave/recipe_modules/cipd",
"--name",
"infra/cipd_recipe_test/linux-amd64",
"--out",
- "[SLAVE_BUILD]/test_package.cipd",
+ "[CWD]/test_package.cipd",
"--json-output",
"/path/to/tmp/json",
"--install-mode",
"copy"
],
- "cwd": "[SLAVE_BUILD]",
"name": "build linux-amd64",
"~followup_annotations": [
"@@@STEP_TEXT@instance_id: 40-chars-fake-of-the-package-instance_id@@@",
@@ -52,9 +50,9 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"pkg-register",
- "[SLAVE_BUILD]/test_package.cipd",
+ "[CWD]/test_package.cipd",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
@@ -68,7 +66,6 @@
"--tag",
"revision:deadbeaf"
],
- "cwd": "[SLAVE_BUILD]",
"name": "register infra/cipd_recipe_test/linux-amd64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -82,7 +79,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"set-tag",
"infra/cipd_recipe_test/linux-amd64",
"--version",
@@ -94,7 +91,6 @@
"--tag",
"tag:cipd_test"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cipd set-tag infra/cipd_recipe_test/linux-amd64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -111,7 +107,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"set-ref",
"infra/cipd_recipe_test/linux-amd64",
"--version",
@@ -123,7 +119,6 @@
"--ref",
"cipd_test"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cipd set-ref infra/cipd_recipe_test/linux-amd64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -140,7 +135,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"search",
"infra/cipd_recipe_test/linux-amd64",
"--tag",
@@ -150,7 +145,6 @@
"--service-account-json",
"/creds/service_accounts/service-account-cipd-builder.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cipd search infra/cipd_recipe_test/linux-amd64 revision:deadbeaf",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -166,7 +160,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"describe",
"infra/cipd_recipe_test/linux-amd64",
"--version",
@@ -176,7 +170,6 @@
"--service-account-json",
"/creds/service_accounts/service-account-cipd-builder.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cipd describe infra/cipd_recipe_test/linux-amd64",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -218,10 +211,10 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"ensure",
"--root",
- "[SLAVE_BUILD]/cipd_test_package",
+ "[CWD]/cipd_test_package",
"--list",
"infra/cipd_recipe_test/linux-amd64 latest",
"--json-output",
@@ -229,7 +222,6 @@
"--service-account-json",
"/creds/service_accounts/service-account-cipd-builder.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_installed",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -245,10 +237,10 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"ensure",
"--root",
- "[SLAVE_BUILD]/cipd_test_package",
+ "[CWD]/cipd_test_package",
"--list",
"infra/cipd_recipe_test/linux-amd64 40-chars-fake-of-the-package-instance_id",
"--json-output",
@@ -256,7 +248,6 @@
"--service-account-json",
"/creds/service_accounts/service-account-cipd-builder.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_installed (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -275,9 +266,8 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[SLAVE_BUILD]/cipd_test_package/.cipd"
+ "[CWD]/cipd_test_package/.cipd"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree .cipd package directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -292,20 +282,19 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"pkg-build",
"--in",
- "[SLAVE_BUILD]/cipd_test_package",
+ "[CWD]/cipd_test_package",
"--name",
"infra/cipd_recipe_test/linux-amd64",
"--out",
- "[SLAVE_BUILD]/test_package.cipd",
+ "[CWD]/test_package.cipd",
"--json-output",
"/path/to/tmp/json",
"--install-mode",
"copy"
],
- "cwd": "[SLAVE_BUILD]",
"name": "build linux-amd64 (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
« no previous file with comments | « scripts/slave/recipes/infra/cipd_test.py ('k') | scripts/slave/recipes/infra/cipd_test.expected/cipd-latest-ok-inner-win.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698