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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json

Issue 2226283002: webrtc: prepare for running under remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 4 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/webrtc/standalone.expected/tryserver_webrtc_linux_rel.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_tsan2.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json
index 2c64999a6848268650b05a6bb176cdcb7573cda6..caed7d5378847d08cc1df98f4f781bf7c2f3cc8a 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_swarming.json
@@ -3,6 +3,28 @@
"cmd": [
"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_swarming",
+ "511"
+ ],
+ "name": "makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"tryserver.webrtc",
@@ -30,6 +52,7 @@
"src@12345",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/linux_swarming",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -66,7 +89,7 @@
"python",
"-u",
"RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
- "[SLAVE_BUILD]/src/out"
+ "[BUILDER_CACHE]/linux_swarming/src/out"
],
"name": "clean test output files"
},
@@ -87,7 +110,7 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Debug",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug",
"--clean-isolated-files"
],
"name": "clean isolated files"
@@ -153,7 +176,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/linux_swarming/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' rtc_use_h264=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
@@ -165,7 +188,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"--version"
],
"name": "swarming.py --version",
@@ -189,9 +212,11 @@
"--target",
"Debug",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/linux_swarming/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma",
"--goma-jsonstatus",
@@ -220,9 +245,9 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Debug",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[BUILDER_CACHE]/linux_swarming/src"
],
"cwd": "[SLAVE_BUILD]",
"name": "remove_build_metadata"
@@ -232,27 +257,27 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
- "[SLAVE_BUILD]/src/out/Debug/audio_decoder_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/common_audio_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/common_video_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/modules_tests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/modules_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/peerconnection_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/rtc_media_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/rtc_pc_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/rtc_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/system_wrappers_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/test_support_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/tools_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/video_engine_tests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/voice_engine_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Debug/xmllite_xmpp_unittests.isolated.gen.json"
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/audio_decoder_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/common_audio_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/common_video_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/modules_tests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/modules_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/peerconnection_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/rtc_media_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/rtc_pc_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/rtc_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/system_wrappers_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/test_support_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/tools_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/video_engine_tests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/voice_engine_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/linux_swarming/src/out/Debug/xmllite_xmpp_unittests.isolated.gen.json"
],
"name": "isolate tests",
"~followup_annotations": [
@@ -281,7 +306,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -360,7 +385,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -439,7 +464,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -518,7 +543,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -597,7 +622,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -676,7 +701,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -755,7 +780,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -834,7 +859,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -913,7 +938,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -992,7 +1017,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1071,7 +1096,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1150,7 +1175,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1229,7 +1254,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1308,7 +1333,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1387,7 +1412,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1472,9 +1497,9 @@
"Debug",
"--xvfb",
"--factory-properties",
- "{\"BUILD_CONFIG\": \"Debug\", \"buildername\": \"linux_swarming\", \"buildnumber\": 1337, \"issue\": 666666, \"mastername\": \"tryserver.webrtc\", \"patchset\": 1, \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"rietveld\": \"https://fake.rietveld.url\", \"slavename\": \"slavename\"}",
+ "{\"BUILD_CONFIG\": \"Debug\", \"buildername\": \"linux_swarming\", \"buildnumber\": 1337, \"issue\": 666666, \"mastername\": \"tryserver.webrtc\", \"patchset\": 1, \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"rietveld\": \"https://fake.rietveld.url\", \"slavename\": \"slavename\"}",
"--build-properties",
- "{\"BUILD_CONFIG\": \"Debug\", \"buildername\": \"linux_swarming\", \"buildnumber\": 1337, \"issue\": 666666, \"mastername\": \"tryserver.webrtc\", \"patchset\": 1, \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"rietveld\": \"https://fake.rietveld.url\", \"slavename\": \"slavename\"}",
+ "{\"BUILD_CONFIG\": \"Debug\", \"buildername\": \"linux_swarming\", \"buildnumber\": 1337, \"issue\": 666666, \"mastername\": \"tryserver.webrtc\", \"patchset\": 1, \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"rietveld\": \"https://fake.rietveld.url\", \"slavename\": \"slavename\"}",
"--annotate=gtest",
"--test-type=webrtc_nonparallel_tests",
"--step-name=webrtc_nonparallel_tests",
@@ -1490,7 +1515,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1549,7 +1574,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1608,7 +1633,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1667,7 +1692,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1726,7 +1751,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1785,7 +1810,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1844,7 +1869,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1903,7 +1928,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1962,7 +1987,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2021,7 +2046,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2080,7 +2105,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2139,7 +2164,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2198,7 +2223,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2257,7 +2282,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2316,7 +2341,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/linux_swarming/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
« no previous file with comments | « scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_rel.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_tsan2.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698