scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_rel.json - Issue 2226283002: webrtc: prepare for running under remote_run

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_rel.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_win_drmemory_light.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_swarming.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_rel.json

diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_rel.json

index ea3bdf0a2ce9f9e01b7d3f7ccad52759b32ccdf3..813bcce752ceca11609914f8bfda2aa0fb77a072 100644

--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_rel.json

+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_rel.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]\\win_rel",

+ "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]\\win_rel",

"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]\\win_rel\\src\\out"

"name": "clean test output files"

@@ -142,7 +165,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",

"runhooks"

- "cwd": "[SLAVE_BUILD]\\src",

+ "cwd": "[BUILDER_CACHE]\\win_rel\\src",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",

"GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' rtc_use_h264=1 target_arch=ia32 use_goma=1",

@@ -165,9 +188,11 @@

"--target",

"Release",

"--src-dir",

- "[SLAVE_BUILD]\\src",

+ "[BUILDER_CACHE]\\win_rel\\src",

"--goma-cache-dir",

"[GOMA_CACHE]",

+ "--goma-deps-cache-dir",

+ "[GOMA_DEPS_CACHE]",

"--compiler",

"goma",

"--goma-jsonstatus",

@@ -198,9 +223,9 @@

"--target",

"Release",

"--factory-properties",

- "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"win_rel\", \"buildnumber\": 1337, \"issue\": 666666, \"mastername\": \"tryserver.webrtc\", \"patchset\": 1, \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"rietveld\": \"https://fake.rietveld.url\", \"slavename\": \"slavename\"}",

+ "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"win_rel\", \"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",

"--test-type=audio_decoder_unittests",

"--step-name=audio_decoder_unittests",

"--builder-name=win_rel",

@@ -208,8 +233,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\audio_decoder_unittests",

"--"

"name": "audio_decoder_unittests"

@@ -222,9 +247,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=common_audio_unittests",

"--step-name=common_audio_unittests",

"--builder-name=win_rel",

@@ -232,8 +257,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\common_audio_unittests",

"--"

"name": "common_audio_unittests"

@@ -246,9 +271,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=common_video_unittests",

"--step-name=common_video_unittests",

"--builder-name=win_rel",

@@ -256,8 +281,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\common_video_unittests",

"--"

"name": "common_video_unittests"

@@ -270,9 +295,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=modules_tests",

"--step-name=modules_tests",

"--builder-name=win_rel",

@@ -280,8 +305,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\modules_tests",

"--"

"name": "modules_tests"

@@ -294,9 +319,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=modules_unittests",

"--step-name=modules_unittests",

"--builder-name=win_rel",

@@ -304,8 +329,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\modules_unittests",

"--"

"name": "modules_unittests"

@@ -318,9 +343,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=peerconnection_unittests",

"--step-name=peerconnection_unittests",

"--builder-name=win_rel",

@@ -328,8 +353,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\peerconnection_unittests",

"--"

"name": "peerconnection_unittests"

@@ -342,9 +367,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=rtc_media_unittests",

"--step-name=rtc_media_unittests",

"--builder-name=win_rel",

@@ -352,8 +377,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\rtc_media_unittests",

"--"

"name": "rtc_media_unittests"

@@ -366,9 +391,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=rtc_pc_unittests",

"--step-name=rtc_pc_unittests",

"--builder-name=win_rel",

@@ -376,8 +401,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\rtc_pc_unittests",

"--"

"name": "rtc_pc_unittests"

@@ -390,9 +415,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=rtc_unittests",

"--step-name=rtc_unittests",

"--builder-name=win_rel",

@@ -400,8 +425,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\rtc_unittests",

"--"

"name": "rtc_unittests"

@@ -414,9 +439,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=system_wrappers_unittests",

"--step-name=system_wrappers_unittests",

"--builder-name=win_rel",

@@ -424,8 +449,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\system_wrappers_unittests",

"--"

"name": "system_wrappers_unittests"

@@ -438,9 +463,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=test_support_unittests",

"--step-name=test_support_unittests",

"--builder-name=win_rel",

@@ -448,8 +473,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\test_support_unittests",

"--"

"name": "test_support_unittests"

@@ -462,9 +487,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=tools_unittests",

"--step-name=tools_unittests",

"--builder-name=win_rel",

@@ -472,8 +497,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\tools_unittests",

"--"

"name": "tools_unittests"

@@ -486,9 +511,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=video_engine_tests",

"--step-name=video_engine_tests",

"--builder-name=win_rel",

@@ -496,8 +521,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\video_engine_tests",

"--"

"name": "video_engine_tests"

@@ -510,9 +535,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=voice_engine_unittests",

"--step-name=voice_engine_unittests",

"--builder-name=win_rel",

@@ -520,8 +545,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\voice_engine_unittests",

"--"

"name": "voice_engine_unittests"

@@ -534,9 +559,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=xmllite_xmpp_unittests",

"--step-name=xmllite_xmpp_unittests",

"--builder-name=win_rel",

@@ -544,8 +569,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

- "[SLAVE_BUILD]\\src\\third_party\\gtest-parallel\\gtest-parallel",

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

+ "[BUILDER_CACHE]\\win_rel\\src\\third_party\\gtest-parallel\\gtest-parallel",

+ "[BUILDER_CACHE]\\win_rel\\src\\out\\Release\\xmllite_xmpp_unittests",

"--"

"name": "xmllite_xmpp_unittests"

@@ -559,9 +584,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--annotate=gtest",

"--test-type=webrtc_nonparallel_tests",

"--step-name=webrtc_nonparallel_tests",