| Index: scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_win64_nv_tester.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_win64_nv_tester.json b/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_win64_nv_tester.json
|
| index c09e3a67d4e41701f7c209c1053122c0936847ce..7c52ceb5e260998472667767162c1c57af4b2c12 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_win64_nv_tester.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_win64_nv_tester.json
|
| @@ -5,7 +5,6 @@
|
| "-u",
|
| "RECIPE_MODULE[build::bisect_tester]\\resources\\put_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "saving url to temp file",
|
| "stdin": "http://build.chromium.org/p/tryserver.chromium.perf/json/builders/win64_nv_tester/builds/571",
|
| "stdout": "/path/to/tmp/"
|
| @@ -16,13 +15,12 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]\\resources\\gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]\\gsutil.py",
|
| + "[ROOT]\\b\\depot_tools\\gsutil.py",
|
| "----",
|
| "cp",
|
| "/tmp/dummy1",
|
| "gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil bisect-results/f7a7b4135624439cbd27fdd5133d74ec",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec@@@"
|
| @@ -34,7 +32,6 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "taskkill"
|
| },
|
| {
|
| @@ -49,13 +46,13 @@
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",
|
| + "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\cache_dir",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -63,7 +60,6 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -137,7 +133,6 @@
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma"
|
| },
|
| {
|
| @@ -148,17 +143,16 @@
|
| "--platform",
|
| "windows-amd64",
|
| "--dest-directory",
|
| - "[SLAVE_BUILD]\\cipd",
|
| + "[CWD]\\cipd",
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "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_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@@@"
|
| @@ -166,10 +160,10 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]\\cipd\\cipd",
|
| + "fake_slave_build/cipd",
|
| "ensure",
|
| "--root",
|
| - "[CACHE]\\cipd\\goma",
|
| + "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma",
|
| "--list",
|
| "infra_internal/goma/client/windows-amd64 release",
|
| "--json-output",
|
| @@ -177,7 +171,6 @@
|
| "--service-account-json",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma.ensure_installed",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -199,10 +192,9 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| - "GYP_DEFINES": "branding=Chrome buildtype=Official chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "branding=Chrome buildtype=Official chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[ROOT]\\b\\build\\slave\\cache\\cipd\\goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -211,18 +203,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[CWD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release_x64",
|
| "--paths",
|
| - "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| + "{\"checkout\": \"[CWD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"win64_nv_tester\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.perf\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| @@ -234,13 +225,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]\\src\\testing\\buildbot\\tryserver.chromium.perf.json",
|
| + "[CWD]\\src\\testing\\buildbot\\tryserver.chromium.perf.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\tryserver.chromium.perf.json@@@",
|
| + "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\tryserver.chromium.perf.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -254,7 +244,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -262,9 +251,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]\\src\\out\\Release_x64"
|
| + "[CWD]\\src\\out\\Release_x64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -294,7 +282,6 @@
|
| "--build-number",
|
| "571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "extract build"
|
| },
|
| {
|
| @@ -318,7 +305,6 @@
|
| "--browser=release",
|
| "page_cycler.intl_ar_fa_he"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Performance Test 1 of 2",
|
| "stderr": "/path/to/tmp/",
|
| "stdout": "/path/to/tmp/",
|
| @@ -347,7 +333,6 @@
|
| "--browser=release",
|
| "page_cycler.intl_ar_fa_he"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Performance Test 2 of 2",
|
| "stderr": "/path/to/tmp/",
|
| "stdout": "/path/to/tmp/",
|
| @@ -361,7 +346,6 @@
|
| "-u",
|
| "RECIPE_MODULE[build::bisect_tester]\\resources\\put_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "saving json to temp file",
|
| "stdin": "{\"output\": [], \"results\": {\"values\": [0, 0]}, \"retcodes\": [0, 0]}",
|
| "stdout": "/path/to/tmp/"
|
| @@ -372,13 +356,12 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]\\resources\\gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]\\gsutil.py",
|
| + "[ROOT]\\b\\depot_tools\\gsutil.py",
|
| "----",
|
| "cp",
|
| "/tmp/dummy2",
|
| "gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results@@@"
|
| @@ -392,7 +375,6 @@
|
| "--target",
|
| "Release_x64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "process_dumps"
|
| },
|
| {
|
|
|