Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_rel_swarming.json |
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_chromeos_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_rel_swarming.json |
similarity index 84% |
copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_chromeos_rel.json |
copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_rel_swarming.json |
index 77f6d9177a7df06449926b8f252cf0afd37c0337..f3f2ffd1ef0fdc502918cff1267857a7145484fe 100644 |
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_chromeos_rel.json |
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_rel_swarming.json |
@@ -8,7 +8,7 @@ |
"--master", |
"tryserver.chromium", |
"--builder", |
- "linux_chromium_chromeos_rel", |
+ "linux_chromium_rel_swarming", |
"--slave", |
"TestSlavename", |
"--spec", |
@@ -182,7 +182,7 @@ |
"runhooks" |
], |
"env": { |
- "GYP_DEFINES": "chromeos=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1" |
+ "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1" |
}, |
"name": "gclient runhooks" |
}, |
@@ -207,13 +207,66 @@ |
"all", |
"base_unittests", |
"mojo_common_unittests", |
- "sandbox_linux_unittests", |
"browser_tests", |
"chrome" |
], |
"name": "compile (with patch)" |
}, |
{ |
+ "allow_subannotations": true, |
+ "always_run": true, |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[BUILD]/scripts/slave/runtest.py", |
+ "--target", |
+ "Release", |
+ "--xvfb", |
+ "--factory-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--build-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--annotate=gtest", |
+ "--test-type=telemetry_unittests", |
+ "--builder-name=linux_chromium_rel_swarming", |
+ "--slave-name=TestSlavename", |
+ "--build-number=571", |
+ "--run-python-script", |
+ "[SLAVE_BUILD]/src/tools/telemetry/run_tests", |
+ "--browser=release" |
+ ], |
+ "name": "telemetry_unittests", |
+ "seed_steps": [ |
+ "telemetry_unittests", |
+ "telemetry_perf_unittests" |
+ ] |
+ }, |
+ { |
+ "allow_subannotations": true, |
+ "always_run": true, |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[BUILD]/scripts/slave/runtest.py", |
+ "--target", |
+ "Release", |
+ "--xvfb", |
+ "--factory-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--build-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--annotate=gtest", |
+ "--test-type=telemetry_perf_unittests", |
+ "--builder-name=linux_chromium_rel_swarming", |
+ "--slave-name=TestSlavename", |
+ "--build-number=571", |
+ "--run-python-script", |
+ "[SLAVE_BUILD]/src/tools/perf/run_tests", |
+ "--browser=release" |
+ ], |
+ "name": "telemetry_perf_unittests" |
+ }, |
+ { |
"can_fail_build": false, |
"cmd": [ |
"python", |
@@ -274,13 +327,13 @@ |
"Release", |
"--xvfb", |
"--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--annotate=gtest", |
"--test-launcher-summary-output", |
"/path/to/tmp/json", |
- "--builder-name=linux_chromium_chromeos_rel", |
+ "--builder-name=linux_chromium_rel_swarming", |
"--slave-name=TestSlavename", |
"--build-number=571", |
"--parallel", |
@@ -300,13 +353,13 @@ |
"Release", |
"--xvfb", |
"--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--annotate=gtest", |
"--test-launcher-summary-output", |
"/path/to/tmp/json", |
- "--builder-name=linux_chromium_chromeos_rel", |
+ "--builder-name=linux_chromium_rel_swarming", |
"--slave-name=TestSlavename", |
"--build-number=571", |
"--parallel", |
@@ -326,40 +379,13 @@ |
"Release", |
"--xvfb", |
"--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
- "--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
- "--annotate=gtest", |
- "--test-launcher-summary-output", |
- "/path/to/tmp/json", |
- "--builder-name=linux_chromium_chromeos_rel", |
- "--slave-name=TestSlavename", |
- "--build-number=571", |
- "--parallel", |
- "sandbox_linux_unittests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "sandbox_linux_unittests (with patch)" |
- }, |
- { |
- "allow_subannotations": true, |
- "always_run": true, |
- "can_fail_build": false, |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/runtest.py", |
- "--target", |
- "Release", |
- "--xvfb", |
- "--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--annotate=gtest", |
"--test-launcher-summary-output", |
"/path/to/tmp/json", |
- "--builder-name=linux_chromium_chromeos_rel", |
+ "--builder-name=linux_chromium_rel_swarming", |
"--slave-name=TestSlavename", |
"--build-number=571", |
"--parallel", |