Removing remaining windows desktop buildbots and replacing with vm
BUG=chromium:663372
Change-Id: I02e7e7d695930df46f8b1069af87b211cbce0784
Reviewed-on: https://chromium-review.googlesource.com/415404
Commit-Queue: Emily Hanley <eyaich@chromium.org>
Reviewed-by: Mike Stipicevic <stip@chromium.org>
diff --git a/masters/master.chromium.perf/master.cfg b/masters/master.chromium.perf/master.cfg
index 157983a..f7f7780 100644
--- a/masters/master.chromium.perf/master.cfg
+++ b/masters/master.chromium.perf/master.cfg
@@ -194,10 +194,10 @@
target_bits=32)
-_AddTester('Win Zenbook Perf', 'win', num_shards=5)
-_AddTester('Win 10 High-DPI Perf', 'win', num_shards=5)
-_AddTester('Win 10 Perf', 'win', num_shards=5)
-_AddTester('Win 8 Perf', 'win', num_shards=5)
+_AddTester('Win Zenbook Perf', 'win')
+_AddTester('Win 10 High-DPI Perf', 'win')
+_AddTester('Win 10 Perf', 'win')
+_AddTester('Win 8 Perf', 'win')
_AddTester('Win 7 Perf', 'win', target_bits=32)
_AddTester('Win 7 x64 Perf', 'win')
_AddTester('Win 7 ATI GPU Perf', 'win')
diff --git a/masters/master.chromium.perf/slaves.cfg b/masters/master.chromium.perf/slaves.cfg
index b7ce24c..25039aa 100644
--- a/masters/master.chromium.perf/slaves.cfg
+++ b/masters/master.chromium.perf/slaves.cfg
@@ -83,18 +83,10 @@
['build112-b1', 'build113-b1', 'build114-b1'])
-_AddTestSlaves(
- 'Win Zenbook Perf', 'win', 'win10',
- ['build30-b1', 'build31-b1', 'build32-b1', 'build33-b1', 'build34-b1'])
-_AddTestSlaves(
- 'Win 10 High-DPI Perf', 'win', 'win10',
- ['build117-b1', 'build118-b1', 'build119-b1', 'build120-b1', 'build121-b1'])
-_AddTestSlaves(
- 'Win 10 Perf', 'win', 'win10',
- ['build132-m1', 'build133-m1', 'build134-m1', 'build135-m1', 'build136-m1'])
-_AddTestSlaves(
- 'Win 8 Perf', 'win', 'win8',
- ['build143-m1', 'build144-m1', 'build145-m1', 'build146-m1', 'build147-m1'])
+_AddTestSlaves('Win Zenbook Perf', 'win', 'win10', ['vm1-m1'])
+_AddTestSlaves('Win 10 High-DPI Perf', 'win', 'win10', ['vm2-m1'])
+_AddTestSlaves('Win 10 Perf', 'win', 'win10', ['vm3-m1'])
+_AddTestSlaves('Win 8 Perf', 'win', 'win8', ['vm11-m1'])
_AddTestSlaves('Win 7 Perf', 'win', 'win7', ['vm4-m1'])
_AddTestSlaves('Win 7 x64 Perf', 'win', 'win7', ['vm7-m1'])
_AddTestSlaves('Win 7 ATI GPU Perf', 'win', 'win7', ['vm15-m1'])
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py b/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
index c37b432..ad379b4 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
@@ -175,14 +175,10 @@
target_bits=32, num_device_shards=7, num_host_shards=3)
-_AddTestSpec('Win Zenbook Perf', 'win-zenbook', 'win',
- num_host_shards=5)
-_AddTestSpec('Win 10 High-DPI Perf', 'win-high-dpi', 'win',
- num_host_shards=5)
-_AddTestSpec('Win 10 Perf', 'chromium-rel-win10', 'win',
- num_host_shards=5)
-_AddTestSpec('Win 8 Perf', 'chromium-rel-win8-dual', 'win',
- num_host_shards=5)
+_AddIsolatedTestSpec('Win Zenbook Perf', 'win-zenbook', 'win')
+_AddIsolatedTestSpec('Win 10 High-DPI Perf', 'win-high-dpi', 'win')
+_AddIsolatedTestSpec('Win 10 Perf', 'chromium-rel-win10', 'win')
+_AddIsolatedTestSpec('Win 8 Perf', 'chromium-rel-win8-dual', 'win')
_AddIsolatedTestSpec('Win 7 Perf', 'chromium-rel-win7-dual', 'win',
target_bits=32)
_AddIsolatedTestSpec('Win 7 x64 Perf', 'chromium-rel-win7-x64-dual', 'win')
diff --git a/scripts/slave/recipe_modules/chromium_tests/steps.py b/scripts/slave/recipe_modules/chromium_tests/steps.py
index 6e2b185..4df87d6 100644
--- a/scripts/slave/recipe_modules/chromium_tests/steps.py
+++ b/scripts/slave/recipe_modules/chromium_tests/steps.py
@@ -576,7 +576,7 @@
@property
def name(self):
- return 'dynamic_perf_tests'
+ return 'dynamic_perf_tests' # pragma: no cover
@property
def uses_local_devices(self):
@@ -639,10 +639,10 @@
test_type=test.get('perf_dashboard_id', test_name),
xvfb=True,
chartjson_file=True)
- except api.step.StepFailure as f:
+ except api.step.StepFailure as f: # pragma: no cover
failure = f
- if failure:
+ if failure: # pragma: no cover
raise failure
@staticmethod
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf.json
similarity index 68%
rename from scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__1_.json
rename to scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf.json
index 0bc890e..eebadad 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__1_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf.json
@@ -12,7 +12,7 @@
"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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_",
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf",
"511"
],
"name": "makedirs checkout path",
@@ -48,7 +48,7 @@
"src@1111111",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -190,14 +190,27 @@
"cmd": [
"python",
"-u",
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src\\tools\\swarming_client\\swarming.py",
+ "--version"
+ ],
+ "name": "swarming.py --version",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@0.8.6@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_\\src",
+ "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -206,16 +219,16 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_\\src\\testing\\scripts\\get_compile_targets.py",
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Release_x64",
"--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_Zenbook_Perf__1_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_High_DPI_Perf\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
"--properties",
- "{\"buildername\": \"Win Zenbook Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-zenbook\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
+ "{\"buildername\": \"Win 10 High-DPI Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-high-dpi\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -228,13 +241,24 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json",
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src\\testing\\buildbot\\chromium.perf.json",
"/path/to/tmp/json"
],
"name": "read test spec (chromium.perf.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_Zenbook_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src\\testing\\buildbot\\chromium.perf.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win 10 High-DPI Perf\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -254,7 +278,7 @@
"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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_\\src\\out\\Release_x64"
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src\\out\\Release_x64"
],
"name": "rmtree build directory",
"~followup_annotations": [
@@ -281,7 +305,7 @@
"--target",
"Release_x64",
"--src-dir",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_\\src",
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src",
"--slave-utils-gsutil-py-path",
"RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
"--build-archive-url",
@@ -297,51 +321,107 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
+ "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
+ "--build-dir",
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src\\out\\Release_x64",
+ "--output-json",
+ "/path/to/tmp/json"
],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "List Perf Tests",
+ "name": "find isolated tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src\\tools\\swarming_client\\swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "25",
+ "--shards",
+ "1",
+ "--task-name",
+ "browser_tests/Windows-7-SP1/ffffffffff/Win 10 High-DPI Perf/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Windows-7-SP1",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:Win 10 High-DPI Perf",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:ffffffffffffffffffffffffffffffffffffffff",
+ "--tag",
+ "master:chromium.perf",
+ "--tag",
+ "name:browser_tests",
+ "--tag",
+ "os:Windows-7-SP1",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "slavename:TestSlavename",
+ "--tag",
+ "stepname:browser_tests on Windows-7-SP1",
+ "--idempotent",
+ "ffffffffffffffffffffffffffffffffffffffff",
+ "--",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ },
+ "name": "[trigger] browser_tests on Windows-7-SP1",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win 10 High-DPI Perf/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/ffffffffff/Win 10 High-DPI Perf/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
]
},
{
@@ -349,49 +429,68 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=win-zenbook",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.release",
- "--chartjson-file",
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
+ "python",
+ "RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[BUILDER_CACHE]\\Win_10_High_DPI_Perf\\src\\tools\\swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
"/path/to/tmp/json",
- "--builder-name=Win Zenbook Perf (1)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--json",
+ "{\"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win 10 High-DPI Perf/571\", \"tasks\": {\"browser_tests/Windows-7-SP1/ffffffffff/Win 10 High-DPI Perf/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "blink_perf.all.release",
+ "name": "browser_tests on Windows-7-SP1",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LINK@shard #0 isolated out@blah@@@"
]
},
{
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[build::test_results]\\resources\\upload_test_results.py",
+ "--input-json",
+ "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
+ "--master-name",
+ "chromium.perf",
+ "--builder-name",
+ "Win 10 High-DPI Perf",
+ "--build-number",
+ "571",
+ "--test-type",
+ "browser_tests on Windows-7-SP1",
+ "--test-results-server",
+ "test-results.appspot.com",
+ "--chrome-revision",
+ "170242"
+ ],
+ "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ },
+ "name": "Upload to test-results [browser_tests on Windows-7-SP1]"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
"--target",
"Release_x64"
],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__1_.json
deleted file mode 100644
index b49eae9..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__1_.json
+++ /dev/null
@@ -1,405 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_High_DPI_Perf__1_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 High-DPI Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-high-dpi\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=win-high-dpi",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.release",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 High-DPI Perf (1)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.all.release",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__1_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__2_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__2_.json
deleted file mode 100644
index 6ad8e98..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__2_.json
+++ /dev/null
@@ -1,479 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_High_DPI_Perf__2_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 High-DPI Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-high-dpi\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=win-high-dpi",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.exact",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 High-DPI Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.all.exact",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.dom",
- "--perf-id=win-high-dpi",
- "--test-type=blink_perf.dom",
- "--step-name=blink_perf.dom",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 High-DPI Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "-v",
- "--upload-results",
- "blink_perf.dom"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.dom",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=dromaeo.cssqueryjquery",
- "--perf-id=win-high-dpi",
- "--test-type=dromaeo.cssqueryjquery",
- "--step-name=dromaeo.cssqueryjquery.release",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 High-DPI Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "dromaeo.cssqueryjquery.release",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__3_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__3_.json
deleted file mode 100644
index d4f440b..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__3_.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_High_DPI_Perf__3_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 High-DPI Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-high-dpi\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__3_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__4_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__4_.json
deleted file mode 100644
index 0fe9d77..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__4_.json
+++ /dev/null
@@ -1,402 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_High_DPI_Perf__4_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 High-DPI Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-high-dpi\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 High-DPI Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=dromaeo.cssqueryjquery",
- "--perf-id=win-high-dpi",
- "--test-type=dromaeo.cssqueryjquery",
- "--step-name=dromaeo.cssqueryjquery",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 High-DPI Perf (4)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "dromaeo.cssqueryjquery",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__5_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__5_.json
deleted file mode 100644
index 0eabf0b..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_High_DPI_Perf__5_.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_High_DPI_Perf__5_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 High-DPI Perf (5)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-high-dpi\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_High_DPI_Perf__5_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf.json
similarity index 67%
copy from scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf.json
index d9e96f0..73886c3 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf.json
@@ -12,7 +12,7 @@
"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",
- "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "[BUILDER_CACHE]\\Win_10_Perf",
"511"
],
"name": "makedirs checkout path",
@@ -48,7 +48,7 @@
"src@1111111",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_10_Perf",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -190,14 +190,27 @@
"cmd": [
"python",
"-u",
+ "[BUILDER_CACHE]\\Win_10_Perf\\src\\tools\\swarming_client\\swarming.py",
+ "--version"
+ ],
+ "name": "swarming.py --version",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@0.8.6@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_\\src",
+ "cwd": "[BUILDER_CACHE]\\Win_10_Perf\\src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -206,16 +219,16 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\scripts\\get_compile_targets.py",
+ "[BUILDER_CACHE]\\Win_10_Perf\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Release_x64",
"--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_Perf__1_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_Perf\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
"--properties",
- "{\"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win10\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
+ "{\"buildername\": \"Win 10 Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win10\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -228,13 +241,24 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json",
+ "[BUILDER_CACHE]\\Win_10_Perf\\src\\testing\\buildbot\\chromium.perf.json",
"/path/to/tmp/json"
],
"name": "read test spec (chromium.perf.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_Perf\\src\\testing\\buildbot\\chromium.perf.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win 10 Perf\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -254,7 +278,7 @@
"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",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\out\\Release_x64"
+ "[BUILDER_CACHE]\\Win_10_Perf\\src\\out\\Release_x64"
],
"name": "rmtree build directory",
"~followup_annotations": [
@@ -281,7 +305,7 @@
"--target",
"Release_x64",
"--src-dir",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src",
+ "[BUILDER_CACHE]\\Win_10_Perf\\src",
"--slave-utils-gsutil-py-path",
"RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
"--build-archive-url",
@@ -297,51 +321,107 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
+ "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
+ "--build-dir",
+ "[BUILDER_CACHE]\\Win_10_Perf\\src\\out\\Release_x64",
+ "--output-json",
+ "/path/to/tmp/json"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_10_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "List Perf Tests",
+ "name": "find isolated tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]\\Win_10_Perf\\src\\tools\\swarming_client\\swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "25",
+ "--shards",
+ "1",
+ "--task-name",
+ "browser_tests/Windows-7-SP1/ffffffffff/Win 10 Perf/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Windows-7-SP1",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:Win 10 Perf",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:ffffffffffffffffffffffffffffffffffffffff",
+ "--tag",
+ "master:chromium.perf",
+ "--tag",
+ "name:browser_tests",
+ "--tag",
+ "os:Windows-7-SP1",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "slavename:TestSlavename",
+ "--tag",
+ "stepname:browser_tests on Windows-7-SP1",
+ "--idempotent",
+ "ffffffffffffffffffffffffffffffffffffffff",
+ "--",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "cwd": "[BUILDER_CACHE]\\Win_10_Perf",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ },
+ "name": "[trigger] browser_tests on Windows-7-SP1",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win 10 Perf/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/ffffffffff/Win 10 Perf/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
]
},
{
@@ -349,49 +429,68 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=chromium-rel-win10",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.release",
- "--chartjson-file",
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
+ "python",
+ "RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[BUILDER_CACHE]\\Win_10_Perf\\src\\tools\\swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
"/path/to/tmp/json",
- "--builder-name=Win 10 Perf (1)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--json",
+ "{\"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win 10 Perf/571\", \"tasks\": {\"browser_tests/Windows-7-SP1/ffffffffff/Win 10 Perf/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_10_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "blink_perf.all.release",
+ "name": "browser_tests on Windows-7-SP1",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LINK@shard #0 isolated out@blah@@@"
]
},
{
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[build::test_results]\\resources\\upload_test_results.py",
+ "--input-json",
+ "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
+ "--master-name",
+ "chromium.perf",
+ "--builder-name",
+ "Win 10 Perf",
+ "--build-number",
+ "571",
+ "--test-type",
+ "browser_tests on Windows-7-SP1",
+ "--test-results-server",
+ "test-results.appspot.com",
+ "--chrome-revision",
+ "170242"
+ ],
+ "cwd": "[BUILDER_CACHE]\\Win_10_Perf",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ },
+ "name": "Upload to test-results [browser_tests on Windows-7-SP1]"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
"--target",
"Release_x64"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_10_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__2_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__2_.json
deleted file mode 100644
index ef9df8f..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__2_.json
+++ /dev/null
@@ -1,479 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_Perf__2_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__2_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__2_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_Perf__2_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_Perf__2_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win10\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_Perf__2_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_Perf__2_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_Perf__2_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_Perf__2_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_Perf__2_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=chromium-rel-win10",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.exact",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.all.exact",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.dom",
- "--perf-id=chromium-rel-win10",
- "--test-type=blink_perf.dom",
- "--step-name=blink_perf.dom",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "-v",
- "--upload-results",
- "blink_perf.dom"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.dom",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=dromaeo.cssqueryjquery",
- "--perf-id=chromium-rel-win10",
- "--test-type=dromaeo.cssqueryjquery",
- "--step-name=dromaeo.cssqueryjquery.release",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "dromaeo.cssqueryjquery.release",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__3_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__3_.json
deleted file mode 100644
index 7e5ab0e..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__3_.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_Perf__3_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__3_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__3_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_Perf__3_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_Perf__3_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win10\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_Perf__3_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_Perf__3_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_Perf__3_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_Perf__3_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_Perf__3_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__3_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__3_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__4_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__4_.json
deleted file mode 100644
index 6abe555..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__4_.json
+++ /dev/null
@@ -1,402 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_Perf__4_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__4_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__4_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_Perf__4_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_Perf__4_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win10\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_Perf__4_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_Perf__4_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_Perf__4_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=dromaeo.cssqueryjquery",
- "--perf-id=chromium-rel-win10",
- "--test-type=dromaeo.cssqueryjquery",
- "--step-name=dromaeo.cssqueryjquery",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 10 Perf (4)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "dromaeo.cssqueryjquery",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__5_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__5_.json
deleted file mode 100644
index 43ff736..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__5_.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_Perf__5_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__5_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__5_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_Perf__5_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_Perf__5_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 10 Perf (5)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win10\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_Perf__5_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_Perf__5_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_10_Perf__5_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_10_Perf__5_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_10_Perf__5_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__5_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__5_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf.json
similarity index 67%
rename from scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json
rename to scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf.json
index d9e96f0..d030042 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf.json
@@ -12,7 +12,7 @@
"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",
- "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "[BUILDER_CACHE]\\Win_8_Perf",
"511"
],
"name": "makedirs checkout path",
@@ -48,7 +48,7 @@
"src@1111111",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_8_Perf",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -190,14 +190,27 @@
"cmd": [
"python",
"-u",
+ "[BUILDER_CACHE]\\Win_8_Perf\\src\\tools\\swarming_client\\swarming.py",
+ "--version"
+ ],
+ "name": "swarming.py --version",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@0.8.6@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_\\src",
+ "cwd": "[BUILDER_CACHE]\\Win_8_Perf\\src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -206,16 +219,16 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\scripts\\get_compile_targets.py",
+ "[BUILDER_CACHE]\\Win_8_Perf\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Release_x64",
"--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_Perf__1_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_8_Perf\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
"--properties",
- "{\"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win10\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
+ "{\"buildername\": \"Win 8 Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win8-dual\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -228,13 +241,24 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json",
+ "[BUILDER_CACHE]\\Win_8_Perf\\src\\testing\\buildbot\\chromium.perf.json",
"/path/to/tmp/json"
],
"name": "read test spec (chromium.perf.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_8_Perf\\src\\testing\\buildbot\\chromium.perf.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win 8 Perf\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -254,7 +278,7 @@
"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",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\out\\Release_x64"
+ "[BUILDER_CACHE]\\Win_8_Perf\\src\\out\\Release_x64"
],
"name": "rmtree build directory",
"~followup_annotations": [
@@ -281,7 +305,7 @@
"--target",
"Release_x64",
"--src-dir",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src",
+ "[BUILDER_CACHE]\\Win_8_Perf\\src",
"--slave-utils-gsutil-py-path",
"RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
"--build-archive-url",
@@ -297,51 +321,107 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
+ "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
+ "--build-dir",
+ "[BUILDER_CACHE]\\Win_8_Perf\\src\\out\\Release_x64",
+ "--output-json",
+ "/path/to/tmp/json"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_8_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "List Perf Tests",
+ "name": "find isolated tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]\\Win_8_Perf\\src\\tools\\swarming_client\\swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "25",
+ "--shards",
+ "1",
+ "--task-name",
+ "browser_tests/Windows-7-SP1/ffffffffff/Win 8 Perf/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Windows-7-SP1",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:Win 8 Perf",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:ffffffffffffffffffffffffffffffffffffffff",
+ "--tag",
+ "master:chromium.perf",
+ "--tag",
+ "name:browser_tests",
+ "--tag",
+ "os:Windows-7-SP1",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "slavename:TestSlavename",
+ "--tag",
+ "stepname:browser_tests on Windows-7-SP1",
+ "--idempotent",
+ "ffffffffffffffffffffffffffffffffffffffff",
+ "--",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "cwd": "[BUILDER_CACHE]\\Win_8_Perf",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ },
+ "name": "[trigger] browser_tests on Windows-7-SP1",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win 8 Perf/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/ffffffffff/Win 8 Perf/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
]
},
{
@@ -349,49 +429,68 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=chromium-rel-win10",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.release",
- "--chartjson-file",
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
+ "python",
+ "RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[BUILDER_CACHE]\\Win_8_Perf\\src\\tools\\swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
"/path/to/tmp/json",
- "--builder-name=Win 10 Perf (1)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--json",
+ "{\"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win 8 Perf/571\", \"tasks\": {\"browser_tests/Windows-7-SP1/ffffffffff/Win 8 Perf/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_8_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "blink_perf.all.release",
+ "name": "browser_tests on Windows-7-SP1",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LINK@shard #0 isolated out@blah@@@"
]
},
{
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[build::test_results]\\resources\\upload_test_results.py",
+ "--input-json",
+ "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
+ "--master-name",
+ "chromium.perf",
+ "--builder-name",
+ "Win 8 Perf",
+ "--build-number",
+ "571",
+ "--test-type",
+ "browser_tests on Windows-7-SP1",
+ "--test-results-server",
+ "test-results.appspot.com",
+ "--chrome-revision",
+ "170242"
+ ],
+ "cwd": "[BUILDER_CACHE]\\Win_8_Perf",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ },
+ "name": "Upload to test-results [browser_tests on Windows-7-SP1]"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
"--target",
"Release_x64"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_8_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__1_.json
deleted file mode 100644
index 8328b27..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__1_.json
+++ /dev/null
@@ -1,405 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__1_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__1_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__1_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__1_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_8_Perf__1_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 8 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win8-dual\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_8_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_8_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__1_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_8_Perf__1_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__1_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__1_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=chromium-rel-win8-dual",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.release",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 8 Perf (1)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__1_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.all.release",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__1_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__2_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__2_.json
deleted file mode 100644
index 3936dde..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__2_.json
+++ /dev/null
@@ -1,479 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__2_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__2_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__2_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__2_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_8_Perf__2_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 8 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win8-dual\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_8_Perf__2_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_8_Perf__2_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__2_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_8_Perf__2_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__2_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=chromium-rel-win8-dual",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.exact",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 8 Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.all.exact",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.dom",
- "--perf-id=chromium-rel-win8-dual",
- "--test-type=blink_perf.dom",
- "--step-name=blink_perf.dom",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 8 Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "-v",
- "--upload-results",
- "blink_perf.dom"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.dom",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=dromaeo.cssqueryjquery",
- "--perf-id=chromium-rel-win8-dual",
- "--test-type=dromaeo.cssqueryjquery",
- "--step-name=dromaeo.cssqueryjquery.release",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 8 Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "dromaeo.cssqueryjquery.release",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__3_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__3_.json
deleted file mode 100644
index ac51134..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__3_.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__3_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__3_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__3_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__3_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_8_Perf__3_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 8 Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win8-dual\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_8_Perf__3_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_8_Perf__3_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__3_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_8_Perf__3_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__3_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__3_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__3_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__4_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__4_.json
deleted file mode 100644
index 6ab9cc4..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__4_.json
+++ /dev/null
@@ -1,402 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__4_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__4_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__4_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__4_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_8_Perf__4_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 8 Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win8-dual\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_8_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_8_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__4_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_8_Perf__4_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__4_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 8 Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=dromaeo.cssqueryjquery",
- "--perf-id=chromium-rel-win8-dual",
- "--test-type=dromaeo.cssqueryjquery",
- "--step-name=dromaeo.cssqueryjquery",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win 8 Perf (4)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "dromaeo.cssqueryjquery",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__5_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__5_.json
deleted file mode 100644
index 82aead5..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_8_Perf__5_.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__5_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__5_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__5_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__5_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_8_Perf__5_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win 8 Perf (5)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win8-dual\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_8_Perf__5_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_8_Perf__5_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_8_Perf__5_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_8_Perf__5_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_8_Perf__5_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__5_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_8_Perf__5_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf.json
similarity index 67%
copy from scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf.json
index d9e96f0..3ceead1 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_10_Perf__1_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf.json
@@ -12,7 +12,7 @@
"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",
- "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf",
"511"
],
"name": "makedirs checkout path",
@@ -48,7 +48,7 @@
"src@1111111",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -190,14 +190,27 @@
"cmd": [
"python",
"-u",
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src\\tools\\swarming_client\\swarming.py",
+ "--version"
+ ],
+ "name": "swarming.py --version",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@0.8.6@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_\\src",
+ "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -206,16 +219,16 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\scripts\\get_compile_targets.py",
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Release_x64",
"--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_10_Perf__1_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_Zenbook_Perf\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
"--properties",
- "{\"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-win10\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
+ "{\"buildername\": \"Win Zenbook Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-zenbook\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -228,13 +241,24 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json",
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src\\testing\\buildbot\\chromium.perf.json",
"/path/to/tmp/json"
],
"name": "read test spec (chromium.perf.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_10_Perf__1_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_Zenbook_Perf\\src\\testing\\buildbot\\chromium.perf.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win Zenbook Perf\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -254,7 +278,7 @@
"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",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\out\\Release_x64"
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src\\out\\Release_x64"
],
"name": "rmtree build directory",
"~followup_annotations": [
@@ -281,7 +305,7 @@
"--target",
"Release_x64",
"--src-dir",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src",
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src",
"--slave-utils-gsutil-py-path",
"RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
"--build-archive-url",
@@ -297,51 +321,107 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]\\Win_10_Perf__1_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
+ "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
+ "--build-dir",
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src\\out\\Release_x64",
+ "--output-json",
+ "/path/to/tmp/json"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "List Perf Tests",
+ "name": "find isolated tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src\\tools\\swarming_client\\swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "25",
+ "--shards",
+ "1",
+ "--task-name",
+ "browser_tests/Windows-7-SP1/ffffffffff/Win Zenbook Perf/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Windows-7-SP1",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:Win Zenbook Perf",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:ffffffffffffffffffffffffffffffffffffffff",
+ "--tag",
+ "master:chromium.perf",
+ "--tag",
+ "name:browser_tests",
+ "--tag",
+ "os:Windows-7-SP1",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "slavename:TestSlavename",
+ "--tag",
+ "stepname:browser_tests on Windows-7-SP1",
+ "--idempotent",
+ "ffffffffffffffffffffffffffffffffffffffff",
+ "--",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ },
+ "name": "[trigger] browser_tests on Windows-7-SP1",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win Zenbook Perf/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/ffffffffff/Win Zenbook Perf/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
]
},
{
@@ -349,49 +429,68 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win 10 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=chromium-rel-win10",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.release",
- "--chartjson-file",
+ "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
+ "python",
+ "RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[BUILDER_CACHE]\\Win_Zenbook_Perf\\src\\tools\\swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
"/path/to/tmp/json",
- "--builder-name=Win 10 Perf (1)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--json",
+ "{\"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win Zenbook Perf/571\", \"tasks\": {\"browser_tests/Windows-7-SP1/ffffffffff/Win Zenbook Perf/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "blink_perf.all.release",
+ "name": "browser_tests on Windows-7-SP1",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LINK@shard #0 isolated out@blah@@@"
]
},
{
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[build::test_results]\\resources\\upload_test_results.py",
+ "--input-json",
+ "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
+ "--master-name",
+ "chromium.perf",
+ "--builder-name",
+ "Win Zenbook Perf",
+ "--build-number",
+ "571",
+ "--test-type",
+ "browser_tests on Windows-7-SP1",
+ "--test-results-server",
+ "test-results.appspot.com",
+ "--chrome-revision",
+ "170242"
+ ],
+ "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
+ },
+ "name": "Upload to test-results [browser_tests on Windows-7-SP1]"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
"--target",
"Release_x64"
],
- "cwd": "[BUILDER_CACHE]\\Win_10_Perf__1_",
+ "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__2_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__2_.json
deleted file mode 100644
index 042ac84..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__2_.json
+++ /dev/null
@@ -1,479 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_Zenbook_Perf__2_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win Zenbook Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-zenbook\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_Zenbook_Perf__2_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=win-zenbook",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.exact",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win Zenbook Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.all.exact",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.dom",
- "--perf-id=win-zenbook",
- "--test-type=blink_perf.dom",
- "--step-name=blink_perf.dom",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win Zenbook Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "-v",
- "--upload-results",
- "blink_perf.dom"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.dom",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=dromaeo.cssqueryjquery",
- "--perf-id=win-zenbook",
- "--test-type=dromaeo.cssqueryjquery",
- "--step-name=dromaeo.cssqueryjquery.release",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win Zenbook Perf (2)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "dromaeo.cssqueryjquery.release",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__2_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__3_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__3_.json
deleted file mode 100644
index b982bf5..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__3_.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_Zenbook_Perf__3_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win Zenbook Perf (3)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-zenbook\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_Zenbook_Perf__3_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__3_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__4_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__4_.json
deleted file mode 100644
index 3147918..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__4_.json
+++ /dev/null
@@ -1,402 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_Zenbook_Perf__4_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win Zenbook Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-zenbook\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_Zenbook_Perf__4_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Zenbook Perf (4)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Win x64 Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=dromaeo.cssqueryjquery",
- "--perf-id=win-zenbook",
- "--test-type=dromaeo.cssqueryjquery",
- "--step-name=dromaeo.cssqueryjquery",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win Zenbook Perf (4)",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--run-python-script",
- "/path/to/run_benchmark"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "dromaeo.cssqueryjquery",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__4_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__5_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__5_.json
deleted file mode 100644
index 5535c14..0000000
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_Zenbook_Perf__5_.json
+++ /dev/null
@@ -1,366 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_",
- "511"
- ],
- "name": "makedirs checkout path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@1111111",
- "--output_manifest"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_",
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_Zenbook_Perf__5_\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win Zenbook Perf (5)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-zenbook\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_Zenbook_Perf__5_\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
- "--master-name",
- "chromium.perf",
- "--build-number",
- "571"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "cwd": "[BUILDER_CACHE]\\Win_Zenbook_Perf__5_",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json
index 7f92f44..fda6d03 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Win_x64_Builder.json
@@ -248,7 +248,7 @@
"~followup_annotations": [
"@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_x64_Builder\\src\\testing\\buildbot\\chromium.perf.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 High-DPI Perf (1)\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win 10 High-DPI Perf\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
@@ -258,87 +258,7 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 High-DPI Perf (2)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 High-DPI Perf (3)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 High-DPI Perf (4)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 High-DPI Perf (5)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 Perf (1)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 Perf (2)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 Perf (3)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 Perf (4)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 10 Perf (5)\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win 10 Perf\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
@@ -388,7 +308,7 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 8 Perf (1)\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win 8 Perf\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
@@ -398,87 +318,7 @@
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 8 Perf (2)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 8 Perf (3)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 8 Perf (4)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win 8 Perf (5)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win Zenbook Perf (1)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win Zenbook Perf (2)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win Zenbook Perf (3)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win Zenbook Perf (4)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Win Zenbook Perf (5)\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win Zenbook Perf\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
@@ -700,7 +540,7 @@
"name": "trigger",
"trigger_specs": [
{
- "builder_name": "Win 10 High-DPI Perf (1)",
+ "builder_name": "Win 10 High-DPI Perf",
"properties": {
"parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
"parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -720,167 +560,7 @@
}
},
{
- "builder_name": "Win 10 High-DPI Perf (2)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 10 High-DPI Perf (3)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 10 High-DPI Perf (4)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 10 High-DPI Perf (5)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 10 Perf (1)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 10 Perf (2)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 10 Perf (3)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 10 Perf (4)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 10 Perf (5)",
+ "builder_name": "Win 10 Perf",
"properties": {
"parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
"parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -980,7 +660,7 @@
}
},
{
- "builder_name": "Win 8 Perf (1)",
+ "builder_name": "Win 8 Perf",
"properties": {
"parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
"parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -1000,167 +680,7 @@
}
},
{
- "builder_name": "Win 8 Perf (2)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 8 Perf (3)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 8 Perf (4)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win 8 Perf (5)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win Zenbook Perf (1)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win Zenbook Perf (2)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win Zenbook Perf (3)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win Zenbook Perf (4)",
- "properties": {
- "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
- "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
- "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
- "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
- "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
- "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
- "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "parent_got_revision_cp": "refs/heads/master@{#170242}",
- "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
- "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
- "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
- "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
- "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
- "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
- "parent_mastername": "chromium.perf"
- }
- },
- {
- "builder_name": "Win Zenbook Perf (5)",
+ "builder_name": "Win Zenbook Perf",
"properties": {
"parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
"parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
@@ -1223,7 +743,7 @@
}
],
"~followup_annotations": [
- "@@@STEP_TEXT@Win 10 High-DPI Perf (1)<br />Win 10 High-DPI Perf (2)<br />Win 10 High-DPI Perf (3)<br />Win 10 High-DPI Perf (4)<br />Win 10 High-DPI Perf (5)<br />Win 10 Perf (1)<br />Win 10 Perf (2)<br />Win 10 Perf (3)<br />Win 10 Perf (4)<br />Win 10 Perf (5)<br />Win 7 ATI GPU Perf<br />Win 7 Intel GPU Perf<br />Win 7 Intel GPU Perf (Xeon)<br />Win 7 Nvidia GPU Perf<br />Win 7 x64 Perf<br />Win 8 Perf (1)<br />Win 8 Perf (2)<br />Win 8 Perf (3)<br />Win 8 Perf (4)<br />Win 8 Perf (5)<br />Win Power High-DPI Perf<br />Win Zenbook Perf (1)<br />Win Zenbook Perf (2)<br />Win Zenbook Perf (3)<br />Win Zenbook Perf (4)<br />Win Zenbook Perf (5)@@@"
+ "@@@STEP_TEXT@Win 10 High-DPI Perf<br />Win 10 Perf<br />Win 7 ATI GPU Perf<br />Win 7 Intel GPU Perf<br />Win 7 Intel GPU Perf (Xeon)<br />Win 7 Nvidia GPU Perf<br />Win 7 x64 Perf<br />Win 8 Perf<br />Win Power High-DPI Perf<br />Win Zenbook Perf@@@"
]
},
{
diff --git a/scripts/slave/recipes/chromium.expected/perf_test_profile_failure.json b/scripts/slave/recipes/chromium.expected/perf_test_profile_failure.json
deleted file mode 100644
index 1e5260c..0000000
--- a/scripts/slave/recipes/chromium.expected/perf_test_profile_failure.json
+++ /dev/null
@@ -1,382 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
- ],
- "name": "taskkill"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
- "--spec",
- "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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/page_cycler': 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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_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",
- "[CACHE]\\git",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@HEAD",
- "--output_manifest"
- ],
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
- ]
- },
- {
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[START_DIR]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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\": \"[START_DIR]\\\\cipd\\\\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@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\cipd\\cipd",
- "ensure",
- "--root",
- "[CACHE]\\cipd\\goma",
- "--list",
- "infra/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/windows-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "runhooks"
- ],
- "cwd": "[START_DIR]\\src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[START_DIR]\\src\\testing\\scripts\\get_compile_targets.py",
- "--output",
- "/path/to/tmp/json",
- "--",
- "--build-config-fs",
- "Release_x64",
- "--paths",
- "{\"checkout\": \"[START_DIR]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
- "--properties",
- "{\"buildername\": \"Win Zenbook Perf (1)\", \"buildnumber\": 0, \"mastername\": \"chromium.perf\", \"perf-id\": \"win-zenbook\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
- ],
- "name": "get compile targets for scripts",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]\\src\\testing\\buildbot\\chromium.perf.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.perf.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [START_DIR]\\src\\testing\\buildbot\\chromium.perf.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[START_DIR]\\src\\out\\Release_x64"
- ],
- "name": "rmtree build directory",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\extract_build.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--target",
- "Release_x64",
- "--src-dir",
- "[START_DIR]\\src",
- "--slave-utils-gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
- "--build-url",
- "gs://chrome-perf/Win x64 Builder Builder/full-build-win32.zip",
- "--build_revision",
- "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "--master-name",
- "chromium.perf"
- ],
- "name": "extract build"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[START_DIR]\\src\\tools\\perf\\run_benchmark",
- "list",
- "--browser",
- "release_x64",
- "--json-output",
- "/path/to/tmp/json",
- "--num-shards",
- "5"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "List Perf Tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 2@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "allow_subannotations": true,
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\runtest.py",
- "--target",
- "Release_x64",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Win Zenbook Perf (1)\", \"buildnumber\": 0, \"mastername\": \"chromium.perf\", \"parent_buildername\": \"Win x64 Builder Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Win Zenbook Perf (1)\", \"buildnumber\": 0, \"mastername\": \"chromium.perf\", \"parent_buildername\": \"Win x64 Builder Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--annotate=graphing",
- "--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=blink_perf.all",
- "--perf-id=win-zenbook",
- "--test-type=blink_perf.all",
- "--step-name=blink_perf.all.release",
- "--chartjson-file",
- "/path/to/tmp/json",
- "--builder-name=Win Zenbook Perf (1)",
- "--slave-name=TestSlavename",
- "--build-number=0",
- "--run-python-script",
- "/path/to/run_benchmark",
- "--a=1",
- "-v",
- "--b=2"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "blink_perf.all.release",
- "~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
- "--target",
- "Release_x64"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
- },
- "name": "process_dumps"
- },
- {
- "name": "$result",
- "reason": "1 tests failed: ['dynamic_perf_tests']",
- "recipe_result": null,
- "status_code": 1
- }
-]
\ No newline at end of file
diff --git a/scripts/slave/recipes/chromium.py b/scripts/slave/recipes/chromium.py
index 21acf1c..2e3b5cf 100644
--- a/scripts/slave/recipes/chromium.py
+++ b/scripts/slave/recipes/chromium.py
@@ -1430,19 +1430,6 @@
)
yield (
- api.test('perf_test_profile_failure') +
- api.properties.generic(mastername='chromium.perf',
- buildername='Win Zenbook Perf (1)',
- parent_buildername='Win x64 Builder Builder',
- buildnumber=0) +
- api.platform('win', 64) +
- api.override_step_data(
- 'blink_perf.all.release',
- api.json.output([]),
- retcode=1)
- )
-
- yield (
api.test('dynamic_script_test_with_args') +
api.properties.generic(mastername='chromium.linux',
buildername='Linux Tests',
