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

Side by Side Diff: scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/linux.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 "linux-amd64", 8 "linux-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-Linux-x86_64.sh", 50 "https://repo.continuum.io/miniconda/Miniconda2-3.18.3-Linux-x86_64.sh",
49 "--outfile", 51 "--outfile",
50 "[TMP]/conda_tmp_1/Miniconda2-3.18.3-Linux-x86_64.sh", 52 "[TMP_BASE]/conda_tmp_1/Miniconda2-3.18.3-Linux-x86_64.sh",
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 "/bin/bash", 61 "/bin/bash",
59 "[TMP]/conda_tmp_1/Miniconda2-3.18.3-Linux-x86_64.sh", 62 "[TMP_BASE]/conda_tmp_1/Miniconda2-3.18.3-Linux-x86_64.sh",
60 "-b", 63 "-b",
61 "-p", 64 "-p",
62 "[CWD]/conda_staging_dir" 65 "[SLAVE_BUILD]/conda_staging_dir"
63 ], 66 ],
67 "cwd": "[SLAVE_BUILD]",
64 "env": { 68 "env": {
65 "PYTHONPATH": "" 69 "PYTHONPATH": ""
66 }, 70 },
67 "name": "install miniconda" 71 "name": "install miniconda"
68 }, 72 },
69 { 73 {
70 "cmd": [ 74 "cmd": [
71 "python", 75 "python",
72 "-u", 76 "-u",
73 "\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", 77 "\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",
74 "[TMP]/conda_tmp_1" 78 "[TMP_BASE]/conda_tmp_1"
75 ], 79 ],
80 "cwd": "[SLAVE_BUILD]",
76 "name": "rmtree remove miniconda installer", 81 "name": "rmtree remove miniconda installer",
77 "~followup_annotations": [ 82 "~followup_annotations": [
78 "@@@STEP_LOG_LINE@python.inline@@@@", 83 "@@@STEP_LOG_LINE@python.inline@@@@",
79 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", 84 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
80 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", 85 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
81 "@@@STEP_LOG_LINE@python.inline@@@@", 86 "@@@STEP_LOG_LINE@python.inline@@@@",
82 "@@@STEP_LOG_LINE@python.inline@@@@", 87 "@@@STEP_LOG_LINE@python.inline@@@@",
83 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", 88 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
84 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@", 89 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@",
85 "@@@STEP_LOG_END@python.inline@@@" 90 "@@@STEP_LOG_END@python.inline@@@"
86 ] 91 ]
87 }, 92 },
88 { 93 {
89 "cmd": [ 94 "cmd": [
90 "[CWD]/conda_staging_dir/bin/conda", 95 "[SLAVE_BUILD]/conda_staging_dir/bin/conda",
91 "install", 96 "install",
92 "matplotlib", 97 "matplotlib",
93 "--yes" 98 "--yes"
94 ], 99 ],
100 "cwd": "[SLAVE_BUILD]",
95 "env": { 101 "env": {
96 "PYTHONPATH": null 102 "PYTHONPATH": null
97 }, 103 },
98 "name": "conda install matplotlib" 104 "name": "conda install matplotlib"
99 }, 105 },
100 { 106 {
101 "cmd": [ 107 "cmd": [
102 "[CWD]/conda_staging_dir/bin/conda", 108 "[SLAVE_BUILD]/conda_staging_dir/bin/conda",
103 "install", 109 "install",
104 "numpy", 110 "numpy",
105 "--yes" 111 "--yes"
106 ], 112 ],
113 "cwd": "[SLAVE_BUILD]",
107 "env": { 114 "env": {
108 "PYTHONPATH": null 115 "PYTHONPATH": null
109 }, 116 },
110 "name": "conda install numpy" 117 "name": "conda install numpy"
111 }, 118 },
112 { 119 {
113 "cmd": [ 120 "cmd": [
114 "[CWD]/conda_staging_dir/bin/conda", 121 "[SLAVE_BUILD]/conda_staging_dir/bin/conda",
115 "install", 122 "install",
116 "scipy", 123 "scipy",
117 "--yes" 124 "--yes"
118 ], 125 ],
126 "cwd": "[SLAVE_BUILD]",
119 "env": { 127 "env": {
120 "PYTHONPATH": null 128 "PYTHONPATH": null
121 }, 129 },
122 "name": "conda install scipy" 130 "name": "conda install scipy"
123 }, 131 },
124 { 132 {
125 "cmd": [ 133 "cmd": [
126 "[CWD]/conda_staging_dir/bin/conda", 134 "[SLAVE_BUILD]/conda_staging_dir/bin/conda",
127 "clean", 135 "clean",
128 "--tarballs", 136 "--tarballs",
129 "--index-cache", 137 "--index-cache",
130 "--packages", 138 "--packages",
131 "--yes" 139 "--yes"
132 ], 140 ],
141 "cwd": "[SLAVE_BUILD]",
133 "env": { 142 "env": {
134 "PYTHONPATH": null 143 "PYTHONPATH": null
135 }, 144 },
136 "name": "conda clean --tarballs --index-cache --packages" 145 "name": "conda clean --tarballs --index-cache --packages"
137 }, 146 },
138 { 147 {
139 "cmd": [ 148 "cmd": [
140 "python", 149 "python",
141 "-u", 150 "-u",
142 "RECIPE_MODULE[build::conda]/resources/butcher_conda.py", 151 "RECIPE_MODULE[build::conda]/resources/butcher_conda.py",
143 "[CWD]/conda_staging_dir" 152 "[SLAVE_BUILD]/conda_staging_dir"
144 ], 153 ],
154 "cwd": "[SLAVE_BUILD]",
145 "name": "make conda env location independent" 155 "name": "make conda env location independent"
146 }, 156 },
147 { 157 {
148 "cmd": [ 158 "cmd": [
149 "fake_slave_build/cipd", 159 "[SLAVE_BUILD]/cipd/cipd",
150 "pkg-build", 160 "pkg-build",
151 "--in", 161 "--in",
152 "[CWD]/conda_staging_dir", 162 "[SLAVE_BUILD]/conda_staging_dir",
153 "--name", 163 "--name",
154 "infra/conda_python/scientific/linux-amd64", 164 "infra/conda_python/scientific/linux-amd64",
155 "--out", 165 "--out",
156 "[CWD]/conda_python.cipd", 166 "[SLAVE_BUILD]/conda_python.cipd",
157 "--json-output", 167 "--json-output",
158 "/path/to/tmp/json", 168 "/path/to/tmp/json",
159 "--install-mode", 169 "--install-mode",
160 "copy" 170 "copy"
161 ], 171 ],
172 "cwd": "[SLAVE_BUILD]",
162 "name": "build linux-amd64", 173 "name": "build linux-amd64",
163 "~followup_annotations": [ 174 "~followup_annotations": [
164 "@@@STEP_LOG_LINE@json.output@{@@@", 175 "@@@STEP_LOG_LINE@json.output@{@@@",
165 "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", 176 "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
166 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the- package-instance_id\", @@@", 177 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the- package-instance_id\", @@@",
167 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/conda_python/scient ific/linux-amd64\"@@@", 178 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/conda_python/scient ific/linux-amd64\"@@@",
168 "@@@STEP_LOG_LINE@json.output@ }@@@", 179 "@@@STEP_LOG_LINE@json.output@ }@@@",
169 "@@@STEP_LOG_LINE@json.output@}@@@", 180 "@@@STEP_LOG_LINE@json.output@}@@@",
170 "@@@STEP_LOG_END@json.output@@@" 181 "@@@STEP_LOG_END@json.output@@@"
171 ] 182 ]
172 }, 183 },
173 { 184 {
174 "cmd": [ 185 "cmd": [
175 "fake_slave_build/cipd", 186 "[SLAVE_BUILD]/cipd/cipd",
176 "pkg-register", 187 "pkg-register",
177 "[CWD]/conda_python.cipd", 188 "[SLAVE_BUILD]/conda_python.cipd",
178 "--json-output", 189 "--json-output",
179 "/path/to/tmp/json", 190 "/path/to/tmp/json",
180 "--service-account-json", 191 "--service-account-json",
181 "/creds/service_accounts/service-account-cipd-builder.json", 192 "/creds/service_accounts/service-account-cipd-builder.json",
182 "--ref", 193 "--ref",
183 "latest", 194 "latest",
184 "--tag", 195 "--tag",
185 "buildbot_build:chromium.testing.master/TestBuilder/571", 196 "buildbot_build:chromium.testing.master/TestBuilder/571",
186 "--tag", 197 "--tag",
187 "conda:Miniconda2-3-18-3" 198 "conda:Miniconda2-3-18-3"
188 ], 199 ],
200 "cwd": "[SLAVE_BUILD]",
189 "name": "register infra/conda_python/scientific/linux-amd64", 201 "name": "register infra/conda_python/scientific/linux-amd64",
190 "~followup_annotations": [ 202 "~followup_annotations": [
191 "@@@STEP_LOG_LINE@json.output@{@@@", 203 "@@@STEP_LOG_LINE@json.output@{@@@",
192 "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", 204 "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
193 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the- package-instance_id\", @@@", 205 "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the- package-instance_id\", @@@",
194 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/conda_python/scient ific/linux-amd64\"@@@", 206 "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/conda_python/scient ific/linux-amd64\"@@@",
195 "@@@STEP_LOG_LINE@json.output@ }@@@", 207 "@@@STEP_LOG_LINE@json.output@ }@@@",
196 "@@@STEP_LOG_LINE@json.output@}@@@", 208 "@@@STEP_LOG_LINE@json.output@}@@@",
197 "@@@STEP_LOG_END@json.output@@@" 209 "@@@STEP_LOG_END@json.output@@@"
198 ] 210 ]
199 }, 211 },
200 { 212 {
201 "cmd": [ 213 "cmd": [
202 "python", 214 "python",
203 "-u", 215 "-u",
204 "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", 216 "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
205 "[CWD]/conda_python.cipd" 217 "[SLAVE_BUILD]/conda_python.cipd"
206 ], 218 ],
219 "cwd": "[SLAVE_BUILD]",
207 "name": "remove *.cipd file", 220 "name": "remove *.cipd file",
208 "~followup_annotations": [ 221 "~followup_annotations": [
209 "@@@STEP_LOG_LINE@python.inline@@@@", 222 "@@@STEP_LOG_LINE@python.inline@@@@",
210 "@@@STEP_LOG_LINE@python.inline@import os@@@", 223 "@@@STEP_LOG_LINE@python.inline@import os@@@",
211 "@@@STEP_LOG_LINE@python.inline@import sys@@@", 224 "@@@STEP_LOG_LINE@python.inline@import sys@@@",
212 "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", 225 "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@",
213 "@@@STEP_LOG_END@python.inline@@@" 226 "@@@STEP_LOG_END@python.inline@@@"
214 ] 227 ]
215 }, 228 },
216 { 229 {
217 "cmd": [ 230 "cmd": [
218 "python", 231 "python",
219 "-u", 232 "-u",
220 "\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", 233 "\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",
221 "[CWD]/conda_staging_dir" 234 "[SLAVE_BUILD]/conda_staging_dir"
222 ], 235 ],
236 "cwd": "[SLAVE_BUILD]",
223 "name": "rmtree removing conda", 237 "name": "rmtree removing conda",
224 "~followup_annotations": [ 238 "~followup_annotations": [
225 "@@@STEP_LOG_LINE@python.inline@@@@", 239 "@@@STEP_LOG_LINE@python.inline@@@@",
226 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", 240 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
227 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", 241 "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
228 "@@@STEP_LOG_LINE@python.inline@@@@", 242 "@@@STEP_LOG_LINE@python.inline@@@@",
229 "@@@STEP_LOG_LINE@python.inline@@@@", 243 "@@@STEP_LOG_LINE@python.inline@@@@",
230 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", 244 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
231 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@", 245 "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[ 1])@@@",
232 "@@@STEP_LOG_END@python.inline@@@" 246 "@@@STEP_LOG_END@python.inline@@@"
233 ] 247 ]
234 }, 248 },
235 { 249 {
236 "name": "$result", 250 "name": "$result",
237 "recipe_result": null, 251 "recipe_result": null,
238 "status_code": 0 252 "status_code": 0
239 } 253 }
240 ] 254 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698