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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder.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_android32_tests__l_nexus7_2__dbg_.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder.json
index 943a4ade201efefc0855be619dec17dacb3810ee..6bfacb38917d670eb4d05c19cc731f55edf499e1 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder.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]/Android64_Builder",
+ "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]/Android64_Builder",
"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]/Android64_Builder/src/out"
],
"name": "clean test output files"
},
@@ -69,10 +92,10 @@
"python",
"-u",
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
- "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
- "[SLAVE_BUILD]/src/out/Release/test_logs",
- "[SLAVE_BUILD]/src/out/build_product.zip",
- "[SLAVE_BUILD]/src"
+ "[BUILDER_CACHE]/Android64_Builder/src/out/Release/debug_info_dumps",
+ "[BUILDER_CACHE]/Android64_Builder/src/out/Release/test_logs",
+ "[BUILDER_CACHE]/Android64_Builder/src/out/build_product.zip",
+ "[BUILDER_CACHE]/Android64_Builder/src"
],
"name": "clean local files",
"~followup_annotations": [
@@ -152,12 +175,12 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/Android64_Builder/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CROSSCOMPILE": "1",
"GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm64 use_goma=1",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "PATH": "[BUILDER_CACHE]/Android64_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Builder/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -176,9 +199,11 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/Android64_Builder/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma",
"--goma-jsonstatus",
@@ -191,7 +216,7 @@
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[BUILDER_CACHE]/Android64_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Builder/src/build/android:%(PATH)s"
},
"name": "compile",
"~followup_annotations": [
@@ -215,15 +240,15 @@
"--staging-dir",
"[CACHE]/chrome_staging",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/Android64_Builder/src",
"--build-url",
"gs://chromium-webrtc/client.webrtc/Android64 Builder",
"--build_revision",
"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--factory-properties",
- "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android64 Builder\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
+ "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android64 Builder\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
"--build-properties",
- "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android64 Builder\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}"
+ "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android64 Builder\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}"
],
"name": "package build"
},
« no previous file with comments | « scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus7_2__dbg_.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_builder__dbg_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698