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

Side by Side Diff: infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json

Issue 2242213007: Try to use bot_update in Skia repo recipes Base URL: https://skia.googlesource.com/skia@master
Patch Set: Update expectations Created 4 years, 4 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 "python", 4 "python",
5 "-u", 5 "-u",
6 "\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", 6 "\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",
7 "[CUSTOM_/_B_WORK]", 7 "[CUSTOM_/_B_WORK]",
8 "511" 8 "511"
9 ], 9 ],
10 "name": "makedirs checkout_path", 10 "name": "makedirs checkout_path",
11 "~followup_annotations": [ 11 "~followup_annotations": [
12 "@@@STEP_LOG_LINE@python.inline@@@@", 12 "@@@STEP_LOG_LINE@python.inline@@@@",
13 "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", 13 "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
14 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", 14 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
15 "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", 15 "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
16 "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", 16 "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
17 "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", 17 "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
18 "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", 18 "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
19 "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", 19 "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
20 "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", 20 "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
21 "@@@STEP_LOG_END@python.inline@@@" 21 "@@@STEP_LOG_END@python.inline@@@"
22 ] 22 ]
23 }, 23 },
24 { 24 {
25 "cmd": [ 25 "cmd": [
26 "python", 26 "python",
27 "-u", 27 "-u",
28 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 28 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
29 "config", 29 "--master",
30 "client.skia.compile",
31 "--builder",
32 "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
33 "--slave",
34 "skiabot-linux-swarm-000",
30 "--spec", 35 "--spec",
31 "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'man aged': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium. googlesource.com/chromium/src.git'}]\ntarget_os = ['llvm']" 36 "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'man aged': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium. googlesource.com/chromium/src.git'}]\ntarget_os = ['llvm']",
37 "--root",
38 "skia",
39 "--revision_mapping_file",
40 "{\"skia\": \"got_revision\"}",
41 "--git-cache-dir",
42 "[CUSTOM_/_B_CACHE]",
43 "--output_json",
44 "/path/to/tmp/json",
45 "--revision",
46 "skia@abc123",
47 "--revision",
48 "src@origin/lkgr",
49 "--force",
50 "--output_manifest"
32 ], 51 ],
33 "cwd": "[CUSTOM_/_B_WORK]", 52 "cwd": "[CUSTOM_/_B_WORK]",
34 "env": { 53 "env": {
35 "BUILDTYPE": "Debug", 54 "BUILDTYPE": "Debug",
36 "CHROME_HEADLESS": "1", 55 "CHROME_HEADLESS": "1",
37 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", 56 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
38 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Comma ndBuffer" 57 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Comma ndBuffer"
39 }, 58 },
40 "name": "gclient setup" 59 "name": "bot_update",
41 },
42 {
43 "cmd": [
44 "python",
45 "-u",
46 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
47 "sync",
48 "--nohooks",
49 "--force",
50 "--verbose",
51 "--delete_unversioned_trees",
52 "--revision",
53 "skia@abc123",
54 "--revision",
55 "src@origin/lkgr",
56 "--output-json",
57 "/path/to/tmp/json"
58 ],
59 "cwd": "[CUSTOM_/_B_WORK]",
60 "env": {
61 "BUILDTYPE": "Debug",
62 "CHROME_HEADLESS": "1",
63 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]",
64 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Comma ndBuffer"
65 },
66 "name": "gclient sync",
67 "~followup_annotations": [ 60 "~followup_annotations": [
61 "@@@STEP_TEXT@Some step text@@@",
68 "@@@STEP_LOG_LINE@json.output@{@@@", 62 "@@@STEP_LOG_LINE@json.output@{@@@",
69 "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", 63 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
70 "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", 64 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
71 "@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@", 65 "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@",
72 "@@@STEP_LOG_LINE@json.output@ }, @@@", 66 "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkgr\"@@@",
73 "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@", 67 "@@@STEP_LOG_LINE@json.output@ }, @@@",
74 "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@", 68 "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
69 "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
70 "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/ski a.git\", @@@",
71 "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b 694580e5d17ad10748\"@@@",
75 "@@@STEP_LOG_LINE@json.output@ }@@@", 72 "@@@STEP_LOG_LINE@json.output@ }@@@",
76 "@@@STEP_LOG_LINE@json.output@ }@@@", 73 "@@@STEP_LOG_LINE@json.output@ }, @@@",
74 "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
75 "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
76 "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
77 "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e97 2b694580e5d17ad10748\", @@@",
78 "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master @{#164710}\"@@@",
79 "@@@STEP_LOG_LINE@json.output@ }, @@@",
80 "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
81 "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
77 "@@@STEP_LOG_LINE@json.output@}@@@", 82 "@@@STEP_LOG_LINE@json.output@}@@@",
78 "@@@STEP_LOG_END@json.output@@@", 83 "@@@STEP_LOG_END@json.output@@@",
79 "@@@SET_BUILD_PROPERTY@got_revision@164710@@@" 84 "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad1 0748\"@@@",
85 "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
80 ] 86 ]
81 }, 87 },
82 { 88 {
83 "cmd": [ 89 "cmd": [
84 "python", 90 "python",
85 "-u", 91 "-u",
86 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 92 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
87 "runhooks" 93 "runhooks"
88 ], 94 ],
89 "cwd": "[CUSTOM_/_B_WORK]", 95 "cwd": "[CUSTOM_/_B_WORK]",
90 "env": { 96 "env": {
91 "GYP_CHROMIUM_NO_ACTION": "0", 97 "GYP_CHROMIUM_NO_ACTION": "0",
92 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 98 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
93 }, 99 },
94 "name": "gclient runhooks" 100 "name": "gclient runhooks"
95 }, 101 },
96 { 102 {
97 "cmd": [ 103 "cmd": [
98 "make", 104 "make",
99 "most" 105 "most"
100 ], 106 ],
101 "cwd": "[CUSTOM_/_B_WORK]/skia", 107 "cwd": "[CUSTOM_/_B_WORK]/skia",
102 "env": { 108 "env": {
103 "BUILDTYPE": "Debug", 109 "BUILDTYPE": "Debug",
104 "CC": "/usr/bin/clang", 110 "CC": "/usr/bin/clang",
105 "CHROME_HEADLESS": "1", 111 "CHROME_HEADLESS": "1",
106 "CHROME_PATH": "[SLAVE_BUILD]/src", 112 "CHROME_PATH": "[SLAVE_BUILD]/src",
107 "CXX": "/usr/bin/clang++", 113 "CXX": "/usr/bin/clang++",
108 "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buff er=1 skia_warnings_as_errors=1", 114 "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buff er=1 skia_warnings_as_errors=1",
109 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]", 115 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
110 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Comma ndBuffer" 116 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Comma ndBuffer"
111 }, 117 },
112 "name": "build most" 118 "name": "build most"
113 }, 119 },
114 { 120 {
115 "cmd": [ 121 "cmd": [
116 "python", 122 "python",
117 "-u", 123 "-u",
118 "[CUSTOM_/_B_WORK]/skia/tools/build_command_buffer.py", 124 "[CUSTOM_/_B_WORK]/skia/tools/build_command_buffer.py",
119 "--chrome-dir", 125 "--chrome-dir",
120 "[CUSTOM_/_B_WORK]", 126 "[CUSTOM_/_B_WORK]",
121 "--output-dir", 127 "--output-dir",
122 "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Deb ug", 128 "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Deb ug",
123 "--chrome-build-type", 129 "--chrome-build-type",
124 "Debug", 130 "Debug",
125 "--no-sync" 131 "--no-sync"
126 ], 132 ],
127 "env": { 133 "env": {
128 "BUILDTYPE": "Debug", 134 "BUILDTYPE": "Debug",
129 "CC": "/usr/bin/clang", 135 "CC": "/usr/bin/clang",
130 "CHROME_HEADLESS": "1", 136 "CHROME_HEADLESS": "1",
131 "CHROME_PATH": "[SLAVE_BUILD]/src", 137 "CHROME_PATH": "[SLAVE_BUILD]/src",
132 "CXX": "/usr/bin/clang++", 138 "CXX": "/usr/bin/clang++",
133 "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buff er=1 skia_warnings_as_errors=1", 139 "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buff er=1 skia_warnings_as_errors=1",
134 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]", 140 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
135 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Comma ndBuffer" 141 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-Comma ndBuffer"
136 }, 142 },
137 "name": "build command_buffer" 143 "name": "build command_buffer"
138 }, 144 },
139 { 145 {
140 "cmd": [ 146 "cmd": [
141 "python", 147 "python",
142 "-u", 148 "-u",
143 "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get _images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '* .so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell .ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs( dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor patt ern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f i n glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.d irname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", 149 "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get _images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '* .so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell .ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs( dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor patt ern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f i n glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.d irname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
144 "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Deb ug", 150 "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Deb ug",
(...skipping 27 matching lines...) Expand all
172 "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", 178 "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
173 "@@@STEP_LOG_END@python.inline@@@" 179 "@@@STEP_LOG_END@python.inline@@@"
174 ] 180 ]
175 }, 181 },
176 { 182 {
177 "name": "$result", 183 "name": "$result",
178 "recipe_result": null, 184 "recipe_result": null,
179 "status_code": 0 185 "status_code": 0
180 } 186 }
181 ] 187 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698