scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Compile.json - Issue 2436863004: Add new chromium recipe builder to chromium.perf

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

Issue 2436863004: Add new chromium recipe builder to chromium.perf (Closed)

Patch Set: Fix expectation name. Created 4 years, 2 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

Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Compile.json

diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_MIPS_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Compile.json

similarity index 79%

copy from scripts/slave/recipes/chromium.expected/full_chromium_android_Android_MIPS_Builder__dbg_.json

copy to scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Compile.json

index 865cd56d3d842a65c7c45295125e4fc640f9ee01..40434fef158d347a138e402c56476f87502f4310 100644

--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_MIPS_Builder__dbg_.json

+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Compile.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_MIPS_Builder__dbg_",

+ "[BUILDER_CACHE]/Android_Compile",

"511"

"name": "makedirs checkout path",

@@ -27,7 +27,7 @@

"-u",

"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",

"--spec",

- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['android']",

+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'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.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]\ntarget_os = ['android']",

"--patch_root",

"src",

"--revision_mapping_file",

@@ -40,7 +40,7 @@

"src@HEAD",

"--output_manifest"

- "cwd": "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_",

+ "cwd": "[BUILDER_CACHE]/Android_Compile",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -185,13 +185,13 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

- "cwd": "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src",

+ "cwd": "[BUILDER_CACHE]/Android_Compile/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=mipsel use_goma=1",

- "PATH": "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

+ "GYP_DEFINES": "OS=android branding=Chrome buildtype=Official component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",

+ "PATH": "[BUILDER_CACHE]/Android_Compile/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Compile/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks"

@@ -199,16 +199,16 @@

"cmd": [

"python",

"-u",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/testing/scripts/get_compile_targets.py",

+ "[BUILDER_CACHE]/Android_Compile/src/testing/scripts/get_compile_targets.py",

"--output",

"/path/to/tmp/json",

"--",

"--build-config-fs",

- "Debug",

+ "Release",

"--paths",

- "{\"checkout\": \"[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/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_Compile/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",

"--properties",

- "{\"buildername\": \"Android MIPS Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"

+ "{\"buildername\": \"Android Compile\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"

"name": "get compile targets for scripts",

"~followup_annotations": [

@@ -221,12 +221,12 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/testing/buildbot/chromium.android.json",

+ "[BUILDER_CACHE]/Android_Compile/src/testing/buildbot/chromium.perf.json",

"/path/to/tmp/json"

- "name": "read test spec (chromium.android.json)",

+ "name": "read test spec (chromium.perf.json)",

"~followup_annotations": [

- "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/testing/buildbot/chromium.android.json@@@",

+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_Compile/src/testing/buildbot/chromium.perf.json@@@",

"@@@STEP_LOG_LINE@json.output@{}@@@",

"@@@STEP_LOG_END@json.output@@@"

]

@@ -247,10 +247,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_MIPS_Builder__dbg_/src/out/Debug/debug_info_dumps",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/out/Debug/test_logs",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/out/build_product.zip",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src"

+ "[BUILDER_CACHE]/Android_Compile/src/out/Release/debug_info_dumps",

+ "[BUILDER_CACHE]/Android_Compile/src/out/Release/test_logs",

+ "[BUILDER_CACHE]/Android_Compile/src/out/build_product.zip",

+ "[BUILDER_CACHE]/Android_Compile/src"

"name": "clean local files",

"~followup_annotations": [

@@ -271,8 +271,8 @@

{

"cmd": [

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/build/tree_truth.sh",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src",

+ "[BUILDER_CACHE]/Android_Compile/src/build/tree_truth.sh",

+ "[BUILDER_CACHE]/Android_Compile/src",

"src"

"name": "tree truth steps"

@@ -281,19 +281,19 @@

"cmd": [

"python",

"-u",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/tools/mb/mb.py",

+ "[BUILDER_CACHE]/Android_Compile/src/tools/mb/mb.py",

"gen",

"-m",

- "chromium.android",

+ "chromium.perf",

"-b",

- "Android MIPS Builder (dbg)",

+ "Android Compile",

"--config-file",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/tools/mb/mb_config.pyl",

+ "[BUILDER_CACHE]/Android_Compile/src/tools/mb/mb_config.pyl",

"--goma-dir",

"[CACHE]/cipd/goma",

- "//out/Debug"

+ "//out/Release"

- "cwd": "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src",

+ "cwd": "[BUILDER_CACHE]/Android_Compile/src",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"

@@ -312,19 +312,19 @@

"--ninja-path",

"RECIPE_PACKAGE_REPO[depot_tools]/ninja",

"--target",

- "Debug",

+ "Release",

"--src-dir",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src",

+ "[BUILDER_CACHE]/Android_Compile/src",

"--goma-cache-dir",

"[GOMA_CACHE]",

"--buildbot-buildername",

- "Android MIPS Builder (dbg)",

+ "Android Compile",

"--buildbot-mastername",

- "chromium.android",

+ "chromium.perf",

"--buildbot-slavename",

"TestSlavename",

"--goma-deps-cache-file",

- "Android_MIPS_Builder__dbg_.gomadeps",

+ "Android_Compile.gomadeps",

"--build-data-dir",

"[ROOT]/build_data_dir",

"--compiler",

@@ -333,13 +333,16 @@

"/path/to/tmp/json",

"--goma-service-account-json-file",

"/creds/service_accounts/service-account-goma-client.json",

+ "--mode",

+ "official",

"--goma-dir",

"[CACHE]/cipd/goma",

- "--"

+ "--",

+ "chromium_builder_perf"

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/Android_Compile/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Compile/src/build/android:%(PATH)s"

"name": "compile",

"~followup_annotations": [

@@ -357,21 +360,21 @@

"python",

"RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",

"--target",

- "Debug",

+ "Release",

"--gsutil-py-path",

"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

"--staging-dir",

"[CACHE]/chrome_staging",

"--src-dir",

- "[BUILDER_CACHE]/Android_MIPS_Builder__dbg_/src",

+ "[BUILDER_CACHE]/Android_Compile/src",

"--build-url",

- "gs://chromium-android-archive/chromium.android/Android MIPS Builder (dbg)",

+ "gs://chrome-perf/Android Compile",

"--build_revision",

"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android MIPS Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Compile\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"name": "package build"

« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/chromium_perf.py ('k') | no next file » | no next file with comments »