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

Side by Side Diff: scripts/slave/recipes/infra/infra_continuous.expected/infra-64.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 7 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 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", 6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
7 "--master", 7 "--master",
8 "chromium.infra", 8 "chromium.infra",
9 "--builder", 9 "--builder",
10 "infra-continuous-64", 10 "infra-continuous-64",
11 "--slave", 11 "--slave",
12 "TestSlavename", 12 "TestSlavename",
13 "--spec", 13 "--spec",
14 "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googleso urce.com/infra/infra.git'}]", 14 "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'manag ed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infr a.git'}]",
15 "--root", 15 "--root",
16 "infra", 16 "infra",
17 "--revision_mapping_file", 17 "--revision_mapping_file",
18 "{\"infra\": \"got_revision\"}", 18 "{\"infra\": \"got_revision\"}",
19 "--git-cache-dir", 19 "--git-cache-dir",
20 "[ROOT]/b/build/slave/cache_dir", 20 "[GIT_CACHE]",
21 "--output_json", 21 "--output_json",
22 "/path/to/tmp/json", 22 "/path/to/tmp/json",
23 "--revision", 23 "--revision",
24 "infra@c14d891d44f0afff64e56ed7c9702df1d807b1ee", 24 "infra@c14d891d44f0afff64e56ed7c9702df1d807b1ee",
25 "--force", 25 "--force",
26 "--output_manifest" 26 "--output_manifest"
27 ], 27 ],
28 "cwd": "[SLAVE_BUILD]",
28 "env": { 29 "env": {
29 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 30 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
30 }, 31 },
31 "name": "bot_update", 32 "name": "bot_update",
32 "~followup_annotations": [ 33 "~followup_annotations": [
33 "@@@STEP_TEXT@Some step text@@@", 34 "@@@STEP_TEXT@Some step text@@@",
34 "@@@STEP_LOG_LINE@json.output@{@@@", 35 "@@@STEP_LOG_LINE@json.output@{@@@",
35 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", 36 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
36 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", 37 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
37 "@@@STEP_LOG_LINE@json.output@ \"infra\": \"c14d891d44f0afff64e56ed7c97 02df1d807b1ee\"@@@", 38 "@@@STEP_LOG_LINE@json.output@ \"infra\": \"c14d891d44f0afff64e56ed7c97 02df1d807b1ee\"@@@",
(...skipping 18 matching lines...) Expand all
56 "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#197293}\"@@@" 57 "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#197293}\"@@@"
57 ] 58 ]
58 }, 59 },
59 { 60 {
60 "cmd": [ 61 "cmd": [
61 "python", 62 "python",
62 "-u", 63 "-u",
63 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", 64 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
64 "runhooks" 65 "runhooks"
65 ], 66 ],
67 "cwd": "[SLAVE_BUILD]",
66 "env": { 68 "env": {
67 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" 69 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
68 }, 70 },
69 "name": "gclient runhooks" 71 "name": "gclient runhooks"
70 }, 72 },
71 { 73 {
72 "cmd": [ 74 "cmd": [
73 "python", 75 "python",
74 "-u", 76 "-u",
75 "test.py", 77 "test.py",
76 "test" 78 "test"
77 ], 79 ],
78 "cwd": "[CWD]/infra", 80 "cwd": "[SLAVE_BUILD]/infra",
79 "name": "infra python tests" 81 "name": "infra python tests"
80 }, 82 },
81 { 83 {
82 "cmd": [ 84 "cmd": [
83 "python", 85 "python",
84 "-u", 86 "-u",
85 "[CWD]/infra/glyco/tests/run_all_tests.py" 87 "[SLAVE_BUILD]/infra/glyco/tests/run_all_tests.py"
86 ], 88 ],
87 "cwd": "[CWD]/infra", 89 "cwd": "[SLAVE_BUILD]/infra",
88 "name": "Glyco tests" 90 "name": "Glyco tests"
89 }, 91 },
90 { 92 {
91 "cmd": [ 93 "cmd": [
92 "python", 94 "python",
93 "-u", 95 "-u",
94 "[CWD]/infra/go/env.py", 96 "[SLAVE_BUILD]/infra/go/env.py",
95 "go", 97 "go",
96 "version" 98 "version"
97 ], 99 ],
100 "cwd": "[SLAVE_BUILD]",
98 "name": "go third parties" 101 "name": "go third parties"
99 }, 102 },
100 { 103 {
101 "cmd": [ 104 "cmd": [
102 "python", 105 "python",
103 "-u", 106 "-u",
104 "[CWD]/infra/go/env.py", 107 "[SLAVE_BUILD]/infra/go/env.py",
105 "python", 108 "python",
106 "[CWD]/infra/go/test.py" 109 "[SLAVE_BUILD]/infra/go/test.py"
107 ], 110 ],
111 "cwd": "[SLAVE_BUILD]",
108 "name": "infra go tests" 112 "name": "infra go tests"
109 }, 113 },
110 { 114 {
111 "cmd": [ 115 "cmd": [
112 "python", 116 "python",
113 "-u", 117 "-u",
114 "[CWD]/infra/build/build.py", 118 "[SLAVE_BUILD]/infra/build/build.py",
115 "--builder", 119 "--builder",
116 "infra-continuous-64" 120 "infra-continuous-64"
117 ], 121 ],
122 "cwd": "[SLAVE_BUILD]",
118 "name": "cipd - build packages" 123 "name": "cipd - build packages"
119 }, 124 },
120 { 125 {
121 "cmd": [ 126 "cmd": [
122 "python", 127 "python",
123 "-u", 128 "-u",
124 "[CWD]/infra/build/test_packages.py" 129 "[SLAVE_BUILD]/infra/build/test_packages.py"
125 ], 130 ],
131 "cwd": "[SLAVE_BUILD]",
126 "name": "cipd - test packages integrity" 132 "name": "cipd - test packages integrity"
127 }, 133 },
128 { 134 {
129 "cmd": [ 135 "cmd": [
130 "python", 136 "python",
131 "-u", 137 "-u",
132 "[CWD]/infra/build/build.py", 138 "[SLAVE_BUILD]/infra/build/build.py",
133 "--no-rebuild", 139 "--no-rebuild",
134 "--upload", 140 "--upload",
135 "--service-account-json", 141 "--service-account-json",
136 "/creds/service_accounts/service-account-cipd-builder.json", 142 "/creds/service_accounts/service-account-cipd-builder.json",
137 "--json-output", 143 "--json-output",
138 "/path/to/tmp/json", 144 "/path/to/tmp/json",
139 "--builder", 145 "--builder",
140 "infra-continuous-64", 146 "infra-continuous-64",
141 "--tags", 147 "--tags",
142 "buildbot_build:chromium.infra/infra-continuous-64/123", 148 "buildbot_build:chromium.infra/infra-continuous-64/123",
143 "git_repository:https://chromium.googlesource.com/infra/infra", 149 "git_repository:https://chromium.googlesource.com/infra/infra",
144 "git_revision:5e03a58dc0850e5137a8ebbce29610670c756aed" 150 "git_revision:5e03a58dc0850e5137a8ebbce29610670c756aed"
145 ], 151 ],
152 "cwd": "[SLAVE_BUILD]",
146 "name": "cipd - upload packages", 153 "name": "cipd - upload packages",
147 "~followup_annotations": [ 154 "~followup_annotations": [
148 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", 155 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
149 "@@@STEP_LOG_END@json.output (invalid)@@@" 156 "@@@STEP_LOG_END@json.output (invalid)@@@"
150 ] 157 ]
151 }, 158 },
152 { 159 {
153 "cmd": [ 160 "cmd": [
154 "python", 161 "python",
155 "-u", 162 "-u",
156 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\npath = sys.argv[1]\nif os.path.exists(path):\n for p in (o s.path.join(path, x) for x in os.listdir(path)):\n if os.path.isdir(p):\n chromium_utils.RemoveDirectory(p)\n else:\n os.unlink(p)\n", 163 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\npath = sys.argv[1]\nif os.path.exists(path):\n for p in (o s.path.join(path, x) for x in os.listdir(path)):\n if os.path.isdir(p):\n chromium_utils.RemoveDirectory(p)\n else:\n os.unlink(p)\n",
157 "[CWD]/infra/go/bin" 164 "[SLAVE_BUILD]/infra/go/bin"
158 ], 165 ],
166 "cwd": "[SLAVE_BUILD]",
159 "name": "rmcontents clean go bin", 167 "name": "rmcontents clean go bin",
160 "~followup_annotations": [ 168 "~followup_annotations": [
161 "@@@STEP_LOG_LINE@python.inline@@@@", 169 "@@@STEP_LOG_LINE@python.inline@@@@",
162 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", 170 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
163 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", 171 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
164 "@@@STEP_LOG_LINE@python.inline@@@@", 172 "@@@STEP_LOG_LINE@python.inline@@@@",
165 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", 173 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
166 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(path):@@@", 174 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(path):@@@",
167 "@@@STEP_LOG_LINE@python.inline@ for p in (os.path.join(path, x) for x in os.listdir(path)):@@@", 175 "@@@STEP_LOG_LINE@python.inline@ for p in (os.path.join(path, x) for x in os.listdir(path)):@@@",
168 "@@@STEP_LOG_LINE@python.inline@ if os.path.isdir(p):@@@", 176 "@@@STEP_LOG_LINE@python.inline@ if os.path.isdir(p):@@@",
169 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(p)@@@ ", 177 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(p)@@@ ",
170 "@@@STEP_LOG_LINE@python.inline@ else:@@@", 178 "@@@STEP_LOG_LINE@python.inline@ else:@@@",
171 "@@@STEP_LOG_LINE@python.inline@ os.unlink(p)@@@", 179 "@@@STEP_LOG_LINE@python.inline@ os.unlink(p)@@@",
172 "@@@STEP_LOG_END@python.inline@@@" 180 "@@@STEP_LOG_END@python.inline@@@"
173 ] 181 ]
174 }, 182 },
175 { 183 {
176 "cmd": [ 184 "cmd": [
177 "python", 185 "python",
178 "-u", 186 "-u",
179 "[CWD]/infra/go/env.py", 187 "[SLAVE_BUILD]/infra/go/env.py",
180 "go", 188 "go",
181 "install", 189 "install",
182 "github.com/luci/luci-go/client/cmd/..." 190 "github.com/luci/luci-go/client/cmd/..."
183 ], 191 ],
192 "cwd": "[SLAVE_BUILD]",
184 "name": "build luci-go" 193 "name": "build luci-go"
185 }, 194 },
186 { 195 {
187 "cmd": [ 196 "cmd": [
188 "python", 197 "python",
189 "-u", 198 "-u",
190 "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir( sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys .argv[1]), f)\n", 199 "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir( sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys .argv[1]), f)\n",
191 "[CWD]/infra/go/bin", 200 "[SLAVE_BUILD]/infra/go/bin",
192 "/path/to/tmp/json" 201 "/path/to/tmp/json"
193 ], 202 ],
203 "cwd": "[SLAVE_BUILD]",
194 "name": "listdir listing go bin", 204 "name": "listdir listing go bin",
195 "~followup_annotations": [ 205 "~followup_annotations": [
196 "@@@STEP_LOG_LINE@json.output@[@@@", 206 "@@@STEP_LOG_LINE@json.output@[@@@",
197 "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", 207 "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@",
198 "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", 208 "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@",
199 "@@@STEP_LOG_LINE@json.output@]@@@", 209 "@@@STEP_LOG_LINE@json.output@]@@@",
200 "@@@STEP_LOG_END@json.output@@@", 210 "@@@STEP_LOG_END@json.output@@@",
201 "@@@STEP_LOG_LINE@python.inline@@@@", 211 "@@@STEP_LOG_LINE@python.inline@@@@",
202 "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", 212 "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@",
203 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path .isdir(sys.argv[1]):@@@", 213 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path .isdir(sys.argv[1]):@@@",
204 "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", 214 "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@",
205 "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@ @@", 215 "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@ @@",
206 "@@@STEP_LOG_END@python.inline@@@" 216 "@@@STEP_LOG_END@python.inline@@@"
207 ] 217 ]
208 }, 218 },
209 { 219 {
210 "cmd": [ 220 "cmd": [
211 "python", 221 "python",
212 "-u", 222 "-u",
213 "[ROOT]/b/depot_tools/upload_to_google_storage.py", 223 "[DEPOT_TOOLS]/upload_to_google_storage.py",
214 "-b", 224 "-b",
215 "chromium-luci", 225 "chromium-luci",
216 "[CWD]/infra/go/bin/file 1", 226 "[SLAVE_BUILD]/infra/go/bin/file 1",
217 "[CWD]/infra/go/bin/file 2" 227 "[SLAVE_BUILD]/infra/go/bin/file 2"
218 ], 228 ],
229 "cwd": "[SLAVE_BUILD]",
219 "name": "upload go bin" 230 "name": "upload go bin"
220 }, 231 },
221 { 232 {
222 "cmd": [ 233 "cmd": [
223 "python", 234 "python",
224 "-u", 235 "-u",
225 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", 236 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
226 "[CWD]/infra/go/bin/file 1.sha1", 237 "[SLAVE_BUILD]/infra/go/bin/file 1.sha1",
227 "/path/to/tmp/" 238 "/path/to/tmp/"
228 ], 239 ],
240 "cwd": "[SLAVE_BUILD]",
229 "name": "file 1 sha1", 241 "name": "file 1 sha1",
230 "~followup_annotations": [ 242 "~followup_annotations": [
231 "@@@STEP_TEXT@0123456789abcdeffedcba987654321012345678@@@" 243 "@@@STEP_TEXT@0123456789abcdeffedcba987654321012345678@@@"
232 ] 244 ]
233 }, 245 },
234 { 246 {
235 "cmd": [ 247 "cmd": [
236 "python", 248 "python",
237 "-u", 249 "-u",
238 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", 250 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
239 "[CWD]/infra/go/bin/file 2.sha1", 251 "[SLAVE_BUILD]/infra/go/bin/file 2.sha1",
240 "/path/to/tmp/" 252 "/path/to/tmp/"
241 ], 253 ],
254 "cwd": "[SLAVE_BUILD]",
242 "name": "file 2 sha1", 255 "name": "file 2 sha1",
243 "~followup_annotations": [ 256 "~followup_annotations": [
244 "@@@STEP_TEXT@0123456789abcdeffedcba987654321012345678@@@" 257 "@@@STEP_TEXT@0123456789abcdeffedcba987654321012345678@@@"
245 ] 258 ]
246 }, 259 },
247 { 260 {
248 "name": "$result", 261 "name": "$result",
249 "recipe_result": null, 262 "recipe_result": null,
250 "status_code": 0 263 "status_code": 0
251 } 264 }
252 ] 265 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698