scripts/slave/recipes/blink_trybot.expected/non_cq_tryjob.json - Issue 688473003: Added swarming step to the Blink trybots

Unified Diff: scripts/slave/recipes/blink_trybot.expected/non_cq_tryjob.json

Issue 688473003: Added swarming step to the Blink trybots (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Addressed comments Created 6 years, 2 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/blink_trybot.py ('K') | « scripts/slave/recipes/blink_trybot.expected/minimal_pass_continues.json ('k') | scripts/slave/recipes/blink_trybot.expected/preamble_test_failure.json » ('j') | scripts/slave/recipes/chromium_trybot.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/blink_trybot.expected/non_cq_tryjob.json

diff --git a/scripts/slave/recipes/blink_trybot.expected/full_tryserver_blink_win_blink_rel_pass.json b/scripts/slave/recipes/blink_trybot.expected/non_cq_tryjob.json

similarity index 70%

copy from scripts/slave/recipes/blink_trybot.expected/full_tryserver_blink_win_blink_rel_pass.json

copy to scripts/slave/recipes/blink_trybot.expected/non_cq_tryjob.json

index 99409bb07d0d844d1116dc0bf8b934147767e505..9ee43255884101f7d39534acc6f1e0bb1d4506cf 100644

--- a/scripts/slave/recipes/blink_trybot.expected/full_tryserver_blink_win_blink_rel_pass.json

+++ b/scripts/slave/recipes/blink_trybot.expected/non_cq_tryjob.json

@@ -3,7 +3,7 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\bot_update.py",

M-A Ruel 2014/10/29 14:14:27 There's a bug in the recipe code that uses OS's jo

Sergiy Byelozyorov 2014/10/29 14:43:45 This file was created in this patchset since I've

+ "[BUILD]/scripts/slave/bot_update.py",

"--master",

"tryserver.blink",

"--builder",

@@ -85,11 +85,24 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS]\\gclient.py",

+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",

+ "--version"

+ ],

+ "name": "swarming.py --version",

+ "stdout": "/path/to/tmp/",

+ "~followup_annotations": [

+ "@@@STEP_TEXT@0.4.10@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[DEPOT_TOOLS]/gclient.py",

"runhooks"

"env": {

- "GYP_DEFINES": "chromium_win_pch=0 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 use_goma=1"

+ "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=archive test_isolation_outdir=https://isolateserver.appspot.com use_goma=1"

"name": "gclient runhooks"

@@ -97,17 +110,28 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\compile.py",

+ "[BUILD]/scripts/slave/recipe_modules/isolate/resources/find_isolated_tests.py",

+ "--build-dir",

+ "[SLAVE_BUILD]/src/out/Release",

+ "--clean-isolated-files"

+ ],

+ "name": "clean isolated files"

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/compile.py",

"--target",

"Release",

"--src-dir",

- "[SLAVE_BUILD]\\src",

+ "[SLAVE_BUILD]/src",

"--build-tool",

"ninja",

"--compiler",

"goma",

"--goma-dir",

- "[BUILD]\\goma",

+ "[BUILD]/goma",

"--",

"blink_tests"

@@ -117,9 +141,29 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\chromium\\lint_test_files_wrapper.py",

+ "[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@ \"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@@@",

+ "@@@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",

+ "[BUILD]/scripts/slave/chromium/lint_test_files_wrapper.py",

"--build-dir",

- "[SLAVE_BUILD]\\src\\out",

+ "[SLAVE_BUILD]/src/out",

"--target",

"Release"

@@ -129,9 +173,9 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\chromium\\test_webkitpy_wrapper.py",

+ "[BUILD]/scripts/slave/chromium/test_webkitpy_wrapper.py",

"--build-dir",

- "[SLAVE_BUILD]\\src\\out",

+ "[SLAVE_BUILD]/src/out",

"--target",

"Release"

@@ -141,17 +185,18 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Release",

+ "--xvfb",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"win_blink_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"win_blink_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"someone@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"--builder-name=win_blink_rel",

"--slave-name=TestSlavename",

"--build-number=571",

- "webkit_unit_tests.exe"

+ "webkit_unit_tests"

"name": "webkit_unit_tests"

@@ -159,17 +204,18 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Release",

+ "--no-xvfb",

"--factory-properties",

"--build-properties",

"--builder-name=win_blink_rel",

"--slave-name=TestSlavename",

"--build-number=571",

- "blink_platform_unittests.exe"

+ "blink_platform_unittests"

"name": "blink_platform_unittests"

@@ -177,17 +223,18 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Release",

+ "--no-xvfb",

"--factory-properties",

"--build-properties",

"--builder-name=win_blink_rel",

"--slave-name=TestSlavename",

"--build-number=571",

- "blink_heap_unittests.exe"

+ "blink_heap_unittests"

"name": "blink_heap_unittests"

@@ -195,17 +242,18 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Release",

+ "--no-xvfb",

"--factory-properties",

"--build-properties",

"--builder-name=win_blink_rel",

"--slave-name=TestSlavename",

"--build-number=571",

- "wtf_unittests.exe"

+ "wtf_unittests"

"name": "wtf_unittests"

@@ -213,24 +261,25 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Release",

+ "--no-xvfb",

"--factory-properties",

"--build-properties",

"--builder-name=win_blink_rel",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[BUILD]\\scripts\\slave\\chromium\\layout_test_wrapper.py",

+ "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",

"--target",

"Release",

"-o",

- "[SLAVE_BUILD]\\layout-test-results",

+ "[SLAVE_BUILD]/layout-test-results",

"--build-dir",

- "[SLAVE_BUILD]\\src\\out",

+ "[SLAVE_BUILD]/src/out",

"--json-test-results",

"/path/to/tmp/json"

@@ -243,11 +292,11 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\chromium\\archive_layout_test_results.py",

+ "[BUILD]/scripts/slave/chromium/archive_layout_test_results.py",

"--results-dir",

- "[SLAVE_BUILD]\\layout-test-results",

+ "[SLAVE_BUILD]/layout-test-results",

"--build-dir",

- "[SLAVE_BUILD]\\src\\out",

+ "[SLAVE_BUILD]/src/out",

"--build-number",

"571",

"--builder-name",

@@ -255,9 +304,9 @@

"--gs-bucket",

"gs://chromium-layout-test-archives",

"--factory-properties",

"--build-properties",

"name": "archive_webkit_tests_results",

"~followup_annotations": [