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

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

Issue 2030713004: Refactor chromium.perf recipe configs. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@2-refactorr
Patch Set: Rebase, hope it's right :) Created 4 years, 5 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
Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_arm64_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_arm64_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_arm64_Builder.json
index 2dd414f2428c3a0d56456b2e33ca2d9b0578441a..2df94336ee209ae76bae6a717c57ad0495536a11 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_arm64_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_arm64_Builder.json
@@ -33,7 +33,7 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\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'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']",
"--root",
"src",
"--revision_mapping_file",
@@ -213,6 +213,42 @@
"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",
+ "[BUILDER_CACHE]/Android_arm64_Builder/src/out/Release/debug_info_dumps",
+ "[BUILDER_CACHE]/Android_arm64_Builder/src/out/Release/test_logs",
+ "[BUILDER_CACHE]/Android_arm64_Builder/src/out/build_product.zip",
+ "[BUILDER_CACHE]/Android_arm64_Builder/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@@@"
+ ]
+ },
+ {
+ "allow_subannotations": false,
+ "cmd": [
+ "[BUILDER_CACHE]/Android_arm64_Builder/src/build/tree_truth.sh",
+ "[BUILDER_CACHE]/Android_arm64_Builder/src",
+ "src"
+ ],
+ "name": "tree truth steps"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[BUILDER_CACHE]/Android_arm64_Builder/src/tools/mb/mb.py",
"gen",
"-m",
@@ -263,9 +299,8 @@
"official",
"--goma-dir",
"[CACHE]/cipd/goma",
- "--goma-hermetic",
- "fallback",
- "--"
+ "--",
+ "chromium_builder_perf"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

Powered by Google App Engine
This is Rietveld 408576698