| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_baremetal.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_baremetal.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_baremetal.json
|
| index 7be4acbb84b273d717bbe15635f1f5d3609e3a69..eec7d41de2bdc38df06625ee2cd31fce5c56879a 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_baremetal.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_linux_baremetal.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_baremetal",
|
| + "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_baremetal",
|
| "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_baremetal/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]/linux_baremetal/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/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=x64 use_goma=1",
|
| @@ -165,9 +188,11 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| + "[BUILDER_CACHE]/linux_baremetal/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| + "--goma-deps-cache-dir",
|
| + "[GOMA_DEPS_CACHE]",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -208,9 +233,9 @@
|
| "Release",
|
| "--xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"linux_baremetal\", \"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\": \"linux_baremetal\", \"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\": \"Release\", \"buildername\": \"linux_baremetal\", \"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\": \"linux_baremetal\", \"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=audioproc",
|
| "--step-name=audioproc",
|
| @@ -225,7 +250,7 @@
|
| "--fixed_digital",
|
| "--perf",
|
| "-pb",
|
| - "[SLAVE_BUILD]/src/resources/audioproc.aecdump"
|
| + "[BUILDER_CACHE]/linux_baremetal/src/resources/audioproc.aecdump"
|
| ],
|
| "name": "audioproc"
|
| },
|
| @@ -239,9 +264,9 @@
|
| "Release",
|
| "--xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"linux_baremetal\", \"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\": \"linux_baremetal\", \"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\": \"Release\", \"buildername\": \"linux_baremetal\", \"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\": \"linux_baremetal\", \"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=isac_fix_test",
|
| "--step-name=isac_fix_test",
|
| @@ -251,7 +276,7 @@
|
| "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "isac_fix_test",
|
| "32000",
|
| - "[SLAVE_BUILD]/src/resources/speech_and_misc_wb.pcm",
|
| + "[BUILDER_CACHE]/linux_baremetal/src/resources/speech_and_misc_wb.pcm",
|
| "isac_speech_and_misc_wb.pcm"
|
| ],
|
| "name": "isac_fix_test"
|
| @@ -266,9 +291,9 @@
|
| "Release",
|
| "--xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"linux_baremetal\", \"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\": \"linux_baremetal\", \"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\": \"Release\", \"buildername\": \"linux_baremetal\", \"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\": \"linux_baremetal\", \"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=voe_auto_test",
|
| "--step-name=voe_auto_test",
|
| @@ -291,9 +316,9 @@
|
| "Release",
|
| "--xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"linux_baremetal\", \"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\": \"linux_baremetal\", \"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\": \"Release\", \"buildername\": \"linux_baremetal\", \"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\": \"linux_baremetal\", \"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=video_capture_tests",
|
| "--step-name=video_capture_tests",
|
|
|