Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Mac_Air_10_11_Perf.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Retina_Release.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Mac_Air_10_11_Perf.json |
similarity index 86% |
copy from scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Retina_Release.json |
copy to scripts/slave/recipes/chromium.expected/full_chromium_perf_Mac_Air_10_11_Perf.json |
index 2673a25c2ce3b256af154dfd3732589ccb4da501..b3c2181189084a2e3a2b6b21bb7c325f88c56bbd 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_Retina_Release.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Mac_Air_10_11_Perf.json |
@@ -4,7 +4,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]/Mac_Retina_Release", |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf", |
"511" |
], |
"name": "makedirs checkout path", |
@@ -27,7 +27,7 @@ |
"-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'}]", |
+ "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", |
@@ -40,7 +40,7 @@ |
"src@1111111", |
"--output_manifest" |
], |
- "cwd": "[BUILDER_CACHE]/Mac_Retina_Release", |
+ "cwd": "[BUILDER_CACHE]/Mac_Air_10_11_Perf", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -182,7 +182,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Mac_Retina_Release/src/tools/swarming_client/swarming.py", |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src/tools/swarming_client/swarming.py", |
"--version" |
], |
"name": "swarming.py --version", |
@@ -198,11 +198,12 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[BUILDER_CACHE]/Mac_Retina_Release/src", |
+ "cwd": "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src", |
"env": { |
"FORCE_MAC_TOOLCHAIN": "1", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
- "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1", |
+ "GYP_CHROMIUM_NO_ACTION": "1", |
+ "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=static_library 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" |
@@ -211,17 +212,16 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Mac_Retina_Release/src/testing/scripts/get_compile_targets.py", |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src/testing/scripts/get_compile_targets.py", |
"--output", |
"/path/to/tmp/json", |
"--", |
"--build-config-fs", |
"Release", |
- "--use-src-side-runtest-py", |
"--paths", |
- "{\"checkout\": \"[BUILDER_CACHE]/Mac_Retina_Release/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
+ "{\"checkout\": \"[BUILDER_CACHE]/Mac_Air_10_11_Perf/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
"--properties", |
- "{\"buildername\": \"Mac Retina Release\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}" |
+ "{\"buildername\": \"Mac Air 10.11 Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-mac11-air\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}" |
], |
"name": "get compile targets for scripts", |
"~followup_annotations": [ |
@@ -234,14 +234,14 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[BUILDER_CACHE]/Mac_Retina_Release/src/testing/buildbot/chromium.gpu.fyi.json", |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src/testing/buildbot/chromium.perf.json", |
"/path/to/tmp/json" |
], |
- "name": "read test spec (chromium.gpu.fyi.json)", |
+ "name": "read test spec (chromium.perf.json)", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/Mac_Retina_Release/src/testing/buildbot/chromium.gpu.fyi.json@@@", |
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/Mac_Air_10_11_Perf/src/testing/buildbot/chromium.perf.json@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"Mac Retina Release\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"Mac Air 10.11 Perf\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@", |
"@@@STEP_LOG_LINE@json.output@ {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@", |
@@ -271,7 +271,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]/Mac_Retina_Release/src/out/Release" |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src/out/Release" |
], |
"name": "rmtree build directory", |
"~followup_annotations": [ |
@@ -298,11 +298,11 @@ |
"--target", |
"Release", |
"--src-dir", |
- "[BUILDER_CACHE]/Mac_Retina_Release/src", |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src", |
"--build-archive-url", |
"gs://test-domain/test-archive.zip", |
"--master-name", |
- "chromium.gpu.fyi", |
+ "chromium.perf", |
"--build-number", |
"571" |
], |
@@ -314,11 +314,11 @@ |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py", |
"--build-dir", |
- "[BUILDER_CACHE]/Mac_Retina_Release/src/out/Release", |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src/out/Release", |
"--output-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[BUILDER_CACHE]/Mac_Retina_Release", |
+ "cwd": "[BUILDER_CACHE]/Mac_Air_10_11_Perf", |
"env": { |
"FORCE_MAC_TOOLCHAIN": "1", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
@@ -337,7 +337,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Mac_Retina_Release/src/tools/swarming_client/swarming.py", |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src/tools/swarming_client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -348,7 +348,7 @@ |
"--shards", |
"1", |
"--task-name", |
- "browser_tests/Mac-10.9/ffffffffff/Mac Retina Release/571", |
+ "browser_tests/Mac-10.9/ffffffffff/Mac Air 10.11 Perf/571", |
"--dump-json", |
"/path/to/tmp/json", |
"--expiration", |
@@ -370,13 +370,13 @@ |
"pool", |
"Chrome", |
"--tag", |
- "buildername:Mac Retina Release", |
+ "buildername:Mac Air 10.11 Perf", |
"--tag", |
"buildnumber:571", |
"--tag", |
"data:ffffffffffffffffffffffffffffffffffffffff", |
"--tag", |
- "master:chromium.gpu.fyi", |
+ "master:chromium.perf", |
"--tag", |
"name:browser_tests", |
"--tag", |
@@ -396,7 +396,7 @@ |
"--", |
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json" |
], |
- "cwd": "[BUILDER_CACHE]/Mac_Retina_Release", |
+ "cwd": "[BUILDER_CACHE]/Mac_Air_10_11_Perf", |
"env": { |
"FORCE_MAC_TOOLCHAIN": "1", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
@@ -404,9 +404,9 @@ |
"name": "[trigger] browser_tests on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Mac-10.9/ffffffffff/Mac Retina Release/571\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Mac-10.9/ffffffffff/Mac Air 10.11 Perf/571\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Mac-10.9/ffffffffff/Mac Retina Release/571\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Mac-10.9/ffffffffff/Mac Air 10.11 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\"@@@", |
@@ -426,7 +426,7 @@ |
"python", |
"RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py", |
"--swarming-client-dir", |
- "[BUILDER_CACHE]/Mac_Retina_Release/src/tools/swarming_client", |
+ "[BUILDER_CACHE]/Mac_Air_10_11_Perf/src/tools/swarming_client", |
"--temp-root-dir", |
"[TMP_BASE]", |
"--merged-test-output", |
@@ -438,9 +438,9 @@ |
"--decorate", |
"--print-status-updates", |
"--json", |
- "{\"base_task_name\": \"browser_tests/Mac-10.9/ffffffffff/Mac Retina Release/571\", \"tasks\": {\"browser_tests/Mac-10.9/ffffffffff/Mac Retina Release/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}" |
+ "{\"base_task_name\": \"browser_tests/Mac-10.9/ffffffffff/Mac Air 10.11 Perf/571\", \"tasks\": {\"browser_tests/Mac-10.9/ffffffffff/Mac Air 10.11 Perf/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}" |
], |
- "cwd": "[BUILDER_CACHE]/Mac_Retina_Release", |
+ "cwd": "[BUILDER_CACHE]/Mac_Air_10_11_Perf", |
"env": { |
"FORCE_MAC_TOOLCHAIN": "1", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
@@ -458,9 +458,9 @@ |
"--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.gpu.fyi", |
+ "chromium.perf", |
"--builder-name", |
- "Mac Retina Release", |
+ "Mac Air 10.11 Perf", |
"--build-number", |
"571", |
"--test-type", |
@@ -470,7 +470,7 @@ |
"--chrome-revision", |
"170242" |
], |
- "cwd": "[BUILDER_CACHE]/Mac_Retina_Release", |
+ "cwd": "[BUILDER_CACHE]/Mac_Air_10_11_Perf", |
"env": { |
"FORCE_MAC_TOOLCHAIN": "1", |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |