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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Linux__more_configs_.json

Issue 2460493002: WebRTC: Add new Linux (more configs) bots. (Closed)
Patch Set: Rebased Created 4 years, 2 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/more_configs.py ('k') | scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_linux_more_configs.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Linux__more_configs_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_compile_dbg.json b/scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Linux__more_configs_.json
similarity index 55%
copy from scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_compile_dbg.json
copy to scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Linux__more_configs_.json
index 46428bd2be1202631f000a9b81ee2ce69d156e8c..a9dad5059caf4c90130e2e52b7465c330babddcc 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_compile_dbg.json
+++ b/scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Linux__more_configs_.json
@@ -1,50 +1,6 @@
[
{
"cmd": [
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/host_info.py",
- "--json-file",
- "/path/to/tmp/json"
- ],
- "name": "host and tools info",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br />OS X 1.2.3, Xcode 6.7.8 (5D342509a)@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"Mac OS X Version\": \"1.2.3\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Xcode Build Version\": \"5D342509a\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Xcode SDKs\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"fake sdk 1.0\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fake sdk 1.1\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fake sdk 2.0\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"Xcode Version\": \"6.7.8\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "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_compile_dbg",
- "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",
@@ -56,19 +12,12 @@
"{\"src\": \"got_revision\"}",
"--git-cache-dir",
"[GIT_CACHE]",
- "--issue",
- "666666",
- "--patchset",
- "1",
- "--rietveld_server",
- "https://fake.rietveld.url",
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src@12345",
+ "src@HEAD",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]/mac_compile_dbg",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -78,7 +27,7 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"12345\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
@@ -101,26 +50,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
- "[BUILDER_CACHE]/mac_compile_dbg/src/out"
- ],
- "name": "clean test output files"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
"cmd": [],
"name": "ensure_goma"
},
@@ -130,7 +59,7 @@
"-u",
"RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
"--platform",
- "mac-amd64",
+ "linux-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"--json-output",
@@ -154,7 +83,7 @@
"--root",
"[CACHE]/cipd/goma",
"--list",
- "infra/tools/cloudtail/mac-amd64 goma_recipe_module\ninfra_internal/goma/client/mac-amd64 release",
+ "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
@@ -167,11 +96,11 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/mac-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
@@ -185,10 +114,10 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]/mac_compile_dbg/src",
+ "cwd": "[SLAVE_BUILD]/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_DEFINES": "clang=1 component=shared_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' rtc_use_h264=1 target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "component=shared_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -197,46 +126,138 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/mac_compile_dbg/src/tools/mb/mb.py",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
"gen",
- "-m",
- "tryserver.webrtc",
- "-b",
- "mac_compile_dbg",
- "--config-file",
- "[BUILDER_CACHE]/mac_compile_dbg/src/webrtc/build/mb_config.pyl",
+ "//out/Debug",
+ "--args=is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
+ ],
+ "cwd": "[SLAVE_BUILD]/src",
+ "name": "gn",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@gn (minimal)@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
+ "python",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
+ "--gsutil-py-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
+ "--ninja-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
+ "--target",
+ "Debug",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--goma-cache-dir",
+ "[GOMA_CACHE]",
+ "--buildbot-buildername",
+ "Linux (more configs)",
+ "--buildbot-mastername",
+ "client.webrtc",
+ "--buildbot-slavename",
+ "TestSlavename",
+ "--goma-deps-cache-file",
+ "Linux__more_configs_.gomadeps",
+ "--compiler",
+ "goma",
+ "--goma-jsonstatus",
+ "/path/to/tmp/json",
+ "--goma-service-account-json-file",
+ "/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
"[CACHE]/cipd/goma",
- "--isolate-map-file=[BUILDER_CACHE]/mac_compile_dbg/src/webrtc/build/gn_isolate_map.pyl",
- "--gyp-script=[BUILDER_CACHE]/mac_compile_dbg/src/webrtc/build/gyp_webrtc.py",
- "//out/Debug"
+ "--"
],
- "cwd": "[BUILDER_CACHE]/mac_compile_dbg/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "generate_build_files"
+ "name": "compile",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
+ "gen",
+ "//out/Debug",
+ "--args=rtc_enable_intelligibility_enhancer=true is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
+ ],
+ "cwd": "[SLAVE_BUILD]/src",
+ "name": "gn (2)",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@gn (rtc_enable_intelligibility_enhancer=true)@@@"
+ ]
},
{
- "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
+ "python",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
+ "--gsutil-py-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
+ "--ninja-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
+ "--target",
+ "Debug",
"--src-dir",
- "[BUILDER_CACHE]/mac_compile_dbg/src",
- "--output-json",
- "/path/to/tmp/json"
+ "[SLAVE_BUILD]/src",
+ "--goma-cache-dir",
+ "[GOMA_CACHE]",
+ "--buildbot-buildername",
+ "Linux (more configs)",
+ "--buildbot-mastername",
+ "client.webrtc",
+ "--buildbot-slavename",
+ "TestSlavename",
+ "--goma-deps-cache-file",
+ "Linux__more_configs_.gomadeps",
+ "--compiler",
+ "goma",
+ "--goma-jsonstatus",
+ "/path/to/tmp/json",
+ "--goma-service-account-json-file",
+ "/creds/service_accounts/service-account-goma-client.json",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "--"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "clang_revision",
+ "name": "compile (2)",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
+ "gen",
+ "//out/Debug",
+ "--args=rtc_enable_protobuf=false is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
+ ],
+ "cwd": "[SLAVE_BUILD]/src",
+ "name": "gn (3)",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@gn (rtc_enable_protobuf=false)@@@"
]
},
{
@@ -254,33 +275,92 @@
"--target",
"Debug",
"--src-dir",
- "[BUILDER_CACHE]/mac_compile_dbg/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
"--buildbot-buildername",
- "mac_compile_dbg",
+ "Linux (more configs)",
"--buildbot-mastername",
- "tryserver.webrtc",
+ "client.webrtc",
"--buildbot-slavename",
- "slavename",
+ "TestSlavename",
"--goma-deps-cache-file",
- "mac_compile_dbg.gomadeps",
+ "Linux__more_configs_.gomadeps",
"--compiler",
- "goma-clang",
+ "goma",
"--goma-jsonstatus",
"/path/to/tmp/json",
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
"[CACHE]/cipd/goma",
- "--goma-fail-fast",
- "--goma-disable-local-fallback",
"--"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "compile",
+ "name": "compile (3)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
+ "gen",
+ "//out/Debug",
+ "--args=rtc_include_opus=false is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
+ ],
+ "cwd": "[SLAVE_BUILD]/src",
+ "name": "gn (4)",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@gn (rtc_include_opus=false)@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
+ "python",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
+ "--gsutil-py-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
+ "--ninja-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
+ "--target",
+ "Debug",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--goma-cache-dir",
+ "[GOMA_CACHE]",
+ "--buildbot-buildername",
+ "Linux (more configs)",
+ "--buildbot-mastername",
+ "client.webrtc",
+ "--buildbot-slavename",
+ "TestSlavename",
+ "--goma-deps-cache-file",
+ "Linux__more_configs_.gomadeps",
+ "--compiler",
+ "goma",
+ "--goma-jsonstatus",
+ "/path/to/tmp/json",
+ "--goma-service-account-json-file",
+ "/creds/service_accounts/service-account-goma-client.json",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "--"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "compile (4)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@"
« no previous file with comments | « scripts/slave/recipes/webrtc/more_configs.py ('k') | scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_linux_more_configs.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698