| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Find_Annotated_Test.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_Android.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Find_Annotated_Test.json
|
| similarity index 80%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_Android.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Find_Annotated_Test.json
|
| index a739260892b00b49fc1eac9d928c1d44165a4fd1..e29dfa039e6d84daf030185f8a23573ab82b4314 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_Android.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Find_Annotated_Test.json
|
| @@ -5,9 +5,9 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "chromium",
|
| + "chromium.fyi",
|
| "--builder",
|
| - "Android",
|
| + "Android Find Annotated Test",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -162,25 +162,6 @@
|
| "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/Release"
|
| - ],
|
| - "name": "rmtree clobber",
|
| - "~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@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| @@ -189,7 +170,7 @@
|
| "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' linux_dump_symbols=0 target_arch=arm test_isolation_mode=noop use_goma=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]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -203,11 +184,11 @@
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| - "Release",
|
| + "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\": \"Android\", \"buildnumber\": 571, \"mastername\": \"chromium\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"Android Find Annotated Test\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -220,12 +201,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -246,8 +227,8 @@
|
| "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/Debug/debug_info_dumps",
|
| + "[SLAVE_BUILD]/src/out/Debug/test_logs",
|
| "[SLAVE_BUILD]/src/out/build_product.zip",
|
| "[SLAVE_BUILD]/src"
|
| ],
|
| @@ -284,14 +265,14 @@
|
| "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium",
|
| + "chromium.fyi",
|
| "-b",
|
| - "Android",
|
| + "Android Find Annotated Test",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "//out/Release"
|
| + "//out/Debug"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| @@ -311,7 +292,7 @@
|
| "--ninja-path",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| "--target",
|
| - "Release",
|
| + "Debug",
|
| "--src-dir",
|
| "[SLAVE_BUILD]/src",
|
| "--goma-cache-dir",
|
| @@ -329,7 +310,12 @@
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "--",
|
| - "all"
|
| + "android_webview_test_apk",
|
| + "blimp_test_apk",
|
| + "chrome_public_test_apk",
|
| + "chrome_sync_shell_test_apk",
|
| + "content_shell_test_apk",
|
| + "system_webview_shell_layout_test_apk"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -345,17 +331,89 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_build.py",
|
| - "--target",
|
| - "Release",
|
| - "--factory-properties",
|
| - "{\"gclient_env\": {\"GYP_CROSSCOMPILE\": \"1\", \"GYP_DEFINES\": \"OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' linux_dump_symbols=0 target_arch=arm test_isolation_mode=noop use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\", \"target_os\": \"android\"}",
|
| - "--build-properties",
|
| - "{\"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#170242}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"}",
|
| - "--mode",
|
| - "dev"
|
| + "[SLAVE_BUILD]/src/tools/android/find_annotated_tests.py",
|
| + "--test-apks",
|
| + "ContentShellTest SystemWebViewShellLayoutTest ChromePublicTest ChromeSyncShellTest BlimpTest AndroidWebViewTest",
|
| + "--apk-output-dir",
|
| + "[SLAVE_BUILD]/src/out/Debug",
|
| + "--json-output-dir",
|
| + "[TMP_BASE]/annotated_tests_json_temp_tmp_1",
|
| + "--timestamp-string",
|
| + "20160628T014723",
|
| + "-v"
|
| ],
|
| - "name": "archive_build"
|
| + "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": "run find_annotated_tests.py"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| + "--",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| + "----",
|
| + "cp",
|
| + "[TMP_BASE]/annotated_tests_json_temp_tmp_1/20160628T014723-android-chrome.json",
|
| + "gs://chromium-annotated-tests/android"
|
| + ],
|
| + "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@gsutil.upload@https://storage.cloud.google.com/chromium-annotated-tests/android@@@"
|
| + ]
|
| + },
|
| + {
|
| + "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",
|
| + "[TMP_BASE]/annotated_tests_json_temp_tmp_1"
|
| + ],
|
| + "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": "rmtree Delete temp out directory",
|
| + "~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@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "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"
|
| + ],
|
| + "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@@@@",
|
| + "@@@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@@@"
|
| + ]
|
| },
|
| {
|
| "name": "$result",
|
|
|