| Index: scripts/slave/recipe_modules/git_clone_bundler/example.expected/repo_with_duplicate.json
|
| diff --git a/scripts/slave/recipe_modules/git_clone_bundler/example.expected/repo_with_duplicate.json b/scripts/slave/recipe_modules/git_clone_bundler/example.expected/repo_with_duplicate.json
|
| index eab106d2b2f696144ee1719337e13a0e08eedff0..941997ec6fe9a4e5d787a12ebed33fff100b9afe 100644
|
| --- a/scripts/slave/recipe_modules/git_clone_bundler/example.expected/repo_with_duplicate.json
|
| +++ b/scripts/slave/recipe_modules/git_clone_bundler/example.expected/repo_with_duplicate.json
|
| @@ -4,9 +4,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]/git_clone_bundler/bundles"
|
| + "[CWD]/git_clone_bundler/bundles"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree old bundles",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -24,10 +23,9 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[SLAVE_BUILD]/git_clone_bundler/bundles",
|
| + "[CWD]/git_clone_bundler/bundles",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs bundles",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -47,10 +45,9 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[SLAVE_BUILD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484",
|
| + "[CWD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs repo",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -67,29 +64,29 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "init",
|
| "-u",
|
| "https://googlesource.com/manifest.xml"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484",
|
| + "cwd": "[CWD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484",
|
| "name": "repo init"
|
| },
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "sync",
|
| "--no-clone-bundle"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484",
|
| + "cwd": "[CWD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484",
|
| "name": "repo sync"
|
| },
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "list"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484",
|
| + "cwd": "[CWD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484",
|
| "name": "repo list",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -101,10 +98,10 @@
|
| "git",
|
| "bundle",
|
| "create",
|
| - "[SLAVE_BUILD]/git_clone_bundler/bundles/b30c7a01edcf711e48356dd038d8c03e.bundle",
|
| + "[CWD]/git_clone_bundler/bundles/b30c7a01edcf711e48356dd038d8c03e.bundle",
|
| "--all"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484/path/to/foo",
|
| + "cwd": "[CWD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484/path/to/foo",
|
| "name": "create bundle (src/foo)"
|
| },
|
| {
|
| @@ -113,13 +110,12 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| - "[SLAVE_BUILD]/git_clone_bundler/bundles/b30c7a01edcf711e48356dd038d8c03e.bundle",
|
| + "[CWD]/git_clone_bundler/bundles/b30c7a01edcf711e48356dd038d8c03e.bundle",
|
| "gs://clone-dot-bundle-bucket/checkout/repository/src/foo/clone.bundle"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload bundle (src/foo)",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil bundle@https://storage.cloud.google.com/clone-dot-bundle-bucket/checkout/repository/src/foo/clone.bundle@@@"
|
| @@ -132,7 +128,7 @@
|
| "--get",
|
| "remote.origin.url"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484/path/to/foo",
|
| + "cwd": "[CWD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484/path/to/foo",
|
| "name": "lookup Git remote (src/foo)",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -141,10 +137,10 @@
|
| "git",
|
| "bundle",
|
| "create",
|
| - "[SLAVE_BUILD]/git_clone_bundler/bundles/4e9dd63391c5eb1884b9b449679dfa16.bundle",
|
| + "[CWD]/git_clone_bundler/bundles/4e9dd63391c5eb1884b9b449679dfa16.bundle",
|
| "--all"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484/path/to/bar",
|
| + "cwd": "[CWD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484/path/to/bar",
|
| "name": "create bundle (src/bar)"
|
| },
|
| {
|
| @@ -153,13 +149,12 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| - "[SLAVE_BUILD]/git_clone_bundler/bundles/4e9dd63391c5eb1884b9b449679dfa16.bundle",
|
| + "[CWD]/git_clone_bundler/bundles/4e9dd63391c5eb1884b9b449679dfa16.bundle",
|
| "gs://clone-dot-bundle-bucket/checkout/repository/src/bar/clone.bundle"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload bundle (src/bar)",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil bundle@https://storage.cloud.google.com/clone-dot-bundle-bucket/checkout/repository/src/bar/clone.bundle@@@"
|
| @@ -172,7 +167,7 @@
|
| "--get",
|
| "remote.origin.url"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484/path/to/bar",
|
| + "cwd": "[CWD]/git_clone_bundler/repo/baa8c54f5ad38fa45e904e6bdfb6b484/path/to/bar",
|
| "name": "lookup Git remote (src/bar)",
|
| "stdout": "/path/to/tmp/"
|
| },
|
|
|