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

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

Issue 2112743002: Move Mojo bots to chromium_fyi; remove mojo master. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Add 'use_isolate': True and 'enable_swarming': True. 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
Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mojo_ChromiumOS.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_GN.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mojo_ChromiumOS.json
similarity index 96%
copy from scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_GN.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mojo_ChromiumOS.json
index 730c201c57f2eee2474722669e5e9665bc985b5a..b273a5b9a5c5ea771b49404027c4b84f3b725285 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_GN.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Mojo_ChromiumOS.json
@@ -5,9 +5,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "chromium.chromiumos",
+ "chromium.fyi",
"--builder",
- "Linux ChromiumOS GN",
+ "Mojo ChromiumOS",
"--slave",
"TestSlavename",
"--spec",
@@ -183,7 +183,7 @@
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=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",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -198,11 +198,10 @@
"--",
"--build-config-fs",
"Release",
- "--use-src-side-runtest-py",
"--paths",
"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"Linux ChromiumOS GN\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"slavename\": \"TestSlavename\", \"target_platform\": \"chromeos\"}"
+ "{\"buildername\": \"Mojo ChromiumOS\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"chromeos\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -215,14 +214,14 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
"/path/to/tmp/json"
],
- "name": "read test spec (chromium.chromiumos.json)",
+ "name": "read test spec (chromium.fyi.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"Linux ChromiumOS GN\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Mojo ChromiumOS\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
@@ -265,9 +264,9 @@
"[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
- "chromium.chromiumos",
+ "chromium.fyi",
"-b",
- "Linux ChromiumOS GN",
+ "Mojo ChromiumOS",
"--config-file",
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"--goma-dir",

Powered by Google App Engine
This is Rietveld 408576698