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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json

Issue 313693003: Swarming: conditionally run tests on swarming in chromium_trybot recipe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 7 months 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_trybot.py ('K') | « scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_rel.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json
similarity index 62%
copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_rel.json
copy to scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json
index edcdf6d7cc51ca92b796214f74309282c78a7914..1a89ae42d3bfe68742c1d3c4332450ad4147229a 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_rel.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json
@@ -79,35 +79,18 @@
"name": "read test spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: testing/buildbot/chromium_trybot.json@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"platforms\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"mac\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"mojo_common_unittests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"args\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"--test-launcher-print-test-stdio=always\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"chromium_configs\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"chromium_chromeos\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"chromium_chromeos_clang\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"platforms\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"linux\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"sandbox_linux_unittests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"exclude_builders\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"tryserver.chromium:win_chromium_x64_rel\"@@@",
- "@@@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@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"base_unittests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": true, @@@",
+ "@@@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_END@json.output@@@"
]
},
@@ -121,11 +104,24 @@
"runhooks"
],
"env": {
- "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
+ "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=archive test_isolation_outdir=https://isolateserver.appspot.com use_goma=1"
},
"name": "gclient runhooks"
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "--version"
+ ],
+ "name": "swarming.py --version",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@0.4.8@@@"
+ ]
+ },
+ {
"abort_on_failure": false,
"can_fail_build": false,
"cmd": [
@@ -144,14 +140,33 @@
"[BUILD]/goma",
"--",
"all",
- "base_unittests",
- "mojo_common_unittests",
- "browser_tests",
+ "base_unittests_run",
+ "browser_tests_run",
"chrome"
],
"name": "compile (with patch)"
},
{
+ "abort_on_failure": true,
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/scripts/slave/recipe_modules/isolate/resources/find_isolated_tests.py",
+ "--build-dir",
+ "[SLAVE_BUILD]/src/out/Release",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "name": "find isolated tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_unittests\": \"[dummy hash for base_unittests]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"base_unittests\": \"[dummy hash for base_unittests]\"}@@@"
+ ]
+ },
+ {
"allow_subannotations": true,
"always_run": true,
"cmd": [
@@ -206,6 +221,49 @@
"name": "telemetry_perf_unittests"
},
{
+ "always_run": true,
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "200",
+ "--shards",
+ "1",
+ "--task-name",
+ "base_unittests (with patch)/Linux/[dummy hash for base_unittests]/linux_chromium_rel/571",
+ "--dimension",
+ "os",
+ "Linux",
+ "[dummy hash for base_unittests]",
+ "--",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "name": "[trigger] base_unittests (with patch)"
+ },
+ {
+ "always_run": true,
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
+ "browser_tests"
+ ],
+ "name": "[error] browser_tests (with patch)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@print '*.isolated file for target %s is missing' % sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
"can_fail_build": false,
"cmd": [
"python",
@@ -255,30 +313,21 @@
"name": "deps2submodules"
},
{
- "allow_subannotations": true,
- "always_run": true,
"can_fail_build": false,
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/runtest.py",
- "--target",
+ "[SLAVE_BUILD]/src/chrome/test/nacl_test_injection/buildbot_nacl_integration.py",
+ "--mode",
"Release",
- "--xvfb",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_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_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_rel",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--parallel",
- "base_unittests"
+ "--json_build_results_output_file",
+ "/path/to/tmp/json"
],
- "name": "base_unittests (with patch)"
+ "name": "nacl_integration (with patch)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@[]@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
},
{
"allow_subannotations": true,
@@ -287,66 +336,39 @@
"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\", \"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\", \"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",
+ "[BUILD]/scripts/slave/recipe_modules/swarming/resources/collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
"/path/to/tmp/json",
- "--builder-name=linux_chromium_rel",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--parallel",
- "mojo_common_unittests"
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--shards",
+ "1",
+ "--decorate",
+ "--print-status-updates",
+ "base_unittests (with patch)/Linux/[dummy hash for base_unittests]/linux_chromium_rel/571"
],
- "name": "mojo_common_unittests (with patch)"
+ "name": "[swarming] base_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_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_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_rel",
- "--slave-name=TestSlavename",
- "--build-number=571",
- "--parallel",
- "browser_tests"
- ],
- "name": "browser_tests (with patch)"
- },
- {
- "can_fail_build": false,
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/chrome/test/nacl_test_injection/buildbot_nacl_integration.py",
- "--mode",
- "Release",
- "--json_build_results_output_file",
- "/path/to/tmp/json"
+ "\nimport sys\nprint 'TEST RESULTS WERE INVALID'\nsys.exit(1)\n"
],
- "name": "nacl_integration (with patch)",
+ "name": "browser_tests",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[]@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@print 'TEST RESULTS WERE INVALID'@@@",
+ "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
]
}
]
« scripts/slave/recipes/chromium_trybot.py ('K') | « scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698