| Index: scripts/slave/recipes/chromium.expected/full_chromium_android_fyi_Nougat_Phone_Tester.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm64_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_fyi_Nougat_Phone_Tester.json
|
| similarity index 57%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm64_Builder__dbg_.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_android_fyi_Nougat_Phone_Tester.json
|
| index faf65153534f1fcd6367986ce3a3e545a66d4c2d..887951408f04a3ea64d154f0ea219495b239e6ab 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm64_Builder__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_fyi_Nougat_Phone_Tester.json
|
| @@ -4,7 +4,7 @@
|
| "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]/Android_arm64_Builder__dbg_",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -37,10 +37,10 @@
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| - "src@HEAD",
|
| + "src@1111111",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_arm64_Builder__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -50,7 +50,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\": \"HEAD\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
|
| @@ -182,7 +182,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/tools/swarming_client/swarming.py",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -198,13 +198,13 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "OS=android component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=arm64 test_isolation_mode=prepare use_goma=1",
|
| - "PATH": "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "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]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -212,16 +212,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Debug",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/Nougat_Phone_Tester/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Android arm64 Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"Nougat Phone Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.android.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -234,24 +234,14 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/testing/buildbot/chromium.android.json",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/testing/buildbot/chromium.android.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "read test spec (chromium.android.json)",
|
| + "name": "read test spec (chromium.android.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/testing/buildbot/chromium.android.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/Nougat_Phone_Tester/src/testing/buildbot/chromium.android.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Android WebView N (dbg)\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Marshmallow 64 bit Tester\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Nougat Phone Tester\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| @@ -281,10 +271,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",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/out/Debug/debug_info_dumps",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/out/Debug/test_logs",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/out/build_product.zip",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src"
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug/debug_info_dumps",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug/test_logs",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -305,8 +295,8 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/build/tree_truth.sh",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/tree_truth.sh",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src",
|
| "src"
|
| ],
|
| "name": "tree truth steps"
|
| @@ -315,39 +305,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| - "--build-dir",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/out/Debug",
|
| - "--clean-isolated-files"
|
| - ],
|
| - "name": "clean isolated files"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/tools/mb/mb.py",
|
| - "gen",
|
| - "-m",
|
| - "chromium.android",
|
| - "-b",
|
| - "Android arm64 Builder (dbg)",
|
| - "--config-file",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/tools/mb/mb_config.pyl",
|
| - "--goma-dir",
|
| - "[CACHE]/cipd/goma",
|
| - "--swarming-targets-file",
|
| - "browser_tests_apk\n",
|
| - "//out/Debug"
|
| + "\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]/Nougat_Phone_Tester/src/out/Debug"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| - },
|
| - "name": "generate_build_files",
|
| + "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests_apk@@@",
|
| - "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
|
| + "@@@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@@@"
|
| ]
|
| },
|
| {
|
| @@ -357,182 +327,113 @@
|
| "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| "--show-path",
|
| "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.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]/Android_arm64_Builder__dbg_/src",
|
| - "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| - "--buildbot-buildername",
|
| - "Android arm64 Builder (dbg)",
|
| - "--buildbot-mastername",
|
| - "chromium.android",
|
| - "--buildbot-slavename",
|
| - "TestSlavename",
|
| - "--goma-deps-cache-file",
|
| - "Android_arm64_Builder__dbg_.gomadeps",
|
| - "--build-data-dir",
|
| - "[ROOT]/build_data_dir",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-jsonstatus",
|
| - "/path/to/tmp/json",
|
| - "--goma-service-account-json-file",
|
| - "/creds/service_accounts/service-account-goma-client.json",
|
| - "--cloudtail-service-account-json",
|
| - "/creds/service_accounts/service-account-goma-cloudtail.json",
|
| - "--goma-dir",
|
| - "[CACHE]/cipd/goma",
|
| - "--",
|
| - "browser_tests_apk_run",
|
| - "system_webview_apk"
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src",
|
| + "--slave-utils-gsutil-py-path",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| + "--build-archive-url",
|
| + "gs://test-domain/test-archive.zip",
|
| + "--master-name",
|
| + "chromium.android.fyi",
|
| + "--build-number",
|
| + "571"
|
| ],
|
| + "name": "extract build"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| + "--build-dir",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug",
|
| + "--output-json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s"
|
| },
|
| - "name": "compile",
|
| + "name": "find isolated tests",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| - "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/tools/determinism/remove_build_metadata.py",
|
| - "--build-dir",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/out/Debug"
|
| + "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
|
| + "browser_tests_apk"
|
| ],
|
| - "cwd": "[START_DIR]",
|
| - "name": "remove_build_metadata"
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "[error] browser_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@print '*.isolated file for target %s is missing' % sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/tools/swarming_client",
|
| - "batcharchive",
|
| - "--dump-json",
|
| - "/path/to/tmp/json",
|
| - "--isolate-server",
|
| - "https://isolateserver.appspot.com",
|
| - "--verbose",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src/out/Debug/browser_tests_apk.isolated.gen.json"
|
| + "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
|
| + "browser_tests"
|
| ],
|
| - "name": "isolate tests",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "[collect error] browser_tests",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"browser_tests_apk\": \"[dummy hash for browser_tests_apk]\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@print '%s wasn\\'t triggered' % sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",
|
| - "--target",
|
| - "Debug",
|
| - "--gsutil-py-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| - "--staging-dir",
|
| - "[CACHE]/chrome_staging",
|
| - "--src-dir",
|
| - "[BUILDER_CACHE]/Android_arm64_Builder__dbg_/src",
|
| - "--slave-utils-gsutil-py-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| - "--build-url",
|
| - "gs://chromium-android-archive/chromium.android/Android arm64 Builder (dbg)",
|
| - "--build_revision",
|
| - "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android arm64 Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android arm64 Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| - ],
|
| - "name": "package build"
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "name": "trigger",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android WebView N (dbg)",
|
| - "properties": {
|
| - "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
|
| - "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
|
| - "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
|
| - "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
|
| - "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
|
| - "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
|
| - "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "parent_got_revision_cp": "refs/heads/master@{#170242}",
|
| - "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
|
| - "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
|
| - "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
|
| - "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
|
| - "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
|
| - "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
|
| - "parent_mastername": "chromium.android"
|
| - }
|
| - },
|
| - {
|
| - "builder_name": "Marshmallow 64 bit Tester",
|
| - "properties": {
|
| - "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
|
| - "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
|
| - "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
|
| - "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
|
| - "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
|
| - "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
|
| - "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "parent_got_revision_cp": "refs/heads/master@{#170242}",
|
| - "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
|
| - "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
|
| - "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
|
| - "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
|
| - "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
|
| - "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
|
| - "parent_mastername": "chromium.android"
|
| - }
|
| - },
|
| - {
|
| - "bucket": "master.chromium.android.fyi",
|
| - "builder_name": "Lollipop Consumer Tester",
|
| - "properties": {
|
| - "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
|
| - "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
|
| - "parent_got_buildtools_revision": "f0319a328b2809876916353cb994259692140934",
|
| - "parent_got_buildtools_revision_cp": "refs/heads/master@{#182578}",
|
| - "parent_got_nacl_revision": "d998e125e8253980d76e269b7982aeeefc1b9b50",
|
| - "parent_got_nacl_revision_cp": "refs/heads/master@{#274981}",
|
| - "parent_got_revision": "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "parent_got_revision_cp": "refs/heads/master@{#170242}",
|
| - "parent_got_swarming_client_revision": "a0ee5d99f1d4b38ddaa4c759c837980b63b99566",
|
| - "parent_got_swarming_client_revision_cp": "refs/heads/master@{#276089}",
|
| - "parent_got_v8_revision": "801ada225ddc271c132c3a35f03975671d43e399",
|
| - "parent_got_v8_revision_cp": "refs/heads/master@{#43426}",
|
| - "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
|
| - "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}",
|
| - "parent_mastername": "chromium.android"
|
| - }
|
| - }
|
| + "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug/test_logs/*.log"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "test_report",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android WebView N (dbg)<br />Lollipop Consumer Tester<br />Marshmallow 64 bit Tester@@@"
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print l@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| ]
|
| },
|
| {
|
|
|