Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(488)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Blimp_Integration_Test.json

Issue 2269303002: Set up Blimp Integration script on FYI bot (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Set up Blimp Integration script on FYI bot Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipe_modules/chromium_tests/steps.py ('k') | scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Blimp_Integration_Test.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Find_Annotated_Test.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Blimp_Integration_Test.json
similarity index 74%
copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Find_Annotated_Test.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Blimp_Integration_Test.json
index d8a5d13790abed0799c6d3c711d894dfeb70c0e3..a2fc90aa7809ac395c89decf7b4c0ef19c42404b 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Find_Annotated_Test.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Blimp_Integration_Test.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_Find_Annotated_Test",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test",
"511"
],
"name": "makedirs checkout path",
@@ -29,7 +29,7 @@
"--master",
"chromium.fyi",
"--builder",
- "Android Find Annotated Test",
+ "Android Blimp Integration Test",
"--slave",
"TestSlavename",
"--spec",
@@ -47,7 +47,7 @@
"--force",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]/Android_Find_Annotated_Test",
+ "cwd": "[BUILDER_CACHE]/Android_Blimp_Integration_Test",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -188,13 +188,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]/Android_Find_Annotated_Test/src",
+ "cwd": "[BUILDER_CACHE]/Android_Blimp_Integration_Test/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": "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Find_Annotated_Test/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "PATH": "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -202,16 +202,16 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Debug",
"--paths",
- "{\"checkout\": \"[BUILDER_CACHE]/Android_Find_Annotated_Test/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]/Android_Blimp_Integration_Test/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"Android Find Annotated Test\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
+ "{\"buildername\": \"Android Blimp Integration Test\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -224,12 +224,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/testing/buildbot/chromium.fyi.json",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/testing/buildbot/chromium.fyi.json",
"/path/to/tmp/json"
],
"name": "read test spec (chromium.fyi.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_Find_Annotated_Test/src/testing/buildbot/chromium.fyi.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_Blimp_Integration_Test/src/testing/buildbot/chromium.fyi.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -250,10 +250,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_Find_Annotated_Test/src/out/Debug/debug_info_dumps",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/out/Debug/test_logs",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/out/build_product.zip",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src"
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/out/Debug/debug_info_dumps",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/out/Debug/test_logs",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/out/build_product.zip",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src"
],
"name": "clean local files",
"~followup_annotations": [
@@ -275,8 +275,8 @@
{
"allow_subannotations": false,
"cmd": [
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/build/tree_truth.sh",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/build/tree_truth.sh",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src",
"src"
],
"name": "tree truth steps"
@@ -286,7 +286,7 @@
"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",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/out/Debug"
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/out/Debug"
],
"name": "rmtree build directory",
"~followup_annotations": [
@@ -313,7 +313,7 @@
"--target",
"Debug",
"--src-dir",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src",
"--build-archive-url",
"gs://test-domain/test-archive.zip",
"--master-name",
@@ -327,88 +327,112 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/tools/android/find_annotated_tests.py",
- "--apk-output-dir",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/out/Debug",
- "--json-output-dir",
- "[TMP_BASE]/annotated_tests_json_tmp_1",
- "--timestamp-string",
- "20160101T000000",
- "-v",
- "--test-apks",
- "ContentShellTest",
- "SystemWebViewShellLayoutTest",
- "ChromePublicTest",
- "ChromeSyncShellTest",
- "BlimpTest",
- "AndroidWebViewTest"
+ "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
+ "--root=[BUILDER_CACHE]/Android_Blimp_Integration_Test/src",
+ "gen",
+ "//out/Release",
+ "--args=is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"RECIPE_PACKAGE_REPO[build]/goma\""
],
- "cwd": "[BUILDER_CACHE]/Android_Find_Annotated_Test/src",
+ "cwd": "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Find_Annotated_Test/src/build/android:%(PATH)s"
+ "PATH": "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/build/android:%(PATH)s"
},
- "name": "run find_annotated_tests.py"
+ "name": "gn"
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
- "--",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
+ "python",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
+ "--gsutil-py-path",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "[TMP_BASE]/annotated_tests_json_tmp_1/20160101T000000-android-chrome.json",
- "gs://chromium-annotated-tests/android"
+ "--ninja-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
+ "--target",
+ "Release",
+ "--src-dir",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src",
+ "--goma-cache-dir",
+ "[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
+ "--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",
+ "--goma-dir",
+ "RECIPE_PACKAGE_REPO[build]/goma",
+ "--",
+ "blimp"
],
- "cwd": "[BUILDER_CACHE]/Android_Find_Annotated_Test",
+ "cwd": "[BUILDER_CACHE]/Android_Blimp_Integration_Test",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Find_Annotated_Test/src/build/android:%(PATH)s"
+ "PATH": "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/build/android:%(PATH)s"
},
- "name": "gsutil upload",
+ "name": "compile",
"~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-annotated-tests/android@@@"
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
]
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
- "[TMP_BASE]/annotated_tests_json_tmp_1"
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/blimp/tools/client_engine_integration.py",
+ "--output-linux-directory",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/out-linux/Debug",
+ "start"
],
- "cwd": "[BUILDER_CACHE]/Android_Find_Annotated_Test",
+ "cwd": "[BUILDER_CACHE]/Android_Blimp_Integration_Test",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Find_Annotated_Test/src/build/android:%(PATH)s"
+ "PATH": "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/build/android:%(PATH)s"
},
- "name": "rmtree [TMP_BASE]/annotated_tests_json_tmp_1"
+ "name": "client_engine_integration.py start"
},
{
"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",
- "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/out/Debug/test_logs/*.log"
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/blimp/tools/client_engine_integration.py",
+ "--output-linux-directory",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/out-linux/Debug",
+ "load",
+ "--apk-path",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/out-android/Debug/Blimp.apk"
],
- "cwd": "[BUILDER_CACHE]/Android_Find_Annotated_Test",
+ "cwd": "[BUILDER_CACHE]/Android_Blimp_Integration_Test",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[BUILDER_CACHE]/Android_Find_Annotated_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Find_Annotated_Test/src/build/android:%(PATH)s"
+ "PATH": "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Blimp_Integration_Test/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": "client_engine_integration.py load"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/blimp/tools/client_engine_integration.py",
+ "--output-linux-directory",
+ "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/out-linux/Debug",
+ "stop"
+ ],
+ "cwd": "[BUILDER_CACHE]/Android_Blimp_Integration_Test",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Blimp_Integration_Test/src/build/android:%(PATH)s"
+ },
+ "name": "client_engine_integration.py stop"
},
{
"name": "$result",
« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipe_modules/chromium_tests/steps.py ('k') | scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Builder__dbg_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698