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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/android/find_annotated_tests.expected/find_annotated_tests_basic.json

Issue 2063323002: Create recipe to run find_annotated_tests.py periodically (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Add into steps.py Created 4 years, 6 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
« no previous file with comments | « scripts/slave/recipes/android/find_annotated_tests.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/android/find_annotated_tests.expected/find_annotated_tests_basic.json
diff --git a/scripts/slave/recipes/dart/dartium_android_builder.expected/dartium_builder_git.json b/scripts/slave/recipes/android/find_annotated_tests.expected/find_annotated_tests_basic.json
similarity index 53%
copy from scripts/slave/recipes/dart/dartium_android_builder.expected/dartium_builder_git.json
copy to scripts/slave/recipes/android/find_annotated_tests.expected/find_annotated_tests_basic.json
index 5af623590ebc59a33bc910ace8e115a5a3d0e92c..4061faba16c168c2b839efaa94c6f1d7c1e43757 100644
--- a/scripts/slave/recipes/dart/dartium_android_builder.expected/dartium_builder_git.json
+++ b/scripts/slave/recipes/android/find_annotated_tests.expected/find_annotated_tests_basic.json
@@ -3,23 +3,37 @@
"cmd": [
"python",
"-u",
- "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
- "[SLAVE_BUILD]"
+ "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "--master",
+ "InfraCron",
+ "--builder",
+ "Chromium Android Find Annotated Tests",
+ "--slave",
+ "TestSlavename",
+ "--spec",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\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\"}",
+ "--git-cache-dir",
+ "[GIT_CACHE]",
+ "--output_json",
+ "/path/to/tmp/json",
+ "--revision",
+ "src@HEAD",
+ "--output_manifest"
],
- "name": "cleanup index.lock",
+ "env": {
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "bot_update",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@@@",
- "@@@STEP_LOG_LINE@python.inline@ path_to_file = os.path.join(path, cur_file)@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'deleting %s' % path_to_file@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.remove(path_to_file)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"did_run\": false, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
@@ -29,7 +43,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'tools/deps/dartium.deps/DEPS', 'managed': True, 'name': 'src/dart', 'url': 'https://github.com/dart-lang/sdk.git'}]\ntarget_os = ['android']"
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
@@ -46,10 +60,6 @@
"--force",
"--verbose",
"--delete_unversioned_trees",
- "--revision",
- "src/dart@478695f60c28b5b8a951ce1d4fd60f53d80b21fb",
- "--revision",
- "src/dart@478695f60c28b5b8a951ce1d4fd60f53d80b21fb",
"--output-json",
"/path/to/tmp/json"
],
@@ -66,9 +76,6 @@
"@@@STEP_LOG_LINE@json.output@ \"src/buildtools/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": 182578@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/dart/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 58622@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
@@ -88,9 +95,9 @@
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
- "@@@SET_BUILD_PROPERTY@got_src_revision@170242@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
"@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
+ "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@170242@@@",
"@@@SET_BUILD_PROPERTY@got_angle_revision@297276@@@",
"@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
"@@@SET_BUILD_PROPERTY@got_buildtools_revision@182578@@@"
@@ -100,49 +107,6 @@
"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/Release/debug_info_dumps",
- "[SLAVE_BUILD]/src/out/Release/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@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "runhooks"
- ],
- "cwd": "[SLAVE_BUILD]/src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/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"
- },
- {
- "cmd": [
- "python",
- "-u",
"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
"--show-path",
"python",
@@ -168,7 +132,12 @@
"--goma-dir",
"[BUILD]/goma",
"--",
- "content_shell_apk"
+ "content_shell_test_apk",
+ "system_webview_shell_layout_test_apk",
+ "chrome_public_test_apk",
+ "chrome_sync_shell_test_apk",
+ "blimp_test_apk",
+ "android_webview_test_apk"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -184,11 +153,54 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/dart/tools/bots/dartium_android.py",
- "--build-products-dir",
- "[SLAVE_BUILD]/src/out/Release"
+ "[SLAVE_BUILD]/src/tools/android/find_annotated_tests.py",
+ "--test-apks",
+ "ContentShellTest SystemWebViewShellLayoutTest ChromePublicTest ChromeSyncShellTest BlimpTest AndroidWebViewTest",
+ "--apk-output-dir",
+ "[SLAVE_BUILD]/src/out/Release",
+ "--json-output-dir",
+ "[TMP_BASE]/annotated_tests_json_temp_tmp_1",
+ "--timestamp-string",
+ "20160621T230159",
+ "-v"
+ ],
+ "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/20160621T230159-android-chrome.json",
+ "gs://chromium-annotated-tests/android"
+ ],
+ "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"
],
- "name": "dartium_test"
+ "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@@@"
+ ]
},
{
"name": "$result",
« no previous file with comments | « scripts/slave/recipes/android/find_annotated_tests.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698