Only skip uploading of addin if the file already exists on google storage.

visual_studio/NativeClientVSAddIn/buildbot_run.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Entry point for the AddIn build bot.
 
 Perform build steps and output results using the buildbot
 annootator syntax
 """
@@ skipping 141 matching lines @@
   else:
     if os.name == 'nt':
       gsutil = [sys.executable, _FindInPath('gsutil')]
     else:
       gsutil = ['gsutil']
 
   return gsutil
 
 
 def StepArchive(revision):
-  # The BUILDBOT_REVISION environment variable gets set to the revsion that
-  # triggered a given build.  For periodic schedulers this will be an empty
-  # string since they are not triggered by a particular revision.  We don't
-  # want to upload the build results to google storage for periodic schedulers
-  # so we skip this step in that case.
-  triggered_revision = os.environ.get('BUILDBOT_REVISION')
-  if triggered_revision == '' or triggered_revision is None:
-    Log('Skipping archive step: BUILDBOT_REVISION not set')
-    return
-
   Log('@@@BUILD_STEP archive build [r%s]@@@' % revision)
   basename = 'vs_addin.tgz'
   remote_name = '%s/%s/%s' % (GSPATH, revision, basename)
   local_filename = os.path.join('..', '..', 'out',
                                 'vs_addin', basename)
   gs_remote_name = 'gs://' + remote_name
   gsutil = _GetGsutil()
 
   # Check for existing file on google storage
   if RunCommand(gsutil + ['ls', gs_remote_name], check_return_code=False) == 0:
-    Log('File already exists on google storage: %s' % gs_remote_name)
-    Log('@@@STEP_FAILURE@@@')
+    Log('Skipping archive step: file already exists on google storage')
     sys.exit(1)

[binji, 2014/06/14 01:13:37]

just return? Or sys.exit(0)?

[Sam Clegg, 2014/06/17 21:23:54]

Done.

 
   # Upload to google storage
   cmd = gsutil + ['cp', '-a', 'public-read', local_filename, gs_remote_name]
   RunCommand(cmd)
   url = "%s/%s" % (GSURL, remote_name)
   Log('@@@STEP_LINK@download@%s@@@' % url)
 
 
 def main():
   # Remove BOTO_CONFIG from the environment -- we want to use the NaCl .boto
@@ skipping 11 matching lines @@
 
   StepBuild(revision)
   StepInstall()
   StepInstallSDK()
   StepTest()
   StepArchive(revision)
 
 
 if __name__ == '__main__':
   main()