Index: infra/recipes/chromium_trybot.expected/basic.json |
diff --git a/infra/recipes/chromium.expected/tester.json b/infra/recipes/chromium_trybot.expected/basic.json |
similarity index 73% |
copy from infra/recipes/chromium.expected/tester.json |
copy to infra/recipes/chromium_trybot.expected/basic.json |
index 58dc0e6a8d1eddd493e25661027b16df05472e9a..b5f4cffaec30bf049ac11354c2b1c18b7e14b8ba 100644 |
--- a/infra/recipes/chromium.expected/tester.json |
+++ b/infra/recipes/chromium_trybot.expected/basic.json |
@@ -4,7 +4,7 @@ |
"python", |
"-u", |
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
- "[BUILDER_CACHE]/Linux_remote_run_Tester", |
+ "[BUILDER_CACHE]/linux", |
"511" |
], |
"name": "makedirs checkout path", |
@@ -27,9 +27,9 @@ |
"-u", |
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
"--master", |
- "chromium.fyi", |
+ "tryserver.chromium.linux", |
"--builder", |
- "Linux remote_run Tester", |
+ "linux_chromium_rel_ng", |
"--slave", |
"TestSlavename", |
"--spec", |
@@ -40,14 +40,19 @@ |
"{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
"--git-cache-dir", |
"[GIT_CACHE]", |
+ "--issue", |
+ "12853011", |
+ "--patchset", |
+ "1", |
+ "--rietveld_server", |
+ "https://codereview.chromium.org", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
"src@HEAD", |
- "--force", |
"--output_manifest" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_remote_run_Tester", |
+ "cwd": "[BUILDER_CACHE]/linux", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -189,7 +194,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Linux_remote_run_Tester/src/tools/swarming_client/swarming.py", |
+ "[BUILDER_CACHE]/linux/src/tools/swarming_client/swarming.py", |
"--version" |
], |
"name": "swarming.py --version", |
@@ -205,29 +210,30 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_remote_run_Tester/src", |
+ "cwd": "[BUILDER_CACHE]/linux/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "archive_gpu_tests=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
- "name": "gclient runhooks" |
+ "name": "gclient runhooks (with patch)" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[BUILDER_CACHE]/Linux_remote_run_Tester/src/testing/scripts/get_compile_targets.py", |
+ "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py", |
"--output", |
"/path/to/tmp/json", |
"--", |
"--build-config-fs", |
"Release", |
+ "--use-src-side-runtest-py", |
"--paths", |
- "{\"checkout\": \"[BUILDER_CACHE]/Linux_remote_run_Tester/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
+ "{\"checkout\": \"[BUILDER_CACHE]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
"--properties", |
- "{\"buildername\": \"Linux remote_run Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}" |
+ "{\"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}" |
], |
"name": "get compile targets for scripts", |
"~followup_annotations": [ |
@@ -240,12 +246,12 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[BUILDER_CACHE]/Linux_remote_run_Tester/src/testing/buildbot/chromium.fyi.json", |
+ "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.gpu.json", |
"/path/to/tmp/json" |
], |
- "name": "read test spec (chromium.fyi.json)", |
+ "name": "read test spec (chromium.gpu.json)", |
"~followup_annotations": [ |
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/Linux_remote_run_Tester/src/testing/buildbot/chromium.fyi.json@@@", |
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.gpu.json@@@", |
"@@@STEP_LOG_LINE@json.output@{}@@@", |
"@@@STEP_LOG_END@json.output@@@" |
] |
@@ -254,85 +260,104 @@ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", |
- "--show-path", |
- "python", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json", |
+ "/path/to/tmp/json" |
], |
- "name": "cleanup_temp" |
+ "name": "read test spec (chromium.linux.json)", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json@@@", |
+ "@@@STEP_LOG_LINE@json.output@{}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
}, |
{ |
"cmd": [ |
- "python", |
- "-u", |
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
- "[BUILDER_CACHE]/Linux_remote_run_Tester/src/out/Release" |
+ "git", |
+ "diff", |
+ "--cached", |
+ "--name-only" |
], |
- "name": "rmtree build directory", |
+ "cwd": "[BUILDER_CACHE]/linux/src", |
+ "name": "git diff to analyze patch", |
+ "stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", |
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", |
- "@@@STEP_LOG_END@python.inline@@@" |
+ "@@@STEP_LOG_LINE@files@foo.cc@@@", |
+ "@@@STEP_LOG_END@files@@@", |
+ "@@@SET_BUILD_PROPERTY@subproject_tag@\"chromium\"@@@" |
] |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", |
- "--show-path", |
- "python", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py", |
- "--gsutil-py-path", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", |
- "--target", |
- "Release", |
- "--src-dir", |
- "[BUILDER_CACHE]/Linux_remote_run_Tester/src", |
- "--build-url", |
- "gs://chromium-fyi-archive/chromium.fyi/Linux remote_run Builder/full-build-linux.zip", |
- "--build_revision", |
- "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
- "--master-name", |
- "chromium.fyi", |
- "--build-number", |
- "571" |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[BUILDER_CACHE]/linux/src/testing/buildbot/trybot_analyze_config.json", |
+ "/path/to/tmp/json" |
], |
- "name": "extract build" |
+ "name": "read filter exclusion spec", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@", |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"chromium\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"ios\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
}, |
{ |
- "allow_subannotations": true, |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py", |
- "--target", |
- "Release", |
- "--xvfb", |
- "--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux remote_run Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": \"Linux remote_run Builder\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
- "--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux remote_run Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": \"Linux remote_run Builder\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
- "--annotate=gtest", |
- "--test-type=base_unittests", |
- "--step-name=base_unittests", |
- "--test-launcher-summary-output", |
- "/path/to/tmp/json", |
- "--builder-name=Linux remote_run Tester", |
- "--slave-name=TestSlavename", |
- "--build-number=571", |
- "base_unittests" |
+ "[BUILDER_CACHE]/linux/src/tools/mb/mb.py", |
+ "analyze", |
+ "-m", |
+ "tryserver.chromium.linux", |
+ "-b", |
+ "linux_chromium_rel_ng", |
+ "-v", |
+ "//out/Release", |
+ "{\"additional_compile_targets\": [\"chromium_swarm_tests\"], \"files\": [\"foo.cc\"], \"test_targets\": []}", |
+ "/path/to/tmp/json" |
], |
- "cwd": "[BUILDER_CACHE]/Linux_remote_run_Tester", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
- "name": "base_unittests" |
+ "name": "analyze", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@No compile necessary@@@", |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"compile_targets\": [], @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"status\": \"No dependency\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"test_targets\": []@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@", |
+ "@@@STEP_LOG_LINE@analyze_details@{@@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [@@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\"@@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ ], @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [], @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [], @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@", |
+ "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": []@@@", |
+ "@@@STEP_LOG_LINE@analyze_details@}@@@", |
+ "@@@STEP_LOG_END@analyze_details@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "import sys; sys.exit(0)" |
+ ], |
+ "name": "mark: before_tests" |
}, |
{ |
"name": "$result", |