Roll 50: Updated for push to origin/master.

tools/dartium/buildbot_annotated_steps.py

 #!/usr/bin/python
 
 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Dartium buildbot steps
 
 Archive dartium, content_shell, and chromedriver to the cloud storage bucket
 gs://dart-archive, and run tests, including the Dart layout tests.
@@ skipping 72 matching lines @@
   with utils.ChangedWorkingDirectory(DART_PATH):
     dart_tools_utils = imp.load_source('dart_tools_utils',
                                        os.path.join('tools', 'utils.py'))
     dart_revision = dart_tools_utils.GetArchiveVersion()
 
   version = '%s.0' % dart_revision
   info = upload_steps.BuildInfo(dart_revision, version)
 
   result = 0
 
-  # Archive to the revision bucket unless integration build
-  if info.channel != 'integration':
-    result = upload_steps.ArchiveAndUpload(info, archive_latest=False)
-    # On dev/stable we archive to the latest bucket as well
-    if info.channel != 'be':
-      result = (upload_steps.ArchiveAndUpload(info, archive_latest=True)
-                or result)
+  # Archive to the revision bucket
+  result = upload_steps.ArchiveAndUpload(info, archive_latest=False)
+  # On dev/stable we archive to the latest bucket as well
+  if info.channel != 'be':
+    result = (upload_steps.ArchiveAndUpload(info, archive_latest=True)
+              or result)
 
   # Run layout tests
   if info.mode == 'Release' or platform.system() != 'Darwin':
     result = Test(info, 'drt', 'layout', 'unchecked') or result
     result = Test(info, 'drt', 'layout', 'checked') or result
   # Run dartium tests
   result = Test(info, 'dartium', 'core', 'unchecked') or result
   result = Test(info, 'dartium', 'core', 'checked') or result
   
   # Run ContentShell tests
   # NOTE: We don't run ContentShell tests on dartium-*-inc builders to keep
   # cycle times down.
   if not info.is_incremental:
     # If we run all checked tests on dartium, we restrict the number of
     # unchecked tests on drt to DRT_FILTER
     result = Test(info, 'drt', 'core', 'unchecked',
                   test_filter=DRT_FILTER) or result
     result = Test(info, 'drt', 'core', 'checked') or result
 
   # On the 'be' channel, we only archive to the latest bucket if all tests were
   # successful.
   if result == 0 and info.channel == 'be':
     result = upload_steps.ArchiveAndUpload(info, archive_latest=True) or result
   return result
 
 if __name__ == '__main__':
   sys.exit(main())