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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__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
Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json
index 5b481c56bafd8a6a4c51aac9f867e1d37c6b1a44..cc9fb4ec97f8edd9ad36798a353094cf643b5e5f 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__swarming_.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_fyi_linux64_release__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]/Linux64_Release__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",
"client.webrtc.fyi",
@@ -24,6 +46,7 @@
"src@12345",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/Linux64_Release__swarming_",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -60,7 +83,7 @@
"python",
"-u",
"RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
- "[SLAVE_BUILD]/src/out"
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out"
],
"name": "clean test output files"
},
@@ -81,7 +104,7 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release",
"--clean-isolated-files"
],
"name": "clean isolated files"
@@ -147,7 +170,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/Linux64_Release__swarming_/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_DEFINES": "component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' rtc_use_h264=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
@@ -159,7 +182,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"--version"
],
"name": "swarming.py --version",
@@ -183,9 +206,11 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma",
"--goma-jsonstatus",
@@ -212,9 +237,9 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src"
],
"cwd": "[SLAVE_BUILD]",
"name": "remove_build_metadata"
@@ -224,27 +249,27 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
- "[SLAVE_BUILD]/src/out/Release/audio_decoder_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/common_audio_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/common_video_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/modules_tests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/modules_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/peerconnection_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/rtc_media_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/rtc_pc_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/rtc_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/system_wrappers_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/test_support_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/tools_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/video_engine_tests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/voice_engine_unittests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/xmllite_xmpp_unittests.isolated.gen.json"
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/audio_decoder_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/common_audio_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/common_video_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/modules_tests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/modules_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/peerconnection_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/rtc_media_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/rtc_pc_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/rtc_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/system_wrappers_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/test_support_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/tools_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/video_engine_tests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/voice_engine_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/out/Release/xmllite_xmpp_unittests.isolated.gen.json"
],
"name": "isolate tests",
"~followup_annotations": [
@@ -273,7 +298,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -350,7 +375,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -427,7 +452,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -504,7 +529,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -581,7 +606,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -658,7 +683,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -735,7 +760,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -812,7 +837,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -889,7 +914,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -966,7 +991,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1043,7 +1068,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1120,7 +1145,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1197,7 +1222,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1274,7 +1299,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1351,7 +1376,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1434,9 +1459,9 @@
"Release",
"--xvfb",
"--factory-properties",
- "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux64 Release (swarming)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc.fyi\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
+ "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux64 Release (swarming)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
"--build-properties",
- "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux64 Release (swarming)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc.fyi\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
+ "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux64 Release (swarming)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
"--annotate=gtest",
"--test-type=webrtc_nonparallel_tests",
"--step-name=webrtc_nonparallel_tests",
@@ -1455,7 +1480,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1514,7 +1539,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1573,7 +1598,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1632,7 +1657,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1691,7 +1716,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1750,7 +1775,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1809,7 +1834,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1868,7 +1893,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1927,7 +1952,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1986,7 +2011,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2045,7 +2070,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2104,7 +2129,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2163,7 +2188,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2222,7 +2247,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2281,7 +2306,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux64_Release__swarming_/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",

Powered by Google App Engine
This is Rietveld 408576698