| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_tester_arm32_release__nexus_5x_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/dynamic_gtest_android.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_tester_arm32_release__nexus_5x_.json
|
| similarity index 60%
|
| copy from scripts/slave/recipes/chromium.expected/dynamic_gtest_android.json
|
| copy to scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_tester_arm32_release__nexus_5x_.json
|
| index a0ebcb8d4034731b5419069ec4c85e653f9d395e..3cd036bee9e77c882d8fe926c848fc387f589790 100644
|
| --- a/scripts/slave/recipes/chromium.expected/dynamic_gtest_android.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_tester_arm32_release__nexus_5x_.json
|
| @@ -5,29 +5,27 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "chromium.android",
|
| + "client.libyuv",
|
| "--builder",
|
| - "Lollipop Phone Tester",
|
| + "Android Tester ARM32 Release (Nexus 5X)",
|
| "--slave",
|
| - "TestSlavename",
|
| + "slavename",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['android']",
|
| + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]\ntarget_os = ['android']",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| - "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| + "{\"src\": \"got_revision\"}",
|
| "--git-cache-dir",
|
| "[GIT_CACHE]",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| - "src@HEAD",
|
| + "src@12345",
|
| "--force",
|
| - "--output_manifest",
|
| - "--gerrit_no_rebase_patch_ref"
|
| + "--output_manifest"
|
| ],
|
| "env": {
|
| - "GCLIENT_KILL_GIT_FETCH_AFTER": "1200",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "bot_update",
|
| @@ -36,74 +34,26 @@
|
| "@@@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\": \"12345\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
|
| + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@"
|
| ]
|
| },
|
| {
|
| @@ -116,7 +66,7 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
|
| "--platform",
|
| - "linux-amd64",
|
| + "linux-386",
|
| "--dest-directory",
|
| "[SLAVE_BUILD]/cipd",
|
| "--json-output",
|
| @@ -140,7 +90,7 @@
|
| "--root",
|
| "[CACHE]/cipd/goma",
|
| "--list",
|
| - "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
|
| + "infra/tools/cloudtail/linux-386 goma_recipe_module\ninfra_internal/goma/client/linux-386 release",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--service-account-json",
|
| @@ -153,11 +103,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/linux-amd64\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-386\"@@@",
|
| "@@@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@ \"package\": \"infra_internal/goma/client/linux-386\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| @@ -174,7 +124,6 @@
|
| "cwd": "[SLAVE_BUILD]/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 gomadir='[CACHE]/cipd/goma' target_arch=arm 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]"
|
| @@ -185,99 +134,8 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| - "--output",
|
| - "/path/to/tmp/json",
|
| - "--",
|
| - "--build-config-fs",
|
| - "Debug",
|
| - "--paths",
|
| - "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| - "--properties",
|
| - "{\"buildername\": \"Lollipop Phone Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| - ],
|
| - "name": "get compile targets for scripts",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.android.json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "read test spec (chromium.android.json)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.android.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Lollipop Phone Tester\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test\": \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "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": [
|
| - "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/Debug/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Debug/test_logs",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip",
|
| - "[SLAVE_BUILD]/src"
|
| - ],
|
| - "name": "clean local files",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@try:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ pass@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "allow_subannotations": false,
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/src/build/tree_truth.sh",
|
| - "[SLAVE_BUILD]/src",
|
| - "src"
|
| - ],
|
| - "name": "tree truth steps"
|
| - },
|
| - {
|
| - "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",
|
| - "[SLAVE_BUILD]/src/out/Debug"
|
| + "[SLAVE_BUILD]/src/out/Release"
|
| ],
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| @@ -302,17 +160,17 @@
|
| "--gsutil-py-path",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| "--target",
|
| - "Debug",
|
| + "Release",
|
| "--src-dir",
|
| "[SLAVE_BUILD]/src",
|
| "--build-url",
|
| - "gs://chromium-android-archive/chromium.android/Android arm Builder (dbg)/full-build-linux.zip",
|
| + "gs://chromium-webrtc/client.libyuv/Android Release/full-build-linux.zip",
|
| "--build_revision",
|
| "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--master-name",
|
| - "chromium.android",
|
| + "client.libyuv",
|
| "--build-number",
|
| - "571"
|
| + "1337"
|
| ],
|
| "name": "extract build"
|
| },
|
| @@ -325,10 +183,6 @@
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| - "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"
|
| - },
|
| "name": "create adb symlink"
|
| },
|
| {
|
| @@ -389,7 +243,7 @@
|
| "--output-device-blacklist",
|
| "/path/to/tmp/json",
|
| "-t",
|
| - "Debug"
|
| + "Release"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -529,22 +383,16 @@
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| ],
|
| - "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"
|
| - },
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_base_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_yuv_unittest",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| - "--json-results-file",
|
| - "/path/to/tmp/json",
|
| "--adb-path",
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| @@ -552,33 +400,7 @@
|
| "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"
|
| },
|
| - "name": "base_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
|
| - "--input-gtest-json",
|
| - "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}]}",
|
| - "--master-name",
|
| - "chromium.android",
|
| - "--builder-name",
|
| - "Lollipop Phone Tester",
|
| - "--build-number",
|
| - "571",
|
| - "--test-type",
|
| - "base_unittests",
|
| - "--test-results-server",
|
| - "test-results.appspot.com",
|
| - "--chrome-revision",
|
| - "refs/heads/master@{#170242}"
|
| - ],
|
| - "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"
|
| - },
|
| - "name": "Upload to test-results [base_unittests]"
|
| + "name": "yuv_unittest"
|
| },
|
| {
|
| "cmd": [
|
| @@ -590,10 +412,6 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| - "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"
|
| - },
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| @@ -602,13 +420,9 @@
|
| "-u",
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| - "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| + "[SLAVE_BUILD]/src/out/Release/full_log",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| - "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"
|
| - },
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -624,16 +438,12 @@
|
| "GSUtil:parallel_composite_upload_threshold=50M",
|
| "----",
|
| "cp",
|
| - "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| - "gs://chromium-android/logcat_dumps/Lollipop Phone Tester/571"
|
| + "[SLAVE_BUILD]/src/out/Release/full_log",
|
| + "gs://chromium-android/logcat_dumps/Android Tester ARM32 Release (Nexus 5X)/1337"
|
| ],
|
| - "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"
|
| - },
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| - "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Lollipop Phone Tester/571@@@"
|
| + "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Tester ARM32 Release (Nexus 5X)/1337@@@"
|
| ]
|
| },
|
| {
|
| @@ -642,10 +452,10 @@
|
| "--arch",
|
| "arm",
|
| "--more-info",
|
| - "[SLAVE_BUILD]/src/out/Debug/full_log"
|
| + "[SLAVE_BUILD]/src/out/Release/full_log"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "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"
|
| },
|
| @@ -653,27 +463,15 @@
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/chrome/VERSION",
|
| - "/path/to/tmp/"
|
| - ],
|
| - "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"
|
| - },
|
| - "name": "get version"
|
| - },
|
| - {
|
| - "cmd": [
|
| "[SLAVE_BUILD]/src/build/android/tombstones.py",
|
| "-a",
|
| "-s",
|
| - "-w"
|
| + "-w",
|
| + "--adb-path",
|
| + "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "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"
|
| },
|
| @@ -684,12 +482,8 @@
|
| "python",
|
| "-u",
|
| "\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",
|
| - "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
|
| + "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
|
| ],
|
| - "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"
|
| - },
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|