| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
| 6 from recipe_engine import recipe_api | 6 from recipe_engine import recipe_api |
| 7 from . import builders | 7 from . import builders |
| 8 from . import steps | 8 from . import steps |
| 9 | 9 |
| 10 | 10 |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 def package_build(self): | 269 def package_build(self): |
| 270 upload_url = self.m.archive.legacy_upload_url( | 270 upload_url = self.m.archive.legacy_upload_url( |
| 271 self.master_config.get('build_gs_bucket'), | 271 self.master_config.get('build_gs_bucket'), |
| 272 extra_url_components=self.mastername) | 272 extra_url_components=self.mastername) |
| 273 self.m.archive.zip_and_upload_build( | 273 self.m.archive.zip_and_upload_build( |
| 274 'package build', | 274 'package build', |
| 275 self.m.chromium.c.build_config_fs, | 275 self.m.chromium.c.build_config_fs, |
| 276 upload_url, | 276 upload_url, |
| 277 build_revision=self.revision) | 277 build_revision=self.revision) |
| 278 | 278 |
| 279 # Zip and upload out/{Debug,Release}/apks/AppRTCDemo.apk |
| 280 if self.bot_config.get('archive_apprtc', False): |
| 281 apk_root = self.m.chromium.c.build_dir.join( |
| 282 self.m.chromium.c.build_config_fs, 'apks') |
| 283 zip_path = self.m.path['slave_build'].join('AppRTCDemo_apk.zip') |
| 284 |
| 285 pkg = self.m.zip.make_package(apk_root, zip_path) |
| 286 pkg.add_file(apk_root.join('AppRTCDemo.apk')) |
| 287 pkg.zip('AppRTCDemo zip archive') |
| 288 |
| 289 apk_upload_url = 'client.webrtc/%s/AppRTCDemo_apk_%s.zip' % ( |
| 290 self.buildername, self.revision_number) |
| 291 self.m.gsutil.upload(zip_path, 'chromium-webrtc', apk_upload_url, |
| 292 args=['-a', 'public-read'], unauthenticated_url=True) |
| 293 |
| 279 def extract_build(self): | 294 def extract_build(self): |
| 280 if not self.m.properties.get('parent_got_revision'): | 295 if not self.m.properties.get('parent_got_revision'): |
| 281 raise self.m.step.StepFailure( | 296 raise self.m.step.StepFailure( |
| 282 'Testers cannot be forced without providing revision information. ' | 297 'Testers cannot be forced without providing revision information. ' |
| 283 'Please select a previous build and click [Rebuild] or force a build ' | 298 'Please select a previous build and click [Rebuild] or force a build ' |
| 284 'for a Builder instead (will trigger new runs for the testers).') | 299 'for a Builder instead (will trigger new runs for the testers).') |
| 285 | 300 |
| 286 # Ensure old build directory isn't being used by removing it. | 301 # Ensure old build directory isn't being used by removing it. |
| 287 self.m.file.rmtree( | 302 self.m.file.rmtree( |
| 288 'build directory', | 303 'build directory', |
| (...skipping 20 matching lines...) Expand all Loading... |
| 309 def clean_test_output(self): | 324 def clean_test_output(self): |
| 310 """Remove all test output in out/, since we have tests leaking files.""" | 325 """Remove all test output in out/, since we have tests leaking files.""" |
| 311 out_dir = self.m.path['checkout'].join('out') | 326 out_dir = self.m.path['checkout'].join('out') |
| 312 self.m.python('clean test output files', | 327 self.m.python('clean test output files', |
| 313 script=self.resource('cleanup_files.py'), | 328 script=self.resource('cleanup_files.py'), |
| 314 args=[out_dir], | 329 args=[out_dir], |
| 315 infra_step=True) | 330 infra_step=True) |
| 316 | 331 |
| 317 def virtual_webcam_check(self): | 332 def virtual_webcam_check(self): |
| 318 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) | 333 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) |
| OLD | NEW |