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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__m_nexus5x_.json

Issue 2395143002: WebRTC: Move Android bots with devices to the perf waterfall. (Closed)
Patch Set: 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
« scripts/slave/recipe_modules/webrtc/builders.py ('K') | « scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__m_nexus5x__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_tests__m_nexus5x_.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__m_nexus5x_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__m_nexus5x_.json
index 07c17a53bd9b14d43be81147c6a58f82130b792b..796e6df113da19dfea41fb88625118151570d845 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__m_nexus5x_.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__m_nexus5x_.json
@@ -120,6 +120,64 @@
"name": "clean isolated files"
},
{
+ "cmd": [],
+ "name": "ensure_goma"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
+ "--platform",
+ "linux-amd64",
+ "--dest-directory",
+ "[SLAVE_BUILD]/cipd",
+ "--json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_goma.install cipd",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/cipd/cipd",
+ "ensure",
+ "--root",
+ "[CACHE]/cipd/goma",
+ "--list",
+ "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
+ "--json-output",
+ "/path/to/tmp/json",
+ "--service-account-json",
+ "/creds/service_accounts/service-account-goma-client.json"
+ ],
+ "name": "ensure_goma.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@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/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/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
"cmd": [
"python",
"-u",
@@ -130,7 +188,7 @@
"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 target_arch=arm64 test_isolation_mode=prepare",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm64 test_isolation_mode=prepare use_goma=1",
"PATH": "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -152,19 +210,45 @@
"cmd": [
"python",
"-u",
- "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release"
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "client.webrtc",
+ "-b",
+ "Android64 Tests (M Nexus5X)",
+ "--config-file",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/webrtc/build/mb_config.pyl",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "--swarming-targets-file",
+ "AppRTCMobileTest\nandroid_junit_tests\naudio_decoder_unittests\ncommon_audio_unittests\ncommon_video_unittests\nlibjingle_peerconnection_android_unittest\nmodules_tests\nmodules_unittests\npeerconnection_unittests\nrtc_stats_unittests\nrtc_unittests\nsystem_wrappers_unittests\ntest_support_unittests\ntools_unittests\nvideo_engine_tests\nvoice_engine_unittests\nwebrtc_nonparallel_tests\n",
+ "--gyp-script=[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/webrtc/build/gyp_webrtc.py",
+ "//out/Release"
],
- "name": "rmtree build directory",
+ "cwd": "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "generate_build_files",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@AppRTCMobileTest@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@android_junit_tests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@audio_decoder_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@common_audio_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@common_video_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@libjingle_peerconnection_android_unittest@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@modules_tests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@modules_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@peerconnection_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@rtc_stats_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@rtc_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@system_wrappers_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@test_support_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@tools_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@video_engine_tests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@voice_engine_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@webrtc_nonparallel_tests@@@",
+ "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
]
},
{
@@ -174,36 +258,86 @@
"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
"--show-path",
"python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py",
+ "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",
"Release",
"--src-dir",
"[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src",
- "--build-url",
- "gs://chromium-webrtc/client.webrtc/Android64 Builder/full-build-linux.zip",
- "--build_revision",
- "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "--master-name",
+ "--goma-cache-dir",
+ "[GOMA_CACHE]",
+ "--buildbot-buildername",
+ "Android64 Tests (M Nexus5X)",
+ "--buildbot-mastername",
"client.webrtc",
- "--build-number",
- "1337"
+ "--buildbot-slavename",
+ "slavename",
+ "--goma-deps-cache-file",
+ "Android64_Tests__M_Nexus5X_.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",
+ "--"
],
- "name": "extract build"
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/build/android:%(PATH)s"
+ },
+ "name": "compile",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/tools/determinism/remove_build_metadata.py",
"--build-dir",
- "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release",
- "--output-json",
- "/path/to/tmp/json"
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release"
],
- "cwd": "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_",
- "name": "find isolated tests",
+ "cwd": "[SLAVE_BUILD]",
+ "name": "remove_build_metadata"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::isolate]/resources/isolate.py",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/tools/swarming_client",
+ "batcharchive",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/AppRTCMobileTest.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/android_junit_tests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/audio_decoder_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/common_audio_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/common_video_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/libjingle_peerconnection_android_unittest.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/modules_tests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/modules_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/peerconnection_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/rtc_stats_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/rtc_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/system_wrappers_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/test_support_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/tools_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/video_engine_tests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/voice_engine_unittests.isolated.gen.json",
+ "[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/webrtc_nonparallel_tests.isolated.gen.json"
+ ],
+ "name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"AppRTCMobileTest\": \"[dummy hash for AppRTCMobileTest]\", @@@",
@@ -232,6 +366,34 @@
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[build::zip]/resources/zip.py"
+ ],
+ "name": "AppRTCMobile zip archive",
+ "stdin": "{\"entries\": [{\"archive_name\": null, \"path\": \"[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/apks/AppRTCMobile.apk\", \"type\": \"file\"}], \"output\": \"[SLAVE_BUILD]/AppRTCMobile_apk.zip\", \"root\": \"[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/out/Release/apks\"}"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+ "--",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
+ "----",
+ "cp",
+ "-a",
+ "public-read",
+ "[SLAVE_BUILD]/AppRTCMobile_apk.zip",
+ "gs://chromium-webrtc/client.webrtc/Android64 Tests (M Nexus5X)/AppRTCMobile_apk_170242.zip"
+ ],
+ "name": "gsutil upload",
+ "~followup_annotations": [
+ "@@@STEP_LINK@gsutil.upload@https://storage.googleapis.com/chromium-webrtc/client.webrtc/Android64 Tests (M Nexus5X)/AppRTCMobile_apk_170242.zip@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[BUILDER_CACHE]/Android64_Tests__M_Nexus5X_/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
« scripts/slave/recipe_modules/webrtc/builders.py ('K') | « scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__m_nexus5x__dbg_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698