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

Side by Side Diff: scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/win.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[build::cipd]\\resources\\bootstrap.py", 6 "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py",
7 "--platform", 7 "--platform",
8 "windows-amd64", 8 "windows-amd64",
9 "--dest-directory", 9 "--dest-directory",
10 "[CWD]\\cipd", 10 "[SLAVE_BUILD]\\cipd",
11 "--json-output", 11 "--json-output",
12 "/path/to/tmp/json" 12 "/path/to/tmp/json"
13 ], 13 ],
14 "cwd": "[SLAVE_BUILD]",
14 "name": "install cipd", 15 "name": "install cipd",
15 "~followup_annotations": [ 16 "~followup_annotations": [
16 "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@ @", 17 "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@ @",
17 "@@@STEP_LOG_LINE@json.output@{@@@", 18 "@@@STEP_LOG_LINE@json.output@{@@@",
18 "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@", 19 "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]\\\\cipd\\\ \cipd\", @@@",
19 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-pa ckage-instance_id\"@@@", 20 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-pa ckage-instance_id\"@@@",
20 "@@@STEP_LOG_LINE@json.output@}@@@", 21 "@@@STEP_LOG_LINE@json.output@}@@@",
21 "@@@STEP_LOG_END@json.output@@@" 22 "@@@STEP_LOG_END@json.output@@@"
22 ] 23 ]
23 }, 24 },
24 { 25 {
25 "cmd": [ 26 "cmd": [
26 "python", 27 "python",
27 "-u", 28 "-u",
28 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveD irectory(sys.argv[1])\n", 29 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveD irectory(sys.argv[1])\n",
29 "[CWD]\\conda_staging_dir" 30 "[SLAVE_BUILD]\\conda_staging_dir"
30 ], 31 ],
32 "cwd": "[SLAVE_BUILD]",
31 "name": "rmtree cleaning staging dir", 33 "name": "rmtree cleaning staging dir",
32 "~followup_annotations": [ 34 "~followup_annotations": [
33 "@@@STEP_LOG_LINE@python.inline@@@@", 35 "@@@STEP_LOG_LINE@python.inline@@@@",
34 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", 36 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
35 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", 37 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
36 "@@@STEP_LOG_LINE@python.inline@@@@", 38 "@@@STEP_LOG_LINE@python.inline@@@@",
37 "@@@STEP_LOG_LINE@python.inline@@@@", 39 "@@@STEP_LOG_LINE@python.inline@@@@",
38 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", 40 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
39 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@", 41 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@",
40 "@@@STEP_LOG_END@python.inline@@@" 42 "@@@STEP_LOG_END@python.inline@@@"
41 ] 43 ]
42 }, 44 },
43 { 45 {
44 "cmd": [ 46 "cmd": [
45 "python", 47 "python",
46 "-u", 48 "-u",
47 "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\pycurl.py", 49 "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\pycurl.py",
48 "https://repo.continuum.io/miniconda/Miniconda2-3.18.3-Windows-x86_64.exe" , 50 "https://repo.continuum.io/miniconda/Miniconda2-3.18.3-Windows-x86_64.exe" ,
49 "--outfile", 51 "--outfile",
50 "[TMP]\\conda_tmp_1\\Miniconda2-3.18.3-Windows-x86_64.exe", 52 "[TMP_BASE]\\conda_tmp_1\\Miniconda2-3.18.3-Windows-x86_64.exe",
51 "--attempts", 53 "--attempts",
52 "5" 54 "5"
53 ], 55 ],
56 "cwd": "[SLAVE_BUILD]",
54 "name": "fetch miniconda installer" 57 "name": "fetch miniconda installer"
55 }, 58 },
56 { 59 {
57 "cmd": [ 60 "cmd": [
58 "[TMP]\\conda_tmp_1\\Miniconda2-3.18.3-Windows-x86_64.exe", 61 "[TMP_BASE]\\conda_tmp_1\\Miniconda2-3.18.3-Windows-x86_64.exe",
59 "/InstallationType=JustMe", 62 "/InstallationType=JustMe",
60 "/AddToPath=0", 63 "/AddToPath=0",
61 "/RegisterPython=0", 64 "/RegisterPython=0",
62 "/S", 65 "/S",
63 "/D=[CWD]\\conda_staging_dir" 66 "/D=[SLAVE_BUILD]\\conda_staging_dir"
64 ], 67 ],
68 "cwd": "[SLAVE_BUILD]",
65 "env": { 69 "env": {
66 "PYTHONPATH": "" 70 "PYTHONPATH": ""
67 }, 71 },
68 "name": "install miniconda" 72 "name": "install miniconda"
69 }, 73 },
70 { 74 {
71 "cmd": [ 75 "cmd": [
72 "python", 76 "python",
73 "-u", 77 "-u",
74 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveD irectory(sys.argv[1])\n", 78 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveD irectory(sys.argv[1])\n",
75 "[TMP]\\conda_tmp_1" 79 "[TMP_BASE]\\conda_tmp_1"
76 ], 80 ],
81 "cwd": "[SLAVE_BUILD]",
77 "name": "rmtree remove miniconda installer", 82 "name": "rmtree remove miniconda installer",
78 "~followup_annotations": [ 83 "~followup_annotations": [
79 "@@@STEP_LOG_LINE@python.inline@@@@", 84 "@@@STEP_LOG_LINE@python.inline@@@@",
80 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", 85 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
81 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", 86 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
82 "@@@STEP_LOG_LINE@python.inline@@@@", 87 "@@@STEP_LOG_LINE@python.inline@@@@",
83 "@@@STEP_LOG_LINE@python.inline@@@@", 88 "@@@STEP_LOG_LINE@python.inline@@@@",
84 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", 89 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
85 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@", 90 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@",
86 "@@@STEP_LOG_END@python.inline@@@" 91 "@@@STEP_LOG_END@python.inline@@@"
87 ] 92 ]
88 }, 93 },
89 { 94 {
90 "cmd": [ 95 "cmd": [
91 "[CWD]\\conda_staging_dir\\Scripts\\conda.exe", 96 "[SLAVE_BUILD]\\conda_staging_dir\\Scripts\\conda.exe",
92 "install", 97 "install",
93 "matplotlib", 98 "matplotlib",
94 "--yes" 99 "--yes"
95 ], 100 ],
101 "cwd": "[SLAVE_BUILD]",
96 "env": { 102 "env": {
97 "PYTHONPATH": null 103 "PYTHONPATH": null
98 }, 104 },
99 "name": "conda install matplotlib" 105 "name": "conda install matplotlib"
100 }, 106 },
101 { 107 {
102 "cmd": [ 108 "cmd": [
103 "[CWD]\\conda_staging_dir\\Scripts\\conda.exe", 109 "[SLAVE_BUILD]\\conda_staging_dir\\Scripts\\conda.exe",
104 "install", 110 "install",
105 "numpy", 111 "numpy",
106 "--yes" 112 "--yes"
107 ], 113 ],
114 "cwd": "[SLAVE_BUILD]",
108 "env": { 115 "env": {
109 "PYTHONPATH": null 116 "PYTHONPATH": null
110 }, 117 },
111 "name": "conda install numpy" 118 "name": "conda install numpy"
112 }, 119 },
113 { 120 {
114 "cmd": [ 121 "cmd": [
115 "[CWD]\\conda_staging_dir\\Scripts\\conda.exe", 122 "[SLAVE_BUILD]\\conda_staging_dir\\Scripts\\conda.exe",
116 "install", 123 "install",
117 "scipy", 124 "scipy",
118 "--yes" 125 "--yes"
119 ], 126 ],
127 "cwd": "[SLAVE_BUILD]",
120 "env": { 128 "env": {
121 "PYTHONPATH": null 129 "PYTHONPATH": null
122 }, 130 },
123 "name": "conda install scipy" 131 "name": "conda install scipy"
124 }, 132 },
125 { 133 {
126 "cmd": [ 134 "cmd": [
127 "[CWD]\\conda_staging_dir\\Scripts\\conda.exe", 135 "[SLAVE_BUILD]\\conda_staging_dir\\Scripts\\conda.exe",
128 "clean", 136 "clean",
129 "--tarballs", 137 "--tarballs",
130 "--index-cache", 138 "--index-cache",
131 "--packages", 139 "--packages",
132 "--yes" 140 "--yes"
133 ], 141 ],
142 "cwd": "[SLAVE_BUILD]",
134 "env": { 143 "env": {
135 "PYTHONPATH": null 144 "PYTHONPATH": null
136 }, 145 },
137 "name": "conda clean --tarballs --index-cache --packages" 146 "name": "conda clean --tarballs --index-cache --packages"
138 }, 147 },
139 { 148 {
140 "cmd": [ 149 "cmd": [
141 "python", 150 "python",
142 "-u", 151 "-u",
143 "RECIPE_MODULE[build::conda]\\resources\\butcher_conda.py", 152 "RECIPE_MODULE[build::conda]\\resources\\butcher_conda.py",
144 "[CWD]\\conda_staging_dir" 153 "[SLAVE_BUILD]\\conda_staging_dir"
145 ], 154 ],
155 "cwd": "[SLAVE_BUILD]",
146 "name": "make conda env location independent" 156 "name": "make conda env location independent"
147 }, 157 },
148 { 158 {
149 "cmd": [ 159 "cmd": [
150 "fake_slave_build/cipd", 160 "[SLAVE_BUILD]\\cipd\\cipd",
151 "pkg-build", 161 "pkg-build",
152 "--in", 162 "--in",
153 "[CWD]\\conda_staging_dir", 163 "[SLAVE_BUILD]\\conda_staging_dir",
154 "--name", 164 "--name",
155 "infra/conda_python/scientific/windows-amd64", 165 "infra/conda_python/scientific/windows-amd64",
156 "--out", 166 "--out",
157 "[CWD]\\conda_python.cipd", 167 "[SLAVE_BUILD]\\conda_python.cipd",
158 "--json-output", 168 "--json-output",
159 "/path/to/tmp/json", 169 "/path/to/tmp/json",
160 "--install-mode", 170 "--install-mode",
161 "copy" 171 "copy"
162 ], 172 ],
173 "cwd": "[SLAVE_BUILD]",
163 "name": "build windows-amd64", 174 "name": "build windows-amd64",
164 "~followup_annotations": [ 175 "~followup_annotations": [
165 "@@@STEP_LOG_LINE@json.output@{@@@", 176 "@@@STEP_LOG_LINE@json.output@{@@@",
166 "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", 177 "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
167 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the- package-instance_id\", @@@", 178 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the- package-instance_id\", @@@",
168 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/conda_python/scient ific/windows-amd64\"@@@", 179 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/conda_python/scient ific/windows-amd64\"@@@",
169 "@@@STEP_LOG_LINE@json.output@ }@@@", 180 "@@@STEP_LOG_LINE@json.output@ }@@@",
170 "@@@STEP_LOG_LINE@json.output@}@@@", 181 "@@@STEP_LOG_LINE@json.output@}@@@",
171 "@@@STEP_LOG_END@json.output@@@" 182 "@@@STEP_LOG_END@json.output@@@"
172 ] 183 ]
173 }, 184 },
174 { 185 {
175 "cmd": [ 186 "cmd": [
176 "fake_slave_build/cipd", 187 "[SLAVE_BUILD]\\cipd\\cipd",
177 "pkg-register", 188 "pkg-register",
178 "[CWD]\\conda_python.cipd", 189 "[SLAVE_BUILD]\\conda_python.cipd",
179 "--json-output", 190 "--json-output",
180 "/path/to/tmp/json", 191 "/path/to/tmp/json",
181 "--service-account-json", 192 "--service-account-json",
182 "C:\\creds\\service_accounts\\service-account-cipd-builder.json", 193 "C:\\creds\\service_accounts\\service-account-cipd-builder.json",
183 "--ref", 194 "--ref",
184 "latest", 195 "latest",
185 "--tag", 196 "--tag",
186 "buildbot_build:chromium.testing.master/TestBuilder/571", 197 "buildbot_build:chromium.testing.master/TestBuilder/571",
187 "--tag", 198 "--tag",
188 "conda:Miniconda2-3-18-3" 199 "conda:Miniconda2-3-18-3"
189 ], 200 ],
201 "cwd": "[SLAVE_BUILD]",
190 "name": "register infra/conda_python/scientific/windows-amd64", 202 "name": "register infra/conda_python/scientific/windows-amd64",
191 "~followup_annotations": [ 203 "~followup_annotations": [
192 "@@@STEP_LOG_LINE@json.output@{@@@", 204 "@@@STEP_LOG_LINE@json.output@{@@@",
193 "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", 205 "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
194 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the- package-instance_id\", @@@", 206 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the- package-instance_id\", @@@",
195 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/conda_python/scient ific/windows-amd64\"@@@", 207 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/conda_python/scient ific/windows-amd64\"@@@",
196 "@@@STEP_LOG_LINE@json.output@ }@@@", 208 "@@@STEP_LOG_LINE@json.output@ }@@@",
197 "@@@STEP_LOG_LINE@json.output@}@@@", 209 "@@@STEP_LOG_LINE@json.output@}@@@",
198 "@@@STEP_LOG_END@json.output@@@" 210 "@@@STEP_LOG_END@json.output@@@"
199 ] 211 ]
200 }, 212 },
201 { 213 {
202 "cmd": [ 214 "cmd": [
203 "python", 215 "python",
204 "-u", 216 "-u",
205 "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", 217 "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
206 "[CWD]\\conda_python.cipd" 218 "[SLAVE_BUILD]\\conda_python.cipd"
207 ], 219 ],
220 "cwd": "[SLAVE_BUILD]",
208 "name": "remove *.cipd file", 221 "name": "remove *.cipd file",
209 "~followup_annotations": [ 222 "~followup_annotations": [
210 "@@@STEP_LOG_LINE@python.inline@@@@", 223 "@@@STEP_LOG_LINE@python.inline@@@@",
211 "@@@STEP_LOG_LINE@python.inline@import os@@@", 224 "@@@STEP_LOG_LINE@python.inline@import os@@@",
212 "@@@STEP_LOG_LINE@python.inline@import sys@@@", 225 "@@@STEP_LOG_LINE@python.inline@import sys@@@",
213 "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", 226 "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@",
214 "@@@STEP_LOG_END@python.inline@@@" 227 "@@@STEP_LOG_END@python.inline@@@"
215 ] 228 ]
216 }, 229 },
217 { 230 {
218 "cmd": [ 231 "cmd": [
219 "python", 232 "python",
220 "-u", 233 "-u",
221 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveD irectory(sys.argv[1])\n", 234 "\nimport os, sys\nfrom common import chromium_utils # Error? See https:// crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveD irectory(sys.argv[1])\n",
222 "[CWD]\\conda_staging_dir" 235 "[SLAVE_BUILD]\\conda_staging_dir"
223 ], 236 ],
237 "cwd": "[SLAVE_BUILD]",
224 "name": "rmtree removing conda", 238 "name": "rmtree removing conda",
225 "~followup_annotations": [ 239 "~followup_annotations": [
226 "@@@STEP_LOG_LINE@python.inline@@@@", 240 "@@@STEP_LOG_LINE@python.inline@@@@",
227 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", 241 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
228 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", 242 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
229 "@@@STEP_LOG_LINE@python.inline@@@@", 243 "@@@STEP_LOG_LINE@python.inline@@@@",
230 "@@@STEP_LOG_LINE@python.inline@@@@", 244 "@@@STEP_LOG_LINE@python.inline@@@@",
231 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", 245 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
232 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@", 246 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@",
233 "@@@STEP_LOG_END@python.inline@@@" 247 "@@@STEP_LOG_END@python.inline@@@"
234 ] 248 ]
235 }, 249 },
236 { 250 {
237 "name": "$result", 251 "name": "$result",
238 "recipe_result": null, 252 "recipe_result": null,
239 "status_code": 0 253 "status_code": 0
240 } 254 }
241 ] 255 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/mac.json ('k') | scripts/slave/recipes/infra/build_repo_real_try.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698