diff options
Diffstat (limited to 'buildbot_test_toolchains.py')
-rwxr-xr-x | buildbot_test_toolchains.py | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index 34e7c2b7..91d4e3f1 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -30,14 +30,10 @@ USE_NEXT_GCC_PATCH = '230260' # CL that uses LLVM to build the peppy image. USE_LLVM_PATCH = '295217' -# The boards on which we run weekly reports -WEEKLY_REPORT_BOARDS = ['lumpy'] - CROSTC_ROOT = '/usr/local/google/crostc' ROLE_ACCOUNT = 'mobiletc-prebuild' TOOLCHAIN_DIR = os.path.dirname(os.path.realpath(__file__)) MAIL_PROGRAM = '~/var/bin/mail-sheriff' -WEEKLY_REPORTS_ROOT = os.path.join(CROSTC_ROOT, 'weekly_test_data') PENDING_ARCHIVES_DIR = os.path.join(CROSTC_ROOT, 'pending_archives') NIGHTLY_TESTS_DIR = os.path.join(CROSTC_ROOT, 'nightly_test_reports') @@ -233,54 +229,6 @@ class ToolchainComparator(object): ret = self._ce.RunCommand(command) return - def _CopyWeeklyReportFiles(self, trybot_image, vanilla_image, nonafdo_image): - """Put files in place for running seven-day reports. - - Create tar files of the custom and official images and copy them - to the weekly reports directory, so they exist when the weekly report - gets generated. IMPORTANT NOTE: This function must run *after* - crosperf has been run; otherwise the vanilla images will not be there. - """ - - dry_run = False - if os.getlogin() != ROLE_ACCOUNT: - self._l.LogOutput('Running this from non-role account; not copying ' - 'tar files for weekly reports.') - dry_run = True - - images_path = os.path.join( - os.path.realpath(self._chromeos_root), 'chroot/tmp') - - data_dir = os.path.join(WEEKLY_REPORTS_ROOT, self._board) - dest_dir = os.path.join(data_dir, self._weekday) - if not os.path.exists(dest_dir): - os.makedirs(dest_dir) - - # Make sure dest_dir is empty (clean out last week's data). - cmd = 'cd %s; rm -Rf %s_*_image*' % (dest_dir, self._weekday) - if dry_run: - print('CMD: %s' % cmd) - else: - self._ce.RunCommand(cmd) - - # Now create new tar files and copy them over. - labels = {'test': trybot_image, 'vanilla': vanilla_image} - if nonafdo_image: - labels['nonafdo'] = nonafdo_image - for label_name, test_path in labels.iteritems(): - tar_file_name = '%s_%s_image.tar' % (self._weekday, label_name) - cmd = ('cd %s; tar -cvf %s %s/chromiumos_test_image.bin; ' - 'cp %s %s/.') % (images_path, tar_file_name, test_path, - tar_file_name, dest_dir) - if dry_run: - print('CMD: %s' % cmd) - tar_ret = 0 - else: - tar_ret = self._ce.RunCommand(cmd) - if tar_ret: - self._l.LogOutput('Error while creating/copying test tar file(%s).' % - tar_file_name) - def _SendEmail(self): """Find email message generated by crosperf and send it.""" filename = os.path.join(self._reports_dir, 'msg_body.html') @@ -329,10 +277,6 @@ class ToolchainComparator(object): self._TestImages(trybot_image, vanilla_image, nonafdo_image) self._SendEmail() - if (self._patches_string == USE_NEXT_GCC_PATCH and - self._board in WEEKLY_REPORT_BOARDS): - # Only try to copy the image files if the test runs ran successfully. - self._CopyWeeklyReportFiles(trybot_image, vanilla_image, nonafdo_image) return 0 |