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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/dont_deapply_patch.json

Issue 2327543002: chromium_tests: add an option to disable deapplying patch on some trybots (Closed)
Patch Set: rebase 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/recipes/chromium_trybot.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_trybot.expected/dont_deapply_patch.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_mac_chromium_rel_ng.json b/scripts/slave/recipes/chromium_trybot.expected/dont_deapply_patch.json
similarity index 78%
copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_mac_chromium_rel_ng.json
copy to scripts/slave/recipes/chromium_trybot.expected/dont_deapply_patch.json
index cf7223f1834005b6ac2f6065e5d99d418e377792..a00baaad0f9f2a3b96e78225319cd745b1563811 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_mac_mac_chromium_rel_ng.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/dont_deapply_patch.json
@@ -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'}]",
+ "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'}]",
"--root",
"src",
"--revision_mapping_file",
@@ -44,6 +44,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
+ "--revision",
+ "src/third_party/angle@HEAD",
"--output_manifest"
],
"cwd": "[BUILDER_CACHE]/mac",
@@ -56,7 +58,8 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
@@ -206,10 +209,9 @@
],
"cwd": "[BUILDER_CACHE]/mac/src",
"env": {
- "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "archive_gpu_tests=1 clang=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 clang=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' internal_gles2_conform_tests=1 proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks (with patch)"
@@ -228,7 +230,7 @@
"--paths",
"{\"checkout\": \"[BUILDER_CACHE]/mac/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"mac_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
+ "{\"buildername\": \"mac_optional_gpu_tests_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
],
"name": "get compile targets for scripts",
"~followup_annotations": [
@@ -241,28 +243,19 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.gpu.json",
- "/path/to/tmp/json"
- ],
- "name": "read test spec (chromium.gpu.json)",
- "~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.gpu.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json",
+ "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.gpu.fyi.json",
"/path/to/tmp/json"
],
- "name": "read test spec (chromium.mac.json)",
+ "name": "read test spec (chromium.gpu.fyi.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.gpu.fyi.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Optional Mac Retina Release\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -318,17 +311,19 @@
"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
"@@@STEP_LOG_END@excluded_files@@@",
"@@@STEP_LOG_LINE@analyze_details@{@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\"@@@",
- "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"chromium_builder_tests\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": []@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ ]@@@",
"@@@STEP_LOG_LINE@analyze_details@}@@@",
"@@@STEP_LOG_END@analyze_details@@@"
]
@@ -353,7 +348,7 @@
"-m",
"tryserver.chromium.mac",
"-b",
- "mac_chromium_rel_ng",
+ "mac_optional_gpu_tests_rel",
"--config-file",
"[BUILDER_CACHE]/mac/src/tools/mb/mb_config.pyl",
"--goma-dir",
@@ -362,7 +357,6 @@
],
"cwd": "[BUILDER_CACHE]/mac/src",
"env": {
- "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
"name": "generate_build_files (with patch)"
@@ -379,7 +373,6 @@
"/path/to/tmp/json"
],
"env": {
- "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
"name": "clang_revision",
@@ -409,7 +402,7 @@
"--goma-cache-dir",
"[GOMA_CACHE]",
"--buildbot-buildername",
- "mac_chromium_rel_ng",
+ "mac_optional_gpu_tests_rel",
"--buildbot-mastername",
"tryserver.chromium.mac",
"--buildbot-slavename",
@@ -428,10 +421,9 @@
"--goma-disable-local-fallback",
"--ninja-ensure-up-to-date",
"--",
- "chromium_builder_tests"
+ "base_unittests"
],
"env": {
- "FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
"name": "compile (with patch)",
@@ -449,6 +441,38 @@
"name": "mark: before_tests"
},
{
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILDER_CACHE]/mac/src/infra/scripts/runtest_wrapper.py",
+ "--",
+ "--target",
+ "Release",
+ "--factory-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"mac_optional_gpu_tests_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.mac\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "--build-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"mac_optional_gpu_tests_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.mac\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "--annotate=gtest",
+ "--test-type=base_unittests",
+ "--step-name=base_unittests (with patch)",
+ "--test-launcher-summary-output",
+ "/path/to/tmp/json",
+ "--generate-json-file",
+ "-o",
+ "gtest-results/base_unittests",
+ "--builder-name=mac_optional_gpu_tests_rel",
+ "--slave-name=TestSlavename",
+ "--build-number=571",
+ "base_unittests"
+ ],
+ "cwd": "[BUILDER_CACHE]/mac",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "base_unittests (with patch)"
+ },
+ {
"name": "$result",
"recipe_result": null,
"status_code": 0
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698