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

Unified Diff: scripts/slave/recipes/infra/infra_continuous.expected/infra_win.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: 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
Index: scripts/slave/recipes/infra/infra_continuous.expected/infra_win.json
diff --git a/scripts/slave/recipes/infra/infra_continuous.expected/infra_win.json b/scripts/slave/recipes/infra/infra_continuous.expected/infra_win.json
index 3f44d9a36af9943c91f6e730c6846a6cf16cca5f..30329fc1e0fc6c1fb6b28f662f9aa21b9910ce1a 100644
--- a/scripts/slave/recipes/infra/infra_continuous.expected/infra_win.json
+++ b/scripts/slave/recipes/infra/infra_continuous.expected/infra_win.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
"--root",
"infra",
"--revision_mapping_file",
"{\"infra\": \"got_revision\"}",
"--git-cache-dir",
- "[ROOT]\\b\\build\\slave\\cache_dir",
+ "[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -25,6 +25,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -63,6 +64,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -75,52 +77,56 @@
"test.py",
"test"
],
- "cwd": "[CWD]\\infra",
+ "cwd": "[SLAVE_BUILD]\\infra",
"name": "infra python tests"
},
{
"cmd": [
"python",
"-u",
- "[CWD]\\infra\\go\\env.py",
+ "[SLAVE_BUILD]\\infra\\go\\env.py",
"go",
"version"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "go third parties"
},
{
"cmd": [
"python",
"-u",
- "[CWD]\\infra\\go\\env.py",
+ "[SLAVE_BUILD]\\infra\\go\\env.py",
"python",
- "[CWD]\\infra\\go\\test.py"
+ "[SLAVE_BUILD]\\infra\\go\\test.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "infra go tests"
},
{
"cmd": [
"python",
"-u",
- "[CWD]\\infra\\build\\build.py",
+ "[SLAVE_BUILD]\\infra\\build\\build.py",
"--builder",
"infra-continuous"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cipd - build packages"
},
{
"cmd": [
"python",
"-u",
- "[CWD]\\infra\\build\\test_packages.py"
+ "[SLAVE_BUILD]\\infra\\build\\test_packages.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cipd - test packages integrity"
},
{
"cmd": [
"python",
"-u",
- "[CWD]\\infra\\build\\build.py",
+ "[SLAVE_BUILD]\\infra\\build\\build.py",
"--no-rebuild",
"--upload",
"--service-account-json",
@@ -134,6 +140,7 @@
"git_repository:https://chromium.googlesource.com/infra/infra",
"git_revision:5e03a58dc0850e5137a8ebbce29610670c756aed"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cipd - upload packages",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",

Powered by Google App Engine
This is Rietveld 408576698