| OLD | NEW | 
|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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 | 5 | 
| 6 # Recipe module for Skia Swarming trigger. | 6 # Recipe module for Skia Swarming trigger. | 
| 7 | 7 | 
| 8 | 8 | 
| 9 import json | 9 import json | 
| 10 | 10 | 
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 597   version = 'version:%s' % version | 597   version = 'version:%s' % version | 
| 598   return (asset_name, 'skia/bots/%s' % asset_name, version) | 598   return (asset_name, 'skia/bots/%s' % asset_name, version) | 
| 599 | 599 | 
| 600 | 600 | 
| 601 def RunSteps(api): | 601 def RunSteps(api): | 
| 602   # Fix some paths. | 602   # Fix some paths. | 
| 603   # TODO(borenet): We can remove this after the recipes move into Skia repo. | 603   # TODO(borenet): We can remove this after the recipes move into Skia repo. | 
| 604   root_path = api.path.c.base_paths['root'] | 604   root_path = api.path.c.base_paths['root'] | 
| 605   api.path.c.base_paths['depot_tools'] = root_path + ('depot_tools',) | 605   api.path.c.base_paths['depot_tools'] = root_path + ('depot_tools',) | 
| 606   if 'RemoteRun' in api.properties['buildername']: | 606   if 'RemoteRun' in api.properties['buildername']: | 
| 607     api.path.c.base_paths['build'] = root_path + ('checkout',) | 607     api.path.c.base_paths['build'] = root_path[:-1] + ('rw', 'checkout') | 
| 608   else: | 608   else: | 
| 609     api.path.c.base_paths['build'] = root_path + ('build',) | 609     api.path.c.base_paths['build'] = root_path + ('build',) | 
| 610 | 610 | 
| 611   got_revision = checkout_steps(api) | 611   got_revision = checkout_steps(api) | 
| 612   api.skia_swarming.setup( | 612   api.skia_swarming.setup( | 
| 613       api.path['checkout'].join('infra', 'bots', 'tools', 'luci-go'), | 613       api.path['checkout'].join('infra', 'bots', 'tools', 'luci-go'), | 
| 614       swarming_rev='') | 614       swarming_rev='') | 
| 615 | 615 | 
| 616   # Run gsutil.py to ensure that it's installed. | 616   # Run gsutil.py to ensure that it's installed. | 
| 617   api.gsutil(['help']) | 617   api.gsutil(['help']) | 
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 829   master = 'client.skia' | 829   master = 'client.skia' | 
| 830   test = test_for_bot(api, builder, master, slave, 'legacy_skimage_version', | 830   test = test_for_bot(api, builder, master, slave, 'legacy_skimage_version', | 
| 831                       legacy_skimage_version=True) | 831                       legacy_skimage_version=True) | 
| 832   test += api.step_data('Get downloaded SK_IMAGE_VERSION', retcode=1) | 832   test += api.step_data('Get downloaded SK_IMAGE_VERSION', retcode=1) | 
| 833   yield test | 833   yield test | 
| 834 | 834 | 
| 835   test = test_for_bot(api, builder, master, slave, 'legacy_skp_version', | 835   test = test_for_bot(api, builder, master, slave, 'legacy_skp_version', | 
| 836                       legacy_skp_version=True) | 836                       legacy_skp_version=True) | 
| 837   test += api.step_data('Get downloaded SKP_VERSION', retcode=1) | 837   test += api.step_data('Get downloaded SKP_VERSION', retcode=1) | 
| 838   yield test | 838   yield test | 
| OLD | NEW | 
|---|