| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Client_Android.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Android_Release__Nexus_9_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Client_Android.json
|
| similarity index 82%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Android_Release__Nexus_9_.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Client_Android.json
|
| index ee98f1465f04e0615bc3785b1a2c69697d54e61a..c4e88ffeba7261e1342021fedb12e635398f82a4 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Android_Release__Nexus_9_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Client_Android.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_Release__Nexus_9_",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -40,7 +40,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Release__Nexus_9_",
|
| + "cwd": "[BUILDER_CACHE]/Blimp_Client_Android",
|
| "env": {
|
| "GCLIENT_KILL_GIT_FETCH_AFTER": "1200",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| @@ -183,16 +183,29 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/tools/swarming_client/swarming.py",
|
| + "--version"
|
| + ],
|
| + "name": "swarming.py --version",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@0.8.6@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Release__Nexus_9_/src",
|
| + "cwd": "[BUILDER_CACHE]/Blimp_Client_Android/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 use_goma=1",
|
| - "PATH": "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Release__Nexus_9_/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]/Blimp_Client_Android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Blimp_Client_Android/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -200,17 +213,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| - "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Android_Release__Nexus_9_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/Blimp_Client_Android/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Android Release (Nexus 9)\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"Blimp Client Android\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -223,13 +235,24 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/testing/buildbot/chromium.gpu.fyi.json",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "read test spec (chromium.gpu.fyi.json)",
|
| + "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_Release__Nexus_9_/src/testing/buildbot/chromium.gpu.fyi.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/Blimp_Client_Android/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Blimp Client Android\": {@@@",
|
| + "@@@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@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -249,10 +272,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_Release__Nexus_9_/src/out/Debug/debug_info_dumps",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/out/Debug/test_logs",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/out/build_product.zip",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src"
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/out/Release/debug_info_dumps",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/out/Release/test_logs",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -273,8 +296,8 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/build/tree_truth.sh",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/build/tree_truth.sh",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src",
|
| "src"
|
| ],
|
| "name": "tree truth steps"
|
| @@ -283,19 +306,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium.gpu.fyi",
|
| + "chromium.fyi",
|
| "-b",
|
| - "Android Release (Nexus 9)",
|
| + "Blimp Client Android",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Release__Nexus_9_/src",
|
| + "cwd": "[BUILDER_CACHE]/Blimp_Client_Android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -316,13 +339,13 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Android_Release__Nexus_9_/src",
|
| + "[BUILDER_CACHE]/Blimp_Client_Android/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "Android Release (Nexus 9)",
|
| + "Blimp Client Android",
|
| "--buildbot-mastername",
|
| - "chromium.gpu.fyi",
|
| + "chromium.fyi",
|
| "--buildbot-slavename",
|
| "TestSlavename",
|
| "--goma-deps-cache-dir",
|
| @@ -341,7 +364,7 @@
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Release__Nexus_9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Release__Nexus_9_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/Blimp_Client_Android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Blimp_Client_Android/src/build/android:%(PATH)s"
|
| },
|
| "name": "compile",
|
| "~followup_annotations": [
|
|
|