commit 3cfa04aedb6425c738b0c8dcaf8864acc3024e64
author Frank Henigman <fjhenigman@chromium.org> Fri Feb 06 19:35:55 2015 +0000
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sun Feb 08 16:23:35 2015 +0000
tree 770d85baceb04447d1914929102be364a08f418d
parent 179ec7c0476342fb5682c7bd88a66ed145edd585

Revert "UploadPrebuiltsStage: Temporarily disable SDK prebuilt uploads."

This reverts commit 1333cb16ddf56c120a7c68a2ffd3d1f2a16df919.

CL:246920 addresses the root cause so revert this workaround.

BUG=chromium:455798
TEST=none, apart from testing 246920
CQ-DEPEND=CL:246920

Change-Id: If3f1ccb75d8f5a000a8575bdbd5ecb377d84852eBUG=chromium:455798
Change-Id: If3f1ccb75d8f5a000a8575bdbd5ecb377d84852e
Reviewed-on: https://chromium-review.googlesource.com/247150
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Frank Henigman <fjhenigman@chromium.org>
Commit-Queue: Frank Henigman <fjhenigman@chromium.org>

cbuildbot/stages/artifact_stages.py

diff --git a/cbuildbot/stages/artifact_stages.py b/cbuildbot/stages/artifact_stages.py
index 9438966..21532e2 100644
--- a/cbuildbot/stages/artifact_stages.py
+++ b/cbuildbot/stages/artifact_stages.py
@@ -633,13 +633,6 @@
   @failures_lib.SetFailureType(failures_lib.InfrastructureFailure)
   def PerformStage(self):
     """Uploads prebuilts for master and slave builders."""
-
-    if self._run.config.build_type == constants.CHROOT_BUILDER_TYPE:
-      cros_build_lib.PrintBuildbotStepWarnings()
-      cros_build_lib.Warning('XXX:HACK Skipping stage on SDK Bots only. '
-                             'See crbug.com/455798')
-      return
-
     prebuilt_type = self._prebuilt_type
     board = self._current_board
     binhosts = []