| Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_one_perf_bisect.json
|
| diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_one_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_one_perf_bisect.json
|
| index 18817f1b90944d312898232883d1cf2be106259e..2bd645ffcb1a4efe1e5172885a6d28206571af81 100644
|
| --- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_one_perf_bisect.json
|
| +++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_one_perf_bisect.json
|
| @@ -30,7 +30,6 @@
|
| "src@1111111",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -112,7 +111,6 @@
|
| "[SLAVE_BUILD]/src/out/build_product.zip",
|
| "[SLAVE_BUILD]/src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -154,7 +152,6 @@
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "create adb symlink"
|
| },
|
| {
|
| @@ -164,7 +161,6 @@
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| - "cwd": "[SLAVE_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"
|
| @@ -180,7 +176,6 @@
|
| "--adb-path",
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[SLAVE_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"
|
| @@ -197,7 +192,6 @@
|
| "--known-devices-file",
|
| "[BUILD]/site_config/.known_devices"
|
| ],
|
| - "cwd": "[SLAVE_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"
|
| @@ -317,7 +311,6 @@
|
| "350",
|
| "--remove-system-webview"
|
| ],
|
| - "cwd": "[SLAVE_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"
|
| @@ -342,7 +335,6 @@
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| @@ -352,7 +344,6 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -368,7 +359,6 @@
|
| "-u",
|
| "RECIPE_MODULE[build::bisect_tester]/resources/put_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "saving url to temp file",
|
| "stdin": "http://build.chromium.org/p/tryserver.chromium.perf/json/builders/android_one_perf_bisect/builds/571",
|
| "stdout": "/path/to/tmp/"
|
| @@ -385,7 +375,6 @@
|
| "/tmp/dummy1",
|
| "gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil bisect-results/f7a7b4135624439cbd27fdd5133d74ec",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec@@@"
|
| @@ -398,7 +387,6 @@
|
| "\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"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -425,7 +413,6 @@
|
| "gs://chrome-perf/test-archive.zip",
|
| "[SLAVE_BUILD]/src/out/build_product.zip"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil download_build_product"
|
| },
|
| {
|
| @@ -446,7 +433,6 @@
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--release"
|
| ],
|
| - "cwd": "[SLAVE_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"
|
| @@ -477,7 +463,6 @@
|
| "--browser=android-chromium",
|
| "page_cycler.intl_ar_fa_he"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Performance Test 1 of 2",
|
| "stderr": "/path/to/tmp/",
|
| "stdout": "/path/to/tmp/",
|
| @@ -509,7 +494,6 @@
|
| "--browser=android-chromium",
|
| "page_cycler.intl_ar_fa_he"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Performance Test 2 of 2",
|
| "stderr": "/path/to/tmp/",
|
| "stdout": "/path/to/tmp/",
|
| @@ -523,7 +507,6 @@
|
| "-u",
|
| "RECIPE_MODULE[build::bisect_tester]/resources/put_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "saving json to temp file",
|
| "stdin": "{\"output\": [], \"results\": {\"values\": [0, 0]}, \"retcodes\": [0, 0]}",
|
| "stdout": "/path/to/tmp/"
|
| @@ -540,7 +523,6 @@
|
| "/tmp/dummy2",
|
| "gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results@@@"
|
| @@ -553,7 +535,6 @@
|
| "\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/Release/test_logs/*.log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -576,7 +557,6 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| @@ -588,7 +568,6 @@
|
| "[SLAVE_BUILD]/src/out/Release/full_log",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -609,7 +588,6 @@
|
| "[SLAVE_BUILD]/src/out/Release/full_log",
|
| "gs://chromium-android/logcat_dumps/android_one_perf_bisect/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_one_perf_bisect/571@@@"
|
| @@ -623,7 +601,6 @@
|
| "--more-info",
|
| "[SLAVE_BUILD]/src/out/Release/full_log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -638,7 +615,6 @@
|
| "-s",
|
| "-w"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -653,7 +629,6 @@
|
| "\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/Release/test_logs/*.log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_report (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|