From 2b1b23dcb333b4faeb3a3a04ef8e892188bb21c9 Mon Sep 17 00:00:00 2001 From: Simran Basi Date: Tue, 20 May 2014 14:40:16 -0700 Subject: Copy LATEST markers to extra upload archives. Currently we don't upload the LATEST markers. This change looks up the board for each builder_run in the report stage and also uploads the LATEST marker to the extra archives if there are any. BUG=chromium:375354 TEST=Rambi-paladin trybot run. sandybridge-ivybridge-release-group trybot run. report_stages_unittest. Change-Id: I2863561b8e312aa5499fce9501c5215db0732f0b Reviewed-on: https://chromium-review.googlesource.com/201233 Tested-by: Simran Basi Reviewed-by: Don Garrett Commit-Queue: Simran Basi --- cbuildbot/stages/generic_stages.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'cbuildbot/stages/generic_stages.py') diff --git a/cbuildbot/stages/generic_stages.py b/cbuildbot/stages/generic_stages.py index 72153c898..9b2adcf06 100644 --- a/cbuildbot/stages/generic_stages.py +++ b/cbuildbot/stages/generic_stages.py @@ -677,17 +677,20 @@ class ArchivingStageMixin(object): return True return False - def _GetUploadUrls(self, filename): + def _GetUploadUrls(self, filename, board=None): """Returns a list of all urls for which to upload filename to. Args: filename: The filename of the file we want to upload. + board: Board whose overlay to search for the artifacts.json file. + If none, self._current_board is used if it exists. """ urls = [self.upload_url] if (not self._IsInUploadBlacklist(filename) and - hasattr(self, '_current_board')): + (hasattr(self, '_current_board') or board)): + board = board if board else self._current_board custom_artifacts_file = portage_utilities.ReadOverlayFile( - 'scripts/artifacts.json', board=self._current_board) + 'scripts/artifacts.json', board=board) if custom_artifacts_file is not None: json_file = json.loads(custom_artifacts_file) for url in json_file.get('extra_upload_urls', []): -- cgit v1.2.3