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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json

Issue 1527123002: Support swarming dimensions in src-side JSON buildbot files. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressed review feedback from maruel. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« scripts/slave/recipes/chromium.py ('K') | « scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_linux_gpu.json ('k') | scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_gpu.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json
similarity index 69%
copy from scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test.json
copy to scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json
index cc37e4d75b11071eb36e59cdb92cda431037072e..b1aa016932efeeb9c3a0249fb52617e14c067b8d 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json
@@ -5,9 +5,9 @@
"-u",
"[BUILD]/scripts/slave/bot_update.py",
"--master",
- "chromium.linux",
+ "chromium.mac",
"--builder",
- "Linux Tests",
+ "Mac10.9 Tests",
"--slave",
"TestSlavename",
"--spec",
@@ -111,8 +111,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"
+ "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"
},
"name": "gclient runhooks"
},
@@ -121,21 +120,33 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"Linux Tests\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"isolated_scripts\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"isolate_name\": \"telemetry_gpu_unittests\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"name\": \"telemetry_gpu_unittests\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dimension_sets\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gpu\": \"8086:0a2e\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"hidpi\": \"0\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac-10.10\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gpu\": \"10de:0fe9\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"hidpi\": \"1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac-10.9\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -158,7 +169,7 @@
"--paths",
"{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
"--properties",
- "{\"buildername\": \"Linux Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"Mac10.9 Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
],
"cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
@@ -203,11 +214,11 @@
"--target",
"Release",
"--build-url",
- "gs://chromium-linux-archive/chromium.linux/Linux Builder/full-build-linux.zip",
+ "gs://chromium-mac-archive/chromium.mac/Mac Builder/full-build-mac.zip",
"--build_revision",
"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--master-name",
- "chromium.linux",
+ "chromium.mac",
"--build-number",
"571"
],
@@ -250,7 +261,7 @@
"--shards",
"1",
"--task-name",
- "telemetry_gpu_unittests/Ubuntu-12.04/eeeeeeeeee/Linux Tests/571",
+ "telemetry_gpu_unittests on Intel GPU on Mac/Mac-10.10/eeeeeeeeee/Mac10.9 Tests/571",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -264,25 +275,28 @@
"x86-64",
"--dimension",
"gpu",
- "none",
+ "8086:0a2e",
+ "--dimension",
+ "hidpi",
+ "0",
"--dimension",
"os",
- "Ubuntu-12.04",
+ "Mac-10.10",
"--dimension",
"pool",
"Chrome",
"--tag",
- "buildername:Linux Tests",
+ "buildername:Mac10.9 Tests",
"--tag",
"buildnumber:571",
"--tag",
"data:eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
"--tag",
- "master:chromium.linux",
+ "master:chromium.mac",
"--tag",
- "name:telemetry_gpu_unittests",
+ "name:telemetry_gpu_unittests on Intel GPU on Mac",
"--tag",
- "os:Ubuntu-12.04",
+ "os:Mac-10.10",
"--tag",
"project:chromium",
"--tag",
@@ -290,18 +304,18 @@
"--tag",
"purpose:post-commit",
"--tag",
- "stepname:telemetry_gpu_unittests",
+ "stepname:telemetry_gpu_unittests on Intel GPU on Mac on Mac-10.10",
"eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
"--",
"--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "[trigger] telemetry_gpu_unittests",
+ "name": "[trigger] telemetry_gpu_unittests on Intel GPU on Mac on Mac-10.10",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"telemetry_gpu_unittests/Ubuntu-12.04/eeeeeeeeee/Linux Tests/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"telemetry_gpu_unittests on Intel GPU on Mac/Mac-10.10/eeeeeeeeee/Mac10.9 Tests/571\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests/Ubuntu-12.04/eeeeeeeeee/Linux Tests/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests on Intel GPU on Mac/Mac-10.10/eeeeeeeeee/Mac10.9 Tests/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\"@@@",
@@ -317,6 +331,112 @@
"python",
"-u",
"[SLAVE_BUILD]/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",
+ "telemetry_gpu_unittests on NVIDIA GPU on Mac Retina/Mac-10.9/eeeeeeeeee/Mac10.9 Tests/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "10de:0fe9",
+ "--dimension",
+ "hidpi",
+ "1",
+ "--dimension",
+ "os",
+ "Mac-10.9",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:Mac10.9 Tests",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+ "--tag",
+ "master:chromium.mac",
+ "--tag",
+ "name:telemetry_gpu_unittests on NVIDIA GPU on Mac Retina",
+ "--tag",
+ "os:Mac-10.9",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "stepname:telemetry_gpu_unittests on NVIDIA GPU on Mac Retina on Mac-10.9",
+ "eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+ "--",
+ "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "[trigger] telemetry_gpu_unittests on NVIDIA GPU on Mac Retina on Mac-10.9",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"telemetry_gpu_unittests on NVIDIA GPU on Mac Retina/Mac-10.9/eeeeeeeeee/Mac10.9 Tests/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests on NVIDIA GPU on Mac Retina/Mac-10.9/eeeeeeeeee/Mac10.9 Tests/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@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--shards",
+ "1",
+ "telemetry_gpu_unittests on Intel GPU on Mac/Mac-10.10/eeeeeeeeee/Mac10.9 Tests/571",
+ "--task-output-dir",
+ "/path/to/tmp/"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "telemetry_gpu_unittests on Intel GPU on Mac on Mac-10.10",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@outdir_json@{@@@",
+ "@@@STEP_LOG_LINE@outdir_json@ \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+ "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
+ "@@@STEP_LOG_LINE@outdir_json@}@@@",
+ "@@@STEP_LOG_END@outdir_json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -324,12 +444,12 @@
"--print-status-updates",
"--shards",
"1",
- "telemetry_gpu_unittests/Ubuntu-12.04/eeeeeeeeee/Linux Tests/571",
+ "telemetry_gpu_unittests on NVIDIA GPU on Mac Retina/Mac-10.9/eeeeeeeeee/Mac10.9 Tests/571",
"--task-output-dir",
"/path/to/tmp/"
],
"cwd": "[SLAVE_BUILD]",
- "name": "telemetry_gpu_unittests",
+ "name": "telemetry_gpu_unittests on NVIDIA GPU on Mac Retina on Mac-10.9",
"~followup_annotations": [
"@@@STEP_LOG_LINE@outdir_json@{@@@",
"@@@STEP_LOG_LINE@outdir_json@ \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
« scripts/slave/recipes/chromium.py ('K') | « scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_linux_gpu.json ('k') | scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_gpu.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698