| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 from slave import recipe_api | 6 import re |
| 7 from slave import recipe_config_types | 7 import os |
| 8 from common.skia import builder_name_schema | 8 import sys |
| 9 from common.skia import global_constants | 9 |
| 10 from recipe_engine import recipe_api |
| 11 from recipe_engine import recipe_config_types |
| 10 from . import android_flavor | 12 from . import android_flavor |
| 11 from . import chromeos_flavor | 13 from . import chromeos_flavor |
| 12 from . import default_flavor | 14 from . import default_flavor |
| 13 from . import ios_flavor | 15 from . import ios_flavor |
| 14 from . import valgrind_flavor | 16 from . import valgrind_flavor |
| 15 from . import xsan_flavor | 17 from . import xsan_flavor |
| 16 | 18 |
| 17 import re | 19 # TODO(luqui): Make this recipe stop depending on common so we can make it |
| 20 # independent of build/. |
| 21 sys.path.append( |
| 22 os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname( |
| 23 os.path.abspath(__file__)))))) |
| 24 from common.skia import builder_name_schema |
| 25 from common.skia import global_constants |
| 18 | 26 |
| 19 | 27 |
| 20 # The gsutil recipe API uses a different gsutil version which does not work | 28 # The gsutil recipe API uses a different gsutil version which does not work |
| 21 # on our bots. Force the version using this constant. | 29 # on our bots. Force the version using this constant. |
| 22 GSUTIL_VERSION = '3.25' | 30 GSUTIL_VERSION = '3.25' |
| 23 | 31 |
| 24 TEST_EXPECTED_SKP_VERSION = '42' | 32 TEST_EXPECTED_SKP_VERSION = '42' |
| 25 TEST_EXPECTED_SKIMAGE_VERSION = '42' | 33 TEST_EXPECTED_SKIMAGE_VERSION = '42' |
| 26 | 34 |
| 27 | 35 |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 # TryBots are uploaded elsewhere so they can use the same key. | 563 # TryBots are uploaded elsewhere so they can use the same key. |
| 556 blacklist = ['role', 'is_trybot'] | 564 blacklist = ['role', 'is_trybot'] |
| 557 | 565 |
| 558 params = builder_name_schema.DictForBuilderName(self.c.BUILDER_NAME) | 566 params = builder_name_schema.DictForBuilderName(self.c.BUILDER_NAME) |
| 559 flat = [] | 567 flat = [] |
| 560 for k in sorted(params.keys()): | 568 for k in sorted(params.keys()): |
| 561 if k not in blacklist: | 569 if k not in blacklist: |
| 562 flat.append(k) | 570 flat.append(k) |
| 563 flat.append(params[k]) | 571 flat.append(params[k]) |
| 564 return flat | 572 return flat |
| OLD | NEW |