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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2097223002: Remove traces of removed Mac/Win GN builders. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: 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
« scripts/slave/recipe_modules/chromium_tests/chromium_webrtc_fyi.py ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac_GN__dbg_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_GN__dbg_.json » ('j') | tests/masters_recipes_test.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_GN.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_GN.json b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_GN.json
index 0266d6f23e5f63cb0af53bfa7e362248c8b39b9c..049805eeea59ad019b5b4f6b68bf4342c8232b4e 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_GN.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_GN.json
@@ -205,7 +205,7 @@
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 clang=1 component=static_library ffmpeg_branding=Chrome 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"
@@ -242,18 +242,7 @@
"name": "read test spec (chromium.webrtc.fyi.json)",
"~followup_annotations": [
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.webrtc.fyi.json@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"Mac GN\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -272,17 +261,6 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
- "--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
- "--clean-isolated-files"
- ],
- "name": "clean isolated files"
- },
- {
- "cmd": [
- "python",
- "-u",
"[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
@@ -293,19 +271,13 @@
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
- "--swarming-targets-file",
- "browser_tests\n",
"//out/Release"
],
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "generate_build_files",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests@@@",
- "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
- ]
+ "name": "generate_build_files"
},
{
"allow_subannotations": true,
@@ -360,9 +332,9 @@
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
"[CACHE]/cipd/goma",
+ "--ninja-ensure-up-to-date",
"--",
- "browser_tests",
- "browser_tests_run"
+ "chromium_builder_tests"
],
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
@@ -375,103 +347,26 @@
]
},
{
+ "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
- "--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
- "--src-dir",
- "[SLAVE_BUILD]/src"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "remove_build_metadata"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
- "batcharchive",
- "--dump-json",
- "/path/to/tmp/json",
- "--isolate-server",
- "https://isolateserver.appspot.com",
- "--verbose",
- "[SLAVE_BUILD]/src/out/Release/browser_tests.isolated.gen.json"
- ],
- "name": "isolate tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"browser_tests\": \"[dummy hash for browser_tests]\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
- "--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
- "--output-json",
- "/path/to/tmp/json"
- ],
- "env": {
- "FORCE_MAC_TOOLCHAIN": "1",
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "find isolated tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
- "browser_tests"
- ],
- "env": {
- "FORCE_MAC_TOOLCHAIN": "1",
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "[error] browser_tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@print '*.isolated file for target %s is missing' % sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
"python",
- "-u",
- "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
- "browser_tests"
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",
+ "--target",
+ "Release",
+ "--build-url",
+ "gs://chromium-webrtc/chromium.webrtc.fyi/Mac GN",
+ "--build_revision",
+ "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
+ "--factory-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac GN\", \"buildnumber\": 571, \"mastername\": \"chromium.webrtc.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "--build-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac GN\", \"buildnumber\": 571, \"mastername\": \"chromium.webrtc.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
],
- "env": {
- "FORCE_MAC_TOOLCHAIN": "1",
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "[collect error] browser_tests",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@print '%s wasn\\'t triggered' % sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "name": "package build"
},
{
"name": "$result",
« scripts/slave/recipe_modules/chromium_tests/chromium_webrtc_fyi.py ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac_GN__dbg_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_GN__dbg_.json » ('j') | tests/masters_recipes_test.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698