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

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

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

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

index dabd66be0459ec2a3bc981d03adbd94429544d4a..8cee5dbfcc0182fe899f73ac49c96f8ceeea1577 100644

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

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

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

@@ -24,6 +46,7 @@

"src@12345",

"--output_manifest"

+ "cwd": "[BUILDER_CACHE]/Linux64_Release",

"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/src/out"

"name": "clean test output files"

@@ -136,7 +159,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

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

+ "cwd": "[BUILDER_CACHE]/Linux64_Release/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 use_goma=1",

@@ -159,9 +182,11 @@

"--target",

"Release",

"--src-dir",

- "[SLAVE_BUILD]/src",

+ "[BUILDER_CACHE]/Linux64_Release/src",

"--goma-cache-dir",

"[GOMA_CACHE]",

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

+ "[GOMA_DEPS_CACHE]",

"--compiler",

"goma",

"--goma-jsonstatus",

@@ -191,9 +216,9 @@

"Release",

"--xvfb",

"--factory-properties",

- "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux64 Release\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",

+ "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux64 Release\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",

"--build-properties",

"--test-type=audio_decoder_unittests",

"--step-name=audio_decoder_unittests",

"--builder-name=Linux64 Release",

@@ -201,8 +226,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/audio_decoder_unittests",

"--"

"name": "audio_decoder_unittests"

@@ -216,9 +241,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=common_audio_unittests",

"--step-name=common_audio_unittests",

"--builder-name=Linux64 Release",

@@ -226,8 +251,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/common_audio_unittests",

"--"

"name": "common_audio_unittests"

@@ -241,9 +266,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=common_video_unittests",

"--step-name=common_video_unittests",

"--builder-name=Linux64 Release",

@@ -251,8 +276,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/common_video_unittests",

"--"

"name": "common_video_unittests"

@@ -266,9 +291,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=modules_tests",

"--step-name=modules_tests",

"--builder-name=Linux64 Release",

@@ -276,8 +301,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/modules_tests",

"--"

"name": "modules_tests"

@@ -291,9 +316,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=modules_unittests",

"--step-name=modules_unittests",

"--builder-name=Linux64 Release",

@@ -301,8 +326,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/modules_unittests",

"--"

"name": "modules_unittests"

@@ -316,9 +341,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=peerconnection_unittests",

"--step-name=peerconnection_unittests",

"--builder-name=Linux64 Release",

@@ -326,8 +351,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/peerconnection_unittests",

"--"

"name": "peerconnection_unittests"

@@ -341,9 +366,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=rtc_media_unittests",

"--step-name=rtc_media_unittests",

"--builder-name=Linux64 Release",

@@ -351,8 +376,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/rtc_media_unittests",

"--"

"name": "rtc_media_unittests"

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

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=rtc_pc_unittests",

"--step-name=rtc_pc_unittests",

"--builder-name=Linux64 Release",

@@ -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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/rtc_pc_unittests",

"--"

"name": "rtc_pc_unittests"

@@ -391,9 +416,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=rtc_unittests",

"--step-name=rtc_unittests",

"--builder-name=Linux64 Release",

@@ -401,8 +426,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/rtc_unittests",

"--"

"name": "rtc_unittests"

@@ -416,9 +441,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=system_wrappers_unittests",

"--step-name=system_wrappers_unittests",

"--builder-name=Linux64 Release",

@@ -426,8 +451,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/system_wrappers_unittests",

"--"

"name": "system_wrappers_unittests"

@@ -441,9 +466,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=test_support_unittests",

"--step-name=test_support_unittests",

"--builder-name=Linux64 Release",

@@ -451,8 +476,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/test_support_unittests",

"--"

"name": "test_support_unittests"

@@ -466,9 +491,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=tools_unittests",

"--step-name=tools_unittests",

"--builder-name=Linux64 Release",

@@ -476,8 +501,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/tools_unittests",

"--"

"name": "tools_unittests"

@@ -491,9 +516,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=video_engine_tests",

"--step-name=video_engine_tests",

"--builder-name=Linux64 Release",

@@ -501,8 +526,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/video_engine_tests",

"--"

"name": "video_engine_tests"

@@ -516,9 +541,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=voice_engine_unittests",

"--step-name=voice_engine_unittests",

"--builder-name=Linux64 Release",

@@ -526,8 +551,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/voice_engine_unittests",

"--"

"name": "voice_engine_unittests"

@@ -541,9 +566,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--test-type=xmllite_xmpp_unittests",

"--step-name=xmllite_xmpp_unittests",

"--builder-name=Linux64 Release",

@@ -551,8 +576,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]/Linux64_Release/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/Linux64_Release/src/out/Release/xmllite_xmpp_unittests",

"--"

"name": "xmllite_xmpp_unittests"

@@ -567,9 +592,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--annotate=gtest",

"--test-type=webrtc_nonparallel_tests",

"--step-name=webrtc_nonparallel_tests",