scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_chromium_rel_swarming.json - Issue 313693003: Swarming: conditionally run tests on swarming in chromium_trybot recipe.

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_chromium_rel_swarming.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: rebase Created 6 years, 6 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

« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_chromium_rel_swarming.json ('k') | scripts/slave/recipes/chromium_trybot.expected/swarming_basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_chromium_rel_swarming.json

diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_trusty_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_chromium_rel_swarming.json

similarity index 75%

copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_trusty_rel.json

copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_chromium_rel_swarming.json

index a9e6a7449f8b24f11a2fbbd6197d0afa039db27d..f970e540ec79babc2273ae606e697c19d98cc770 100644

--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_trusty_rel.json

+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_chromium_rel_swarming.json

@@ -4,11 +4,11 @@

"cmd": [

"python",

"-u",

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

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

"--master",

"tryserver.chromium",

"--builder",

- "linux_chromium_trusty_rel",

+ "win_chromium_rel_swarming",

"--slave",

"TestSlavename",

"--spec",

@@ -73,12 +73,12 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[SLAVE_BUILD]/src/testing/buildbot/chromium_trybot.json",

+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium_trybot.json",

"/path/to/tmp/json"

"name": "read test spec",

"~followup_annotations": [

- "@@@STEP_TEXT@path: testing/buildbot/chromium_trybot.json@@@",

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

@@ -117,11 +117,11 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS]/gclient.py",

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

"runhooks"

"env": {

- "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"

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

"name": "gclient runhooks"

@@ -131,21 +131,19 @@

"cmd": [

"python",

"-u",

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

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

"--",

- "all",

"base_unittests",

- "mojo_common_unittests",

"browser_tests",

"chrome"

@@ -157,21 +155,20 @@

"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\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_trusty_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\": \"win_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",

"--annotate=gtest",

"--test-type=telemetry_unittests",

- "--builder-name=linux_chromium_trusty_rel",

+ "--builder-name=win_chromium_rel_swarming",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[SLAVE_BUILD]/src/tools/telemetry/run_tests",

+ "[SLAVE_BUILD]\\src\\tools\\telemetry\\run_tests",

"--browser=release"

"name": "telemetry_unittests",

@@ -186,21 +183,20 @@

"cmd": [

"python",

"-u",

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

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

"--target",

"Release",

- "--xvfb",

"--factory-properties",

"--build-properties",

"--annotate=gtest",

"--test-type=telemetry_perf_unittests",

- "--builder-name=linux_chromium_trusty_rel",

+ "--builder-name=win_chromium_rel_swarming",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[SLAVE_BUILD]/src/tools/perf/run_tests",

+ "[SLAVE_BUILD]\\src\\tools\\perf\\run_tests",

"--browser=release"

"name": "telemetry_perf_unittests"

@@ -211,7 +207,7 @@

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/buildtools/checkdeps/checkdeps.py",

+ "[SLAVE_BUILD]\\src\\buildtools\\checkdeps\\checkdeps.py",

"--json",

"/path/to/tmp/json"

@@ -222,51 +218,15 @@

]

{

- "always_run": true,

"can_fail_build": false,

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/tools/checkperms/checkperms.py",

- "--root",

- "[SLAVE_BUILD]/src",

- "--json",

- "/path/to/tmp/json"

- ],

- "name": "checkperms (with patch)",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@json.output@[]@@@",

- "@@@STEP_LOG_END@json.output@@@"

- ]

- },

- {

- "always_run": true,

- "can_fail_build": false,

- "cmd": [

- "python",

- "-u",

- "[SLAVE_BUILD]/src/tools/checklicenses/checklicenses.py",

- "--root",

- "[SLAVE_BUILD]/src",

- "--json",

- "/path/to/tmp/json"

- ],

- "name": "checklicenses (with patch)",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@json.output@[]@@@",

- "@@@STEP_LOG_END@json.output@@@"

- ]

- },

- {

- "can_fail_build": false,

- "cmd": [

- "python",

- "-u",

- "[SLAVE_BUILD]/src/tools/deps2git/deps2git.py",

+ "[SLAVE_BUILD]\\src\\tools\\deps2git\\deps2git.py",

"-d",

- "[SLAVE_BUILD]/src/DEPS",

+ "[SLAVE_BUILD]\\src\\DEPS",

"-o",

- "[SLAVE_BUILD]/src/.DEPS.git",

+ "[SLAVE_BUILD]\\src\\.DEPS.git",

"--verify",

"--json",

"/path/to/tmp/json"

@@ -285,9 +245,9 @@

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/tools/deps2git/deps2submodules.py",

+ "[SLAVE_BUILD]\\src\\tools\\deps2git\\deps2submodules.py",

"--gitless",

- "[SLAVE_BUILD]/src/.DEPS.git"

+ "[SLAVE_BUILD]\\src\\.DEPS.git"

"name": "deps2submodules"

@@ -298,22 +258,21 @@

"cmd": [

"python",

"-u",

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

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

"--target",

"Release",

- "--xvfb",

"--factory-properties",

"--build-properties",

"--annotate=gtest",

"--test-launcher-summary-output",

"/path/to/tmp/json",

- "--builder-name=linux_chromium_trusty_rel",

+ "--builder-name=win_chromium_rel_swarming",

"--slave-name=TestSlavename",

"--build-number=571",

"--parallel",

- "base_unittests"

+ "base_unittests.exe"

"name": "base_unittests (with patch)"

@@ -324,48 +283,21 @@

"cmd": [

"python",

"-u",

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

- "--target",

- "Release",

- "--xvfb",

- "--factory-properties",

- "--build-properties",

- "--annotate=gtest",

- "--test-launcher-summary-output",

- "/path/to/tmp/json",

- "--builder-name=linux_chromium_trusty_rel",

- "--slave-name=TestSlavename",

- "--build-number=571",

- "--parallel",

- "mojo_common_unittests"

- ],

- "name": "mojo_common_unittests (with patch)"

- },

- {

- "allow_subannotations": true,

- "always_run": true,

- "can_fail_build": false,

- "cmd": [

- "python",

- "-u",

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

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

"--target",

"Release",

- "--xvfb",

"--factory-properties",

"--build-properties",

"--annotate=gtest",

"--test-launcher-summary-output",

"/path/to/tmp/json",

- "--builder-name=linux_chromium_trusty_rel",

+ "--builder-name=win_chromium_rel_swarming",

"--slave-name=TestSlavename",

"--build-number=571",

"--parallel",

- "browser_tests"

+ "browser_tests.exe"

"name": "browser_tests (with patch)"

@@ -374,7 +306,7 @@

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/chrome/test/nacl_test_injection/buildbot_nacl_integration.py",

+ "[SLAVE_BUILD]\\src\\chrome\\test\\nacl_test_injection\\buildbot_nacl_integration.py",

"--mode",

"Release",

"--json_build_results_output_file",