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

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

Issue 2319343002: Deploy Mac ASAN bot on chromium.gpu.fyi waterfall. (Closed)
Patch Set: Created 4 years, 3 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/recipe_modules/chromium_tests/chromium_gpu_fyi.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/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mojo_ChromiumOS.json b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.json
similarity index 85%
copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mojo_ChromiumOS.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.json
index 22523145439a84b2b1234222bb281d6255ce8b28..3d27bedf7ef90f803ed12bf696a3a8e6ec8f7d1d 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mojo_ChromiumOS.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_fyi_Mac_GPU_ASAN_Release.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]/Mojo_ChromiumOS",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release",
"511"
],
"name": "makedirs checkout path",
@@ -27,9 +27,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "chromium.fyi",
+ "chromium.gpu.fyi",
"--builder",
- "Mojo ChromiumOS",
+ "Mac GPU ASAN Release",
"--slave",
"TestSlavename",
"--spec",
@@ -47,9 +47,8 @@
"--force",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]/Mojo_ChromiumOS",
+ "cwd": "[BUILDER_CACHE]/Mac_GPU_ASAN_Release",
"env": {
- "GCLIENT_KILL_GIT_FETCH_AFTER": "1200",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "bot_update",
@@ -138,7 +137,7 @@
"-u",
"RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
"--platform",
- "linux-amd64",
+ "mac-amd64",
"--dest-directory",
"[SLAVE_BUILD]/cipd",
"--json-output",
@@ -162,7 +161,7 @@
"--root",
"[CACHE]/cipd/goma",
"--list",
- "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
+ "infra/tools/cloudtail/mac-amd64 goma_recipe_module\ninfra_internal/goma/client/mac-amd64 release",
"--json-output",
"/path/to/tmp/json",
"--service-account-json",
@@ -175,11 +174,11 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/mac-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
@@ -190,7 +189,7 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/tools/swarming_client/swarming.py",
"--version"
],
"name": "swarming.py --version",
@@ -206,12 +205,10 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]/Mojo_ChromiumOS/src",
+ "cwd": "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/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": "chromeos=1 component=static_library ffmpeg_branding=ChromeOS gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -220,16 +217,17 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/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]/Mojo_ChromiumOS/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"Mojo ChromiumOS\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"chromeos\"}"
+ "{\"buildername\": \"Mac GPU ASAN Release\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -242,14 +240,14 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/testing/buildbot/chromium.fyi.json",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/testing/buildbot/chromium.gpu.fyi.json",
"/path/to/tmp/json"
],
- "name": "read test spec (chromium.fyi.json)",
+ "name": "read test spec (chromium.gpu.fyi.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/Mojo_ChromiumOS/src/testing/buildbot/chromium.fyi.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/testing/buildbot/chromium.gpu.fyi.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"Mojo ChromiumOS\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Mac GPU ASAN Release\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
@@ -280,37 +278,31 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/out/Release",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/out/Release",
"--clean-isolated-files"
],
"name": "clean isolated files"
},
{
+ "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/tools/mb/mb.py",
- "gen",
- "-m",
- "chromium.fyi",
- "-b",
- "Mojo ChromiumOS",
- "--config-file",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/tools/mb/mb_config.pyl",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "--swarming-targets-file",
- "browser_tests\n",
- "//out/Release"
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
+ "--src-dir",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src",
+ "--output-json",
+ "/path/to/tmp/json"
],
- "cwd": "[BUILDER_CACHE]/Mojo_ChromiumOS/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "generate_build_files",
+ "name": "clang_revision",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests@@@",
- "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
@@ -328,13 +320,13 @@
"--target",
"Release",
"--src-dir",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
"--buildbot-buildername",
- "Mojo ChromiumOS",
+ "Mac GPU ASAN Release",
"--buildbot-mastername",
- "chromium.fyi",
+ "chromium.gpu.fyi",
"--buildbot-slavename",
"TestSlavename",
"--goma-deps-cache-dir",
@@ -342,13 +334,14 @@
"--build-data-dir",
"[ROOT]/build_data_dir",
"--compiler",
- "goma",
+ "goma-clang",
"--goma-jsonstatus",
"/path/to/tmp/json",
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
"[CACHE]/cipd/goma",
+ "--ninja-ensure-up-to-date",
"--",
"browser_tests",
"browser_tests_run"
@@ -366,9 +359,9 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/tools/determinism/remove_build_metadata.py",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/tools/determinism/remove_build_metadata.py",
"--build-dir",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/out/Release"
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/out/Release"
],
"cwd": "[SLAVE_BUILD]",
"name": "remove_build_metadata"
@@ -378,14 +371,14 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/tools/swarming_client",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/out/Release/browser_tests.isolated.gen.json"
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/out/Release/browser_tests.isolated.gen.json"
],
"name": "isolate tests",
"~followup_annotations": [
@@ -401,11 +394,11 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[BUILDER_CACHE]/Mojo_ChromiumOS/src/out/Release",
+ "[BUILDER_CACHE]/Mac_GPU_ASAN_Release/src/out/Release",
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[BUILDER_CACHE]/Mojo_ChromiumOS",
+ "cwd": "[BUILDER_CACHE]/Mac_GPU_ASAN_Release",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -426,7 +419,7 @@
"\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
"browser_tests"
],
- "cwd": "[BUILDER_CACHE]/Mojo_ChromiumOS",
+ "cwd": "[BUILDER_CACHE]/Mac_GPU_ASAN_Release",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -446,7 +439,7 @@
"\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
"browser_tests"
],
- "cwd": "[BUILDER_CACHE]/Mojo_ChromiumOS",
+ "cwd": "[BUILDER_CACHE]/Mac_GPU_ASAN_Release",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698