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

Side by Side Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Wrong_downloaded_SKP_VERSION.json

Issue 2270963002: Make skia recipes explicitly set GIT_MODE (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
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 unified diff | Download patch
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "git", 4 "git",
5 "remote", 5 "remote",
6 "set-url", 6 "set-url",
7 "origin", 7 "origin",
8 "https://skia.googlesource.com/skia.git" 8 "https://skia.googlesource.com/skia.git"
9 ], 9 ],
10 "cwd": "[SLAVE_BUILD]/skia", 10 "cwd": "[SLAVE_BUILD]/skia",
(...skipping 27 matching lines...) Expand all
38 "cwd": "[SLAVE_BUILD]/skia", 38 "cwd": "[SLAVE_BUILD]/skia",
39 "name": "git clean" 39 "name": "git clean"
40 }, 40 },
41 { 41 {
42 "cmd": [ 42 "cmd": [
43 "python", 43 "python",
44 "-u", 44 "-u",
45 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 45 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
46 "config", 46 "config",
47 "--spec", 47 "--spec",
48 "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'n ame': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['l lvm']" 48 "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': Fals e, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
49 ], 49 ],
50 "env": { 50 "env": {
51 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 51 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
52 }, 52 },
53 "name": "gclient setup" 53 "name": "gclient setup"
54 }, 54 },
55 { 55 {
56 "cmd": [ 56 "cmd": [
57 "python", 57 "python",
58 "-u", 58 "-u",
59 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 59 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
60 "sync", 60 "sync",
61 "--verbose",
62 "--with_branch_heads",
61 "--nohooks", 63 "--nohooks",
64 "-j8",
65 "--reset",
62 "--force", 66 "--force",
63 "--verbose", 67 "--upstream",
68 "--no-nag-max",
64 "--delete_unversioned_trees", 69 "--delete_unversioned_trees",
65 "--revision", 70 "--revision",
66 "skia@abc123", 71 "skia@abc123",
67 "--output-json", 72 "--output-json",
68 "/path/to/tmp/json" 73 "/path/to/tmp/json"
69 ], 74 ],
70 "env": { 75 "env": {
71 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 76 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
72 }, 77 },
73 "name": "gclient sync", 78 "name": "gclient sync",
74 "~followup_annotations": [ 79 "~followup_annotations": [
75 "@@@STEP_LOG_LINE@json.output@{@@@", 80 "@@@STEP_LOG_LINE@json.output@{@@@",
76 "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", 81 "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
77 "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", 82 "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",
78 "@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@", 83 "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b 694580e5d17ad10748\"@@@",
79 "@@@STEP_LOG_LINE@json.output@ }@@@", 84 "@@@STEP_LOG_LINE@json.output@ }@@@",
80 "@@@STEP_LOG_LINE@json.output@ }@@@", 85 "@@@STEP_LOG_LINE@json.output@ }@@@",
81 "@@@STEP_LOG_LINE@json.output@}@@@", 86 "@@@STEP_LOG_LINE@json.output@}@@@",
82 "@@@STEP_LOG_END@json.output@@@", 87 "@@@STEP_LOG_END@json.output@@@",
83 "@@@SET_BUILD_PROPERTY@got_revision@164710@@@" 88 "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad1 0748\"@@@"
84 ] 89 ]
85 }, 90 },
86 { 91 {
87 "cmd": [ 92 "cmd": [
88 "python", 93 "python",
89 "-u", 94 "-u",
95 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
96 "recurse",
97 "git",
98 "config",
99 "user.name",
100 "local_bot"
101 ],
102 "env": {
103 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
104 },
105 "name": "gclient recurse (git config user.name)"
106 },
107 {
108 "cmd": [
109 "python",
110 "-u",
111 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
112 "recurse",
113 "git",
114 "config",
115 "user.email",
116 "local_bot@example.com"
117 ],
118 "env": {
119 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
120 },
121 "name": "gclient recurse (git config user.email)"
122 },
123 {
124 "cmd": [
125 "python",
126 "-u",
90 "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", 127 "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
91 "--path", 128 "--path",
92 "[SLAVE_BUILD]/swarming.client", 129 "[SLAVE_BUILD]/swarming.client",
93 "--url", 130 "--url",
94 "https://chromium.googlesource.com/external/swarming.client.git" 131 "https://chromium.googlesource.com/external/swarming.client.git"
95 ], 132 ],
96 "name": "git setup (swarming_client)" 133 "name": "git setup (swarming_client)"
97 }, 134 },
98 { 135 {
99 "cmd": [ 136 "cmd": [
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 "--", 626 "--",
590 "--workdir", 627 "--workdir",
591 "../../..", 628 "../../..",
592 "skia/swarm_compile", 629 "skia/swarm_compile",
593 "buildername=Build-Ubuntu-GCC-x86_64-Debug", 630 "buildername=Build-Ubuntu-GCC-x86_64-Debug",
594 "mastername=client.skia.compile", 631 "mastername=client.skia.compile",
595 "buildnumber=1", 632 "buildnumber=1",
596 "slavename=skiabot-dummy-compile-slave", 633 "slavename=skiabot-dummy-compile-slave",
597 "reason=Triggered by Skia swarm_trigger Recipe", 634 "reason=Triggered by Skia swarm_trigger Recipe",
598 "swarm_out_dir=${ISOLATED_OUTDIR}", 635 "swarm_out_dir=${ISOLATED_OUTDIR}",
599 "revision=164710" 636 "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
600 ], 637 ],
601 "name": "[trigger] compile_skia on Ubuntu", 638 "name": "[trigger] compile_skia on Ubuntu",
602 "~followup_annotations": [ 639 "~followup_annotations": [
603 "@@@STEP_LOG_LINE@json.output@{@@@", 640 "@@@STEP_LOG_LINE@json.output@{@@@",
604 "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/ def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@", 641 "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/ def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@",
605 "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", 642 "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
606 "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/def456/Test-Ubuntu -GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@", 643 "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/def456/Test-Ubuntu -GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@",
607 "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", 644 "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
608 "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", 645 "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
609 "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm .appspot.com/user/task/10000\"@@@", 646 "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm .appspot.com/user/task/10000\"@@@",
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 "--", 1003 "--",
967 "--workdir", 1004 "--workdir",
968 "../../..", 1005 "../../..",
969 "skia/swarm_test", 1006 "skia/swarm_test",
970 "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", 1007 "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
971 "mastername=client.skia", 1008 "mastername=client.skia",
972 "buildnumber=5", 1009 "buildnumber=5",
973 "slavename=skiabot-linux-test-000", 1010 "slavename=skiabot-linux-test-000",
974 "reason=Triggered by Skia swarm_trigger Recipe", 1011 "reason=Triggered by Skia swarm_trigger Recipe",
975 "swarm_out_dir=${ISOLATED_OUTDIR}", 1012 "swarm_out_dir=${ISOLATED_OUTDIR}",
976 "revision=164710" 1013 "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
977 ], 1014 ],
978 "name": "[trigger] test_skia on Ubuntu", 1015 "name": "[trigger] test_skia on Ubuntu",
979 "~followup_annotations": [ 1016 "~followup_annotations": [
980 "@@@STEP_LOG_LINE@json.output@{@@@", 1017 "@@@STEP_LOG_LINE@json.output@{@@@",
981 "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def 456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@", 1018 "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def 456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@",
982 "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", 1019 "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
983 "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GC C-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@", 1020 "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GC C-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@",
984 "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", 1021 "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
985 "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", 1022 "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
986 "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm .appspot.com/user/task/10000\"@@@", 1023 "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm .appspot.com/user/task/10000\"@@@",
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 "--", 1182 "--",
1146 "--workdir", 1183 "--workdir",
1147 "../../..", 1184 "../../..",
1148 "skia/swarm_perf", 1185 "skia/swarm_perf",
1149 "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", 1186 "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
1150 "mastername=client.skia", 1187 "mastername=client.skia",
1151 "buildnumber=5", 1188 "buildnumber=5",
1152 "slavename=skiabot-linux-test-000", 1189 "slavename=skiabot-linux-test-000",
1153 "reason=Triggered by Skia swarm_trigger Recipe", 1190 "reason=Triggered by Skia swarm_trigger Recipe",
1154 "swarm_out_dir=${ISOLATED_OUTDIR}", 1191 "swarm_out_dir=${ISOLATED_OUTDIR}",
1155 "revision=164710" 1192 "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
1156 ], 1193 ],
1157 "name": "[trigger] perf_skia on Ubuntu", 1194 "name": "[trigger] perf_skia on Ubuntu",
1158 "~followup_annotations": [ 1195 "~followup_annotations": [
1159 "@@@STEP_LOG_LINE@json.output@{@@@", 1196 "@@@STEP_LOG_LINE@json.output@{@@@",
1160 "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"perf_skia/Ubuntu/def 456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@", 1197 "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"perf_skia/Ubuntu/def 456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@",
1161 "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", 1198 "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
1162 "@@@STEP_LOG_LINE@json.output@ \"perf_skia/Ubuntu/def456/Test-Ubuntu-GC C-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@", 1199 "@@@STEP_LOG_LINE@json.output@ \"perf_skia/Ubuntu/def456/Test-Ubuntu-GC C-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@",
1163 "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", 1200 "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
1164 "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", 1201 "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
1165 "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm .appspot.com/user/task/10000\"@@@", 1202 "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm .appspot.com/user/task/10000\"@@@",
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 "0" 1318 "0"
1282 ], 1319 ],
1283 "name": "dm_dir" 1320 "name": "dm_dir"
1284 }, 1321 },
1285 { 1322 {
1286 "cmd": [ 1323 "cmd": [
1287 "python", 1324 "python",
1288 "-u", 1325 "-u",
1289 "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py", 1326 "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
1290 "[SLAVE_BUILD]/dm", 1327 "[SLAVE_BUILD]/dm",
1291 "164710", 1328 "9046e2e693bb92a76e972b694580e5d17ad10748",
1292 "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug", 1329 "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
1293 "5", 1330 "5",
1294 "", 1331 "",
1295 "[SLAVE_BUILD]/skia/common/py/utils" 1332 "[SLAVE_BUILD]/skia/common/py/utils"
1296 ], 1333 ],
1297 "cwd": "[SLAVE_BUILD]/skia", 1334 "cwd": "[SLAVE_BUILD]/skia",
1298 "env": { 1335 "env": {
1299 "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto", 1336 "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
1300 "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto" 1337 "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
1301 }, 1338 },
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
1381 "@@@STEP_LINK@shard #0 isolated out@blah@@@", 1418 "@@@STEP_LINK@shard #0 isolated out@blah@@@",
1382 "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/ta sk/148aa78d7aa0000@@@" 1419 "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/ta sk/148aa78d7aa0000@@@"
1383 ] 1420 ]
1384 }, 1421 },
1385 { 1422 {
1386 "name": "$result", 1423 "name": "$result",
1387 "recipe_result": null, 1424 "recipe_result": null,
1388 "status_code": 0 1425 "status_code": 0
1389 } 1426 }
1390 ] 1427 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698