| OLD | NEW |
| 1 [ | 1 [ |
| 2 { | 2 { |
| 3 "cmd": [ | 3 "cmd": [ |
| 4 "python", | 4 "python", |
| 5 "-u", | 5 "-u", |
| 6 "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_pat
h):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files
:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.joi
n(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove
(path_to_file)\n", | 6 "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_pat
h):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files
:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.joi
n(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove
(path_to_file)\n", |
| 7 "[SLAVE_BUILD]" | 7 "[CWD]" |
| 8 ], | 8 ], |
| 9 "cwd": "[SLAVE_BUILD]", | |
| 10 "name": "cleanup index.lock", | 9 "name": "cleanup index.lock", |
| 11 "~followup_annotations": [ | 10 "~followup_annotations": [ |
| 12 "@@@STEP_LOG_LINE@python.inline@@@@", | 11 "@@@STEP_LOG_LINE@python.inline@@@@", |
| 13 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", | 12 "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", |
| 14 "@@@STEP_LOG_LINE@python.inline@@@@", | 13 "@@@STEP_LOG_LINE@python.inline@@@@", |
| 15 "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@", | 14 "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@", |
| 16 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@", | 15 "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@", |
| 17 "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_
path):@@@", | 16 "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_
path):@@@", |
| 18 "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@", | 17 "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@", |
| 19 "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@
@@", | 18 "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@
@@", |
| 20 "@@@STEP_LOG_LINE@python.inline@ path_to_file = os.path.join(path,
cur_file)@@@", | 19 "@@@STEP_LOG_LINE@python.inline@ path_to_file = os.path.join(path,
cur_file)@@@", |
| 21 "@@@STEP_LOG_LINE@python.inline@ print 'deleting %s' % path_to_file
@@@", | 20 "@@@STEP_LOG_LINE@python.inline@ print 'deleting %s' % path_to_file
@@@", |
| 22 "@@@STEP_LOG_LINE@python.inline@ os.remove(path_to_file)@@@", | 21 "@@@STEP_LOG_LINE@python.inline@ os.remove(path_to_file)@@@", |
| 23 "@@@STEP_LOG_END@python.inline@@@" | 22 "@@@STEP_LOG_END@python.inline@@@" |
| 24 ] | 23 ] |
| 25 }, | 24 }, |
| 26 { | 25 { |
| 27 "cmd": [ | 26 "cmd": [ |
| 28 "python", | 27 "python", |
| 29 "-u", | 28 "-u", |
| 30 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", | 29 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
| 31 "--master", | 30 "--master", |
| 32 "chromium.testing.master", | 31 "chromium.testing.master", |
| 33 "--builder", | 32 "--builder", |
| 34 "local_test", | 33 "local_test", |
| 35 "--slave", | 34 "--slave", |
| 36 "TestSlavename", | 35 "TestSlavename", |
| 37 "--spec", | 36 "--spec", |
| 38 "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'manag
ed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src
'}]\ntarget_os = ['android']", | 37 "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file':
'.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesour
ce.com/chromium/src'}]\ntarget_os = ['android']", |
| 39 "--root", | 38 "--root", |
| 40 "src", | 39 "src", |
| 41 "--revision_mapping_file", | 40 "--revision_mapping_file", |
| 42 "{\"src\": \"got_src_revision\", \"src/native_client\": \"got_nacl_revisio
n\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc
\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_clien
t_revision\", \"src/v8\": \"got_v8_revision\"}", | 41 "{\"src\": \"got_src_revision\", \"src/native_client\": \"got_nacl_revisio
n\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc
\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_clien
t_revision\", \"src/v8\": \"got_v8_revision\"}", |
| 43 "--git-cache-dir", | 42 "--git-cache-dir", |
| 44 "[GIT_CACHE]", | 43 "[ROOT]/b/build/slave/cache_dir", |
| 45 "--output_json", | 44 "--output_json", |
| 46 "/path/to/tmp/json", | 45 "/path/to/tmp/json", |
| 47 "--revision", | 46 "--revision", |
| 48 "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00", | 47 "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00", |
| 49 "--force", | 48 "--force", |
| 50 "--output_manifest" | 49 "--output_manifest" |
| 51 ], | 50 ], |
| 52 "cwd": "[SLAVE_BUILD]", | |
| 53 "env": { | 51 "env": { |
| 54 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 52 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
| 55 }, | 53 }, |
| 56 "name": "bot_update", | 54 "name": "bot_update", |
| 57 "~followup_annotations": [ | 55 "~followup_annotations": [ |
| 58 "@@@STEP_TEXT@Some step text@@@", | 56 "@@@STEP_TEXT@Some step text@@@", |
| 59 "@@@STEP_LOG_LINE@json.output@{@@@", | 57 "@@@STEP_LOG_LINE@json.output@{@@@", |
| 60 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", | 58 "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", |
| 61 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", | 59 "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", |
| 62 "@@@STEP_LOG_LINE@json.output@ \"src\": \"4f4b02f6b7fa20a3a25682c457bbc
8ad589c8a00\"@@@", | 60 "@@@STEP_LOG_LINE@json.output@ \"src\": \"4f4b02f6b7fa20a3a25682c457bbc
8ad589c8a00\"@@@", |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644
}\"@@@", | 117 "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644
}\"@@@", |
| 120 "@@@SET_BUILD_PROPERTY@got_src_revision_cp@\"refs/heads/master@{#170242}\"
@@@", | 118 "@@@SET_BUILD_PROPERTY@got_src_revision_cp@\"refs/heads/master@{#170242}\"
@@@", |
| 121 "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}
\"@@@" | 119 "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}
\"@@@" |
| 122 ] | 120 ] |
| 123 }, | 121 }, |
| 124 { | 122 { |
| 125 "cmd": [ | 123 "cmd": [ |
| 126 "python", | 124 "python", |
| 127 "-u", | 125 "-u", |
| 128 "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree
(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfo
r base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endsw
ith('.pyc'):\n os.remove(os.path.join(base, f))\n", | 126 "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree
(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfo
r base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endsw
ith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
| 129 "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps", | 127 "[CWD]/src/out/Debug/debug_info_dumps", |
| 130 "[SLAVE_BUILD]/src/out/Debug/test_logs", | 128 "[CWD]/src/out/Debug/test_logs", |
| 131 "[SLAVE_BUILD]/src/out/build_product.zip", | 129 "[CWD]/src/out/build_product.zip", |
| 132 "[SLAVE_BUILD]/src" | 130 "[CWD]/src" |
| 133 ], | 131 ], |
| 134 "cwd": "[SLAVE_BUILD]", | |
| 135 "name": "clean local files", | 132 "name": "clean local files", |
| 136 "~followup_annotations": [ | 133 "~followup_annotations": [ |
| 137 "@@@STEP_LOG_LINE@python.inline@@@@", | 134 "@@@STEP_LOG_LINE@python.inline@@@@", |
| 138 "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", | 135 "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", |
| 139 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", | 136 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", |
| 140 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", | 137 "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", |
| 141 "@@@STEP_LOG_LINE@python.inline@try:@@@", | 138 "@@@STEP_LOG_LINE@python.inline@try:@@@", |
| 142 "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@", | 139 "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@", |
| 143 "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", | 140 "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", |
| 144 "@@@STEP_LOG_LINE@python.inline@ pass@@@", | 141 "@@@STEP_LOG_LINE@python.inline@ pass@@@", |
| 145 "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv
[4]):@@@", | 142 "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv
[4]):@@@", |
| 146 "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@", | 143 "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@", |
| 147 "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@", | 144 "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@", |
| 148 "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@"
, | 145 "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@"
, |
| 149 "@@@STEP_LOG_END@python.inline@@@" | 146 "@@@STEP_LOG_END@python.inline@@@" |
| 150 ] | 147 ] |
| 151 }, | 148 }, |
| 152 { | 149 { |
| 153 "cmd": [ | 150 "cmd": [ |
| 154 "python", | 151 "python", |
| 155 "-u", | 152 "-u", |
| 156 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", | 153 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
| 157 "runhooks" | 154 "runhooks" |
| 158 ], | 155 ], |
| 159 "cwd": "[SLAVE_BUILD]", | |
| 160 "env": { | 156 "env": { |
| 161 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 157 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 162 "GYP_CROSSCOMPILE": "1", | 158 "GYP_CROSSCOMPILE": "1", |
| 163 "GYP_DEFINES": "OS=android component=static_library disable_brotli_filter=
1 disable_file_support=1 disable_ftp_support=1 enable_bidirectional_stream=1 ena
ble_websockets=0 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=0 u
se_platform_icu_alternatives=1", | 159 "GYP_DEFINES": "OS=android component=static_library disable_brotli_filter=
1 disable_file_support=1 disable_ftp_support=1 enable_bidirectional_stream=1 ena
ble_websockets=0 fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_g
oma=0 use_platform_icu_alternatives=1", |
| 164 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" | 160 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
| 165 }, | 161 }, |
| 166 "name": "gclient runhooks" | 162 "name": "gclient runhooks" |
| 167 }, | 163 }, |
| 168 { | 164 { |
| 169 "cmd": [ | 165 "cmd": [ |
| 170 "python", | 166 "python", |
| 171 "-u", | 167 "-u", |
| 172 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", | 168 "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", |
| 173 "--show-path", | 169 "--show-path", |
| 174 "python", | 170 "python", |
| 175 "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py", | 171 "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py", |
| 176 "--gsutil-py-path", | 172 "--gsutil-py-path", |
| 177 "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", | 173 "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", |
| 178 "--ninja-path", | 174 "--ninja-path", |
| 179 "RECIPE_PACKAGE_REPO[depot_tools]/ninja", | 175 "RECIPE_PACKAGE_REPO[depot_tools]/ninja", |
| 180 "--target", | 176 "--target", |
| 181 "Debug", | 177 "Debug", |
| 182 "--src-dir", | 178 "--src-dir", |
| 183 "[SLAVE_BUILD]/src", | 179 "[CWD]/src", |
| 184 "--goma-cache-dir", | 180 "--goma-cache-dir", |
| 185 "[GOMA_CACHE]", | 181 "[ROOT]/b/build/slave/goma_cache", |
| 186 "--build-tool", | 182 "--build-tool", |
| 187 "ninja", | 183 "ninja", |
| 188 "--compiler", | 184 "--compiler", |
| 189 "goma", | 185 "goma", |
| 190 "--goma-jsonstatus", | 186 "--goma-jsonstatus", |
| 191 "/path/to/tmp/json", | 187 "/path/to/tmp/json", |
| 192 "--goma-service-account-json-file", | 188 "--goma-service-account-json-file", |
| 193 "/creds/service_accounts/service-account-goma-client.json", | 189 "/creds/service_accounts/service-account-goma-client.json", |
| 194 "--goma-dir", | 190 "--goma-dir", |
| 195 "[BUILD]/goma", | 191 "[ROOT]/b/build/goma", |
| 196 "--clobber", | 192 "--clobber", |
| 197 "--", | 193 "--", |
| 198 "cronet_package", | 194 "cronet_package", |
| 199 "cronet_sample_test_apk", | 195 "cronet_sample_test_apk", |
| 200 "cronet_test_instrumentation_apk", | 196 "cronet_test_instrumentation_apk", |
| 201 "cronet_unittests", | 197 "cronet_unittests", |
| 202 "cronet_unittests_apk", | 198 "cronet_unittests_apk", |
| 203 "net_unittests", | 199 "net_unittests", |
| 204 "net_unittests_apk" | 200 "net_unittests_apk" |
| 205 ], | 201 ], |
| 206 "cwd": "[SLAVE_BUILD]", | |
| 207 "env": { | 202 "env": { |
| 208 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 203 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 209 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 204 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 210 }, | 205 }, |
| 211 "name": "compile", | 206 "name": "compile", |
| 212 "~followup_annotations": [ | 207 "~followup_annotations": [ |
| 213 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", | 208 "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
| 214 "@@@STEP_LOG_END@json.output (invalid)@@@" | 209 "@@@STEP_LOG_END@json.output (invalid)@@@" |
| 215 ] | 210 ] |
| 216 }, | 211 }, |
| 217 { | 212 { |
| 218 "cmd": [ | 213 "cmd": [ |
| 219 "python", | 214 "python", |
| 220 "-u", | 215 "-u", |
| 221 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", | 216 "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
| 222 "[SLAVE_BUILD]/src/chrome/VERSION", | 217 "[CWD]/src/chrome/VERSION", |
| 223 "/path/to/tmp/" | 218 "/path/to/tmp/" |
| 224 ], | 219 ], |
| 225 "cwd": "[SLAVE_BUILD]", | |
| 226 "name": "get version" | 220 "name": "get version" |
| 227 }, | 221 }, |
| 228 { | 222 { |
| 229 "cmd": [ | 223 "cmd": [ |
| 230 "python", | 224 "python", |
| 231 "-u", | 225 "-u", |
| 232 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", | 226 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
| 233 "--", | 227 "--", |
| 234 "[DEPOT_TOOLS]/gsutil.py", | 228 "[ROOT]/b/depot_tools/gsutil.py", |
| 235 "----", | 229 "----", |
| 236 "cp", | 230 "cp", |
| 237 "[SLAVE_BUILD]/src/out/Debug/cronet/VERSION", | 231 "[CWD]/src/out/Debug/cronet/VERSION", |
| 238 "gs://chromium-cronet/android/37.0.2021.0/Debug/VERSION" | 232 "gs://chromium-cronet/android/37.0.2021.0/Debug/VERSION" |
| 239 ], | 233 ], |
| 240 "cwd": "[SLAVE_BUILD]", | |
| 241 "name": "gsutil upload_cronet_version", | 234 "name": "gsutil upload_cronet_version", |
| 242 "~followup_annotations": [ | 235 "~followup_annotations": [ |
| 243 "@@@STEP_LINK@Cronet version@https://storage.cloud.google.com/chromium-cro
net/android/37.0.2021.0/Debug/VERSION@@@" | 236 "@@@STEP_LINK@Cronet version@https://storage.cloud.google.com/chromium-cro
net/android/37.0.2021.0/Debug/VERSION@@@" |
| 244 ] | 237 ] |
| 245 }, | 238 }, |
| 246 { | 239 { |
| 247 "cmd": [ | 240 "cmd": [ |
| 248 "python", | 241 "python", |
| 249 "-u", | 242 "-u", |
| 250 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", | 243 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
| 251 "--", | 244 "--", |
| 252 "[DEPOT_TOOLS]/gsutil.py", | 245 "[ROOT]/b/depot_tools/gsutil.py", |
| 253 "----", | 246 "----", |
| 254 "cp", | 247 "cp", |
| 255 "-R", | 248 "-R", |
| 256 "[SLAVE_BUILD]/src/out/Debug/cronet", | 249 "[CWD]/src/out/Debug/cronet", |
| 257 "gs://chromium-cronet/android/37.0.2021.0/Debug" | 250 "gs://chromium-cronet/android/37.0.2021.0/Debug" |
| 258 ], | 251 ], |
| 259 "cwd": "[SLAVE_BUILD]", | |
| 260 "name": "gsutil upload_cronet_package", | 252 "name": "gsutil upload_cronet_package", |
| 261 "~followup_annotations": [ | 253 "~followup_annotations": [ |
| 262 "@@@STEP_LINK@Cronet package@https://storage.cloud.google.com/chromium-cro
net/android/37.0.2021.0/Debug@@@" | 254 "@@@STEP_LINK@Cronet package@https://storage.cloud.google.com/chromium-cro
net/android/37.0.2021.0/Debug@@@" |
| 263 ] | 255 ] |
| 264 }, | 256 }, |
| 265 { | 257 { |
| 266 "cmd": [ | 258 "cmd": [ |
| 267 "python", | 259 "python", |
| 268 "-u", | 260 "-u", |
| 269 "[SLAVE_BUILD]/src/build/symlink.py", | 261 "[CWD]/src/build/symlink.py", |
| 270 "-f", | 262 "-f", |
| 271 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", | 263 "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", |
| 272 "~/adb" | 264 "~/adb" |
| 273 ], | 265 ], |
| 274 "cwd": "[SLAVE_BUILD]", | |
| 275 "name": "create adb symlink" | 266 "name": "create adb symlink" |
| 276 }, | 267 }, |
| 277 { | 268 { |
| 278 "cmd": [ | 269 "cmd": [ |
| 279 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", | 270 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", |
| 280 "--", | 271 "--", |
| 281 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", | 272 "[CWD]/src/build/android/adb_logcat_monitor.py", |
| 282 "[SLAVE_BUILD]/src/out/logcat" | 273 "[CWD]/src/out/logcat" |
| 283 ], | 274 ], |
| 284 "cwd": "[SLAVE_BUILD]", | |
| 285 "env": { | 275 "env": { |
| 286 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 276 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 287 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 277 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 288 }, | 278 }, |
| 289 "name": "spawn_logcat_monitor" | 279 "name": "spawn_logcat_monitor" |
| 290 }, | 280 }, |
| 291 { | 281 { |
| 292 "cmd": [ | 282 "cmd": [ |
| 293 "python", | 283 "python", |
| 294 "-u", | 284 "-u", |
| 295 "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py
", | 285 "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py
", |
| 296 "--verbose", | 286 "--verbose", |
| 297 "--adb-path", | 287 "--adb-path", |
| 298 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" | 288 "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb" |
| 299 ], | 289 ], |
| 300 "cwd": "[SLAVE_BUILD]", | |
| 301 "env": { | 290 "env": { |
| 302 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 291 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 303 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 292 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 304 }, | 293 }, |
| 305 "name": "authorize_adb_devices" | 294 "name": "authorize_adb_devices" |
| 306 }, | 295 }, |
| 307 { | 296 { |
| 308 "cmd": [ | 297 "cmd": [ |
| 309 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py", | 298 "[CWD]/src/build/android/buildbot/bb_device_status_check.py", |
| 310 "--json-output", | 299 "--json-output", |
| 311 "/path/to/tmp/json", | 300 "/path/to/tmp/json", |
| 312 "--blacklist-file", | 301 "--blacklist-file", |
| 313 "[SLAVE_BUILD]/src/out/bad_devices.json", | 302 "[CWD]/src/out/bad_devices.json", |
| 314 "--known-devices-file", | 303 "--known-devices-file", |
| 315 "[BUILD]/site_config/.known_devices" | 304 "[ROOT]/b/build/site_config/.known_devices" |
| 316 ], | 305 ], |
| 317 "cwd": "[SLAVE_BUILD]", | |
| 318 "env": { | 306 "env": { |
| 319 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 307 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 320 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 308 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 321 }, | 309 }, |
| 322 "name": "device_status_check", | 310 "name": "device_status_check", |
| 323 "~followup_annotations": [ | 311 "~followup_annotations": [ |
| 324 "@@@STEP_TEXT@Online devices: 1@@@", | 312 "@@@STEP_TEXT@Online devices: 1@@@", |
| 325 "@@@STEP_LOG_LINE@json.output@[@@@", | 313 "@@@STEP_LOG_LINE@json.output@[@@@", |
| 326 "@@@STEP_LOG_LINE@json.output@ {@@@", | 314 "@@@STEP_LOG_LINE@json.output@ {@@@", |
| 327 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@", | 315 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@", |
| 328 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", | 316 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@", |
| 329 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", | 317 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@", |
| 330 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", | 318 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@", |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00
3c6ad6\", @@@", | 400 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00
3c6ad6\", @@@", |
| 413 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@"
, | 401 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@"
, |
| 414 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@", | 402 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@", |
| 415 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" | 403 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@" |
| 416 ] | 404 ] |
| 417 }, | 405 }, |
| 418 { | 406 { |
| 419 "cmd": [ | 407 "cmd": [ |
| 420 "python", | 408 "python", |
| 421 "-u", | 409 "-u", |
| 422 "[SLAVE_BUILD]/src/build/android/provision_devices.py", | 410 "[CWD]/src/build/android/provision_devices.py", |
| 423 "-t", | 411 "-t", |
| 424 "Debug", | 412 "Debug", |
| 425 "--blacklist-file", | 413 "--blacklist-file", |
| 426 "[SLAVE_BUILD]/src/out/bad_devices.json", | 414 "[CWD]/src/out/bad_devices.json", |
| 427 "--output-device-blacklist", | 415 "--output-device-blacklist", |
| 428 "/path/to/tmp/json" | 416 "/path/to/tmp/json" |
| 429 ], | 417 ], |
| 430 "cwd": "[SLAVE_BUILD]", | |
| 431 "env": { | 418 "env": { |
| 432 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 419 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 433 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 420 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 434 }, | 421 }, |
| 435 "name": "provision_devices" | 422 "name": "provision_devices" |
| 436 }, | 423 }, |
| 437 { | 424 { |
| 438 "cmd": [ | 425 "cmd": [ |
| 439 "python", | 426 "python", |
| 440 "-u", | 427 "-u", |
| 441 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", | 428 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", |
| 442 "--action", | 429 "--action", |
| 443 "restart", | 430 "restart", |
| 444 "--pid-file-path", | 431 "--pid-file-path", |
| 445 "/tmp/device_monitor.pid", | 432 "/tmp/device_monitor.pid", |
| 446 "--", | 433 "--", |
| 447 "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py"
, | 434 "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py"
, |
| 448 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", | 435 "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb", |
| 449 "[\"07a00ca4\"]", | 436 "[\"07a00ca4\"]", |
| 450 "chromium.testing.master", | 437 "chromium.testing.master", |
| 451 "local_test", | 438 "local_test", |
| 452 "--blacklist-file", | 439 "--blacklist-file", |
| 453 "[SLAVE_BUILD]/src/out/bad_devices.json" | 440 "[CWD]/src/out/bad_devices.json" |
| 454 ], | 441 ], |
| 455 "cwd": "[SLAVE_BUILD]", | |
| 456 "name": "spawn_device_monitor" | 442 "name": "spawn_device_monitor" |
| 457 }, | 443 }, |
| 458 { | 444 { |
| 459 "cmd": [ | 445 "cmd": [ |
| 460 "python", | 446 "python", |
| 461 "-u", | 447 "-u", |
| 462 "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_unittests", | 448 "[CWD]/src/out/Debug/bin/run_cronet_unittests", |
| 463 "--blacklist-file", | 449 "--blacklist-file", |
| 464 "[SLAVE_BUILD]/src/out/bad_devices.json", | 450 "[CWD]/src/out/bad_devices.json", |
| 465 "--verbose", | 451 "--verbose", |
| 466 "-t", | 452 "-t", |
| 467 "180" | 453 "180" |
| 468 ], | 454 ], |
| 469 "cwd": "[SLAVE_BUILD]", | |
| 470 "env": { | 455 "env": { |
| 471 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 456 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 472 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 457 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 473 }, | 458 }, |
| 474 "name": "cronet_unittests" | 459 "name": "cronet_unittests" |
| 475 }, | 460 }, |
| 476 { | 461 { |
| 477 "cmd": [ | 462 "cmd": [ |
| 478 "python", | 463 "python", |
| 479 "-u", | 464 "-u", |
| 480 "[SLAVE_BUILD]/src/out/Debug/bin/run_net_unittests", | 465 "[CWD]/src/out/Debug/bin/run_net_unittests", |
| 481 "--blacklist-file", | 466 "--blacklist-file", |
| 482 "[SLAVE_BUILD]/src/out/bad_devices.json", | 467 "[CWD]/src/out/bad_devices.json", |
| 483 "--verbose", | 468 "--verbose", |
| 484 "-t", | 469 "-t", |
| 485 "180" | 470 "180" |
| 486 ], | 471 ], |
| 487 "cwd": "[SLAVE_BUILD]", | |
| 488 "env": { | 472 "env": { |
| 489 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 473 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 490 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 474 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 491 }, | 475 }, |
| 492 "name": "net_unittests" | 476 "name": "net_unittests" |
| 493 }, | 477 }, |
| 494 { | 478 { |
| 495 "cmd": [ | 479 "cmd": [ |
| 496 "python", | 480 "python", |
| 497 "-u", | 481 "-u", |
| 498 "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_sample_test_apk", | 482 "[CWD]/src/out/Debug/bin/run_cronet_sample_test_apk", |
| 499 "--blacklist-file", | 483 "--blacklist-file", |
| 500 "[SLAVE_BUILD]/src/out/bad_devices.json", | 484 "[CWD]/src/out/bad_devices.json", |
| 501 "--verbose", | 485 "--verbose", |
| 502 "--num-retries", | 486 "--num-retries", |
| 503 "0" | 487 "0" |
| 504 ], | 488 ], |
| 505 "cwd": "[SLAVE_BUILD]", | |
| 506 "name": "Instrumentation test cronet_sample_test_apk" | 489 "name": "Instrumentation test cronet_sample_test_apk" |
| 507 }, | 490 }, |
| 508 { | 491 { |
| 509 "cmd": [ | 492 "cmd": [ |
| 510 "python", | 493 "python", |
| 511 "-u", | 494 "-u", |
| 512 "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_test_instrumentation_apk", | 495 "[CWD]/src/out/Debug/bin/run_cronet_test_instrumentation_apk", |
| 513 "--blacklist-file", | 496 "--blacklist-file", |
| 514 "[SLAVE_BUILD]/src/out/bad_devices.json", | 497 "[CWD]/src/out/bad_devices.json", |
| 515 "--verbose", | 498 "--verbose", |
| 516 "--num-retries", | 499 "--num-retries", |
| 517 "0" | 500 "0" |
| 518 ], | 501 ], |
| 519 "cwd": "[SLAVE_BUILD]", | |
| 520 "name": "Instrumentation test cronet_test_instrumentation_apk" | 502 "name": "Instrumentation test cronet_test_instrumentation_apk" |
| 521 }, | 503 }, |
| 522 { | 504 { |
| 523 "cmd": [ | 505 "cmd": [ |
| 524 "python", | 506 "python", |
| 525 "-u", | 507 "-u", |
| 526 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", | 508 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", |
| 527 "--action", | 509 "--action", |
| 528 "stop", | 510 "stop", |
| 529 "--pid-file-path", | 511 "--pid-file-path", |
| 530 "/tmp/device_monitor.pid" | 512 "/tmp/device_monitor.pid" |
| 531 ], | 513 ], |
| 532 "cwd": "[SLAVE_BUILD]", | |
| 533 "name": "shutdown_device_monitor" | 514 "name": "shutdown_device_monitor" |
| 534 }, | 515 }, |
| 535 { | 516 { |
| 536 "cmd": [ | 517 "cmd": [ |
| 537 "python", | 518 "python", |
| 538 "-u", | 519 "-u", |
| 539 "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py", | 520 "[CWD]/src/build/android/adb_logcat_printer.py", |
| 540 "--output-path", | 521 "--output-path", |
| 541 "[SLAVE_BUILD]/src/out/Debug/full_log", | 522 "[CWD]/src/out/Debug/full_log", |
| 542 "[SLAVE_BUILD]/src/out/logcat" | 523 "[CWD]/src/out/logcat" |
| 543 ], | 524 ], |
| 544 "cwd": "[SLAVE_BUILD]", | |
| 545 "name": "logcat_dump" | 525 "name": "logcat_dump" |
| 546 }, | 526 }, |
| 547 { | 527 { |
| 548 "cmd": [ | 528 "cmd": [ |
| 549 "python", | 529 "python", |
| 550 "-u", | 530 "-u", |
| 551 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", | 531 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
| 552 "--", | 532 "--", |
| 553 "[DEPOT_TOOLS]/gsutil.py", | 533 "[ROOT]/b/depot_tools/gsutil.py", |
| 554 "--force-version", | 534 "--force-version", |
| 555 "4.7", | 535 "4.7", |
| 556 "-o", | 536 "-o", |
| 557 "GSUtil:parallel_composite_upload_threshold=50M", | 537 "GSUtil:parallel_composite_upload_threshold=50M", |
| 558 "----", | 538 "----", |
| 559 "cp", | 539 "cp", |
| 560 "[SLAVE_BUILD]/src/out/Debug/full_log", | 540 "[CWD]/src/out/Debug/full_log", |
| 561 "gs://chromium-android/logcat_dumps/local_test/571" | 541 "gs://chromium-android/logcat_dumps/local_test/571" |
| 562 ], | 542 ], |
| 563 "cwd": "[SLAVE_BUILD]", | |
| 564 "name": "gsutil upload", | 543 "name": "gsutil upload", |
| 565 "~followup_annotations": [ | 544 "~followup_annotations": [ |
| 566 "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-androi
d/logcat_dumps/local_test/571@@@" | 545 "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-androi
d/logcat_dumps/local_test/571@@@" |
| 567 ] | 546 ] |
| 568 }, | 547 }, |
| 569 { | 548 { |
| 570 "cmd": [ | 549 "cmd": [ |
| 571 "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack"
, | 550 "[CWD]/src/third_party/android_platform/development/scripts/stack", |
| 572 "--arch", | 551 "--arch", |
| 573 "arm", | 552 "arm", |
| 574 "--more-info", | 553 "--more-info", |
| 575 "[SLAVE_BUILD]/src/out/Debug/full_log" | 554 "[CWD]/src/out/Debug/full_log" |
| 576 ], | 555 ], |
| 577 "cwd": "[SLAVE_BUILD]", | |
| 578 "env": { | 556 "env": { |
| 579 "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug", | 557 "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug", |
| 580 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 558 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 581 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 559 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 582 }, | 560 }, |
| 583 "name": "stack_tool_with_logcat_dump" | 561 "name": "stack_tool_with_logcat_dump" |
| 584 }, | 562 }, |
| 585 { | 563 { |
| 586 "cmd": [ | 564 "cmd": [ |
| 587 "[SLAVE_BUILD]/src/build/android/tombstones.py", | 565 "[CWD]/src/build/android/tombstones.py", |
| 588 "-a", | 566 "-a", |
| 589 "-s", | 567 "-s", |
| 590 "-w" | 568 "-w" |
| 591 ], | 569 ], |
| 592 "cwd": "[SLAVE_BUILD]", | |
| 593 "env": { | 570 "env": { |
| 594 "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug", | 571 "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug", |
| 595 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", | 572 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account
-goma-client.json", |
| 596 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
LAVE_BUILD]/src/build/android:%(PATH)s" | 573 "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/
build/android:%(PATH)s" |
| 597 }, | 574 }, |
| 598 "name": "stack_tool_for_tombstones" | 575 "name": "stack_tool_for_tombstones" |
| 599 }, | 576 }, |
| 600 { | 577 { |
| 601 "cmd": [ | 578 "cmd": [ |
| 602 "python", | 579 "python", |
| 603 "-u", | 580 "-u", |
| 604 "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with ope
n(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(re
port)\n", | 581 "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with ope
n(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(re
port)\n", |
| 605 "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log" | 582 "[CWD]/src/out/Debug/test_logs/*.log" |
| 606 ], | 583 ], |
| 607 "cwd": "[SLAVE_BUILD]", | |
| 608 "name": "test_report", | 584 "name": "test_report", |
| 609 "~followup_annotations": [ | 585 "~followup_annotations": [ |
| 610 "@@@STEP_LOG_LINE@python.inline@@@@", | 586 "@@@STEP_LOG_LINE@python.inline@@@@", |
| 611 "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@", | 587 "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@", |
| 612 "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@", | 588 "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@", |
| 613 "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@", | 589 "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@", |
| 614 "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@", | 590 "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@", |
| 615 "@@@STEP_LOG_LINE@python.inline@ print l@@@", | 591 "@@@STEP_LOG_LINE@python.inline@ print l@@@", |
| 616 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@", | 592 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@", |
| 617 "@@@STEP_LOG_END@python.inline@@@" | 593 "@@@STEP_LOG_END@python.inline@@@" |
| 618 ] | 594 ] |
| 619 }, | 595 }, |
| 620 { | 596 { |
| 621 "name": "$result", | 597 "name": "$result", |
| 622 "recipe_result": null, | 598 "recipe_result": null, |
| 623 "status_code": 0 | 599 "status_code": 0 |
| 624 } | 600 } |
| 625 ] | 601 ] |
| OLD | NEW |