| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import json | 5 import json |
| 6 import uuid | 6 import uuid |
| 7 | 7 |
| 8 # This is a wrapper class of revision that stores its build path and | 8 # This is a wrapper class of revision that stores its build path and |
| 9 # queries its status. Part of the code are adapted from the RevisionState | 9 # queries its status. Part of the code are adapted from the RevisionState |
| 10 # class from auto-bisect module | 10 # class from auto-bisect module |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 # The way android builders on tryserver.chromium.perf are archived is | 144 # The way android builders on tryserver.chromium.perf are archived is |
| 145 # different from builders on chromium.perf. In order to support both | 145 # different from builders on chromium.perf. In order to support both |
| 146 # forms of archives, we added this temporary hack until builders are | 146 # forms of archives, we added this temporary hack until builders are |
| 147 # fixed. See http://crbug.com/535218. | 147 # fixed. See http://crbug.com/535218. |
| 148 zip_dir = self.api.m.path.join(self.api.m.path['checkout'], 'full-build-
linux') | 148 zip_dir = self.api.m.path.join(self.api.m.path['checkout'], 'full-build-
linux') |
| 149 if self.api.m.path.exists(zip_dir): # pragma: no cover | 149 if self.api.m.path.exists(zip_dir): # pragma: no cover |
| 150 self.api.m.file.rmtree('full-build-linux directory', zip_dir) | 150 self.api.m.file.rmtree('full-build-linux directory', zip_dir) |
| 151 gs_bucket = 'gs://%s/' % self.bucket | 151 gs_bucket = 'gs://%s/' % self.bucket |
| 152 archive_path = self.build_file_path[len(gs_bucket):] | 152 archive_path = self.build_file_path[len(gs_bucket):] |
| 153 self.api.m.chromium_android.download_build( | 153 self.api.m.chromium_android.download_build( |
| 154 bucket=bot_config['bucket'], | 154 bucket=self.bucket, |
| 155 path=archive_path) | 155 path=archive_path) |
| 156 | 156 |
| 157 # The way android builders on tryserver.chromium.perf are archived is | 157 # The way android builders on tryserver.chromium.perf are archived is |
| 158 # different from builders on chromium.perf. In order to support both | 158 # different from builders on chromium.perf. In order to support both |
| 159 # forms of archives, we added this temporary hack until builders are | 159 # forms of archives, we added this temporary hack until builders are |
| 160 # fixed. See http://crbug.com/535218. | 160 # fixed. See http://crbug.com/535218. |
| 161 if self.api.m.path.exists(zip_dir): # pragma: no cover | 161 if self.api.m.path.exists(zip_dir): # pragma: no cover |
| 162 self.api.m.python.inline( | 162 self.api.m.python.inline( |
| 163 'moving full-build-linux to out/Release', | 163 'moving full-build-linux to out/Release', |
| 164 """ | 164 """ |
| 165 import shutil | 165 import shutil |
| 166 import sys | 166 import sys |
| 167 shutil.move(sys.argv[1], sys.argv[2]) | 167 shutil.move(sys.argv[1], sys.argv[2]) |
| 168 """, | 168 """, |
| 169 args=[zip_dir, build_dir]) | 169 args=[zip_dir, build_dir]) |
| 170 else: | 170 else: |
| 171 self.api.m.chromium_tests.download_and_unzip_build( | 171 self.api.m.chromium_tests.download_and_unzip_build( |
| 172 mastername, buildername, update_step, bot_db, | 172 mastername, buildername, update_step, bot_db, |
| 173 build_archive_url=self.build_file_path, | 173 build_archive_url=self.build_file_path, |
| 174 build_revision=self.commit_hash, | 174 build_revision=self.commit_hash, |
| 175 override_bot_type='tester') | 175 override_bot_type='tester') |
| OLD | NEW |