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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_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_mac_gn_rel.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_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_mac_rel.json

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

index 14bb736a62a4be653434a0a450566af2e465ab2b..8d38ed58cd28f6cc8e5a132f9a2a0cb7fa166c89 100644

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

+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_rel.json

@@ -25,6 +25,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]/mac_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",

@@ -52,6 +74,7 @@

"src@12345",

"--output_manifest"

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

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -88,7 +111,7 @@

"python",

"-u",

"RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",

- "[SLAVE_BUILD]/src/out"

+ "[BUILDER_CACHE]/mac_rel/src/out"

"name": "clean test output files"

@@ -164,7 +187,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

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

+ "cwd": "[BUILDER_CACHE]/mac_rel/src",

"env": {

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

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

@@ -179,7 +202,7 @@

"-u",

"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",

"--src-dir",

- "[SLAVE_BUILD]/src",

+ "[BUILDER_CACHE]/mac_rel/src",

"--output-json",

"/path/to/tmp/json"

@@ -209,9 +232,11 @@

"--target",

"Release",

"--src-dir",

- "[SLAVE_BUILD]/src",

+ "[BUILDER_CACHE]/mac_rel/src",

"--goma-cache-dir",

"[GOMA_CACHE]",

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

+ "[GOMA_DEPS_CACHE]",

"--compiler",

"goma-clang",

"--goma-jsonstatus",

@@ -242,9 +267,9 @@

"--target",

"Release",

"--factory-properties",

- "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"mac_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\": \"mac_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=mac_rel",

@@ -252,8 +277,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "audio_decoder_unittests"

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

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=common_audio_unittests",

"--step-name=common_audio_unittests",

"--builder-name=mac_rel",

@@ -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/common_audio_unittests",

+ "[BUILDER_CACHE]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "common_audio_unittests"

@@ -290,9 +315,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=common_video_unittests",

"--step-name=common_video_unittests",

"--builder-name=mac_rel",

@@ -300,8 +325,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "common_video_unittests"

@@ -314,9 +339,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=modules_tests",

"--step-name=modules_tests",

"--builder-name=mac_rel",

@@ -324,8 +349,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "modules_tests"

@@ -338,9 +363,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=modules_unittests",

"--step-name=modules_unittests",

"--builder-name=mac_rel",

@@ -348,8 +373,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "modules_unittests"

@@ -362,9 +387,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=peerconnection_unittests",

"--step-name=peerconnection_unittests",

"--builder-name=mac_rel",

@@ -372,8 +397,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "peerconnection_unittests"

@@ -386,9 +411,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=rtc_media_unittests",

"--step-name=rtc_media_unittests",

"--builder-name=mac_rel",

@@ -396,8 +421,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "rtc_media_unittests"

@@ -410,9 +435,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=rtc_pc_unittests",

"--step-name=rtc_pc_unittests",

"--builder-name=mac_rel",

@@ -420,8 +445,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "rtc_pc_unittests"

@@ -434,9 +459,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=rtc_unittests",

"--step-name=rtc_unittests",

"--builder-name=mac_rel",

@@ -444,8 +469,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "rtc_unittests"

@@ -458,9 +483,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=system_wrappers_unittests",

"--step-name=system_wrappers_unittests",

"--builder-name=mac_rel",

@@ -468,8 +493,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "system_wrappers_unittests"

@@ -482,9 +507,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=test_support_unittests",

"--step-name=test_support_unittests",

"--builder-name=mac_rel",

@@ -492,8 +517,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "test_support_unittests"

@@ -506,9 +531,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=tools_unittests",

"--step-name=tools_unittests",

"--builder-name=mac_rel",

@@ -516,8 +541,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "tools_unittests"

@@ -530,9 +555,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=video_engine_tests",

"--step-name=video_engine_tests",

"--builder-name=mac_rel",

@@ -540,8 +565,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "video_engine_tests"

@@ -554,9 +579,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=voice_engine_unittests",

"--step-name=voice_engine_unittests",

"--builder-name=mac_rel",

@@ -564,8 +589,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "voice_engine_unittests"

@@ -578,9 +603,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=xmllite_xmpp_unittests",

"--step-name=xmllite_xmpp_unittests",

"--builder-name=mac_rel",

@@ -588,8 +613,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]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

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

"--"

"name": "xmllite_xmpp_unittests"

@@ -602,9 +627,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--test-type=libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test",

"--step-name=libjingle_peerconnection_objc_test",

"--builder-name=mac_rel",

@@ -612,8 +637,8 @@

"--build-number=1337",

"--run-python-script",

"--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

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

- "[SLAVE_BUILD]/src/out/Release/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test",

+ "[BUILDER_CACHE]/mac_rel/src/third_party/gtest-parallel/gtest-parallel",

+ "[BUILDER_CACHE]/mac_rel/src/out/Release/libjingle_peerconnection_objc_test.app/Contents/MacOS/libjingle_peerconnection_objc_test",

"--"

"name": "libjingle_peerconnection_objc_test"

@@ -627,9 +652,9 @@

"--target",

"Release",

"--factory-properties",

"--build-properties",

"--annotate=gtest",

"--test-type=webrtc_nonparallel_tests",

"--step-name=webrtc_nonparallel_tests",