Change promote script to be able to archive to the new gs://dart-archive/ location

editor/build/promote.py

 #!/usr/bin/env python
 # 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Dart Editor promote and google storage cleanup tools.
 
 import gsutil
+import imp
 import optparse
 import os
 import subprocess
 import sys
 import urllib
 
 from os.path import join
 
 CONTINUOUS = 'gs://dart-editor-archive-continuous'
 TRUNK = 'gs://dart-editor-archive-trunk'
 TESTING = 'gs://dart-editor-archive-testing'
 INTEGRATION = 'gs://dart-editor-archive-integration'
 RELEASE = 'gs://dart-editor-archive-release'
 INTERNAL = 'gs://dart-editor-archive-internal'
 
-DART_PATH = os.path.join('..', '..', '..', 'dart')
+DART_PATH = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
+BOT_UTILS = os.path.abspath(os.path.join(
+    DART_PATH,  'tools', 'bots', 'bot_utils.py'))
+
+bot_utils = imp.load_source('bot_utils', BOT_UTILS)
 
 def _BuildOptions():
   """Setup the argument processing for this program.
 
   Returns:
     the OptionParser to process the CLI
   """
   usage = """usage: %prog [options] cleanup|promote
   where:
     cleanup will cleanup the Google storage continuous bucket
@@ skipping 33 matching lines @@
                    action='store_true')
   group.add_option('--trunk',
                    help='Promote from trunk',
                    action='store_true')
   group.add_option('--internal',
                    help='Promote from trunk to internal',
                    action='store_true')
   group.add_option('--integration',
                    help='Promote from integration',
                    action='store_true')
+  group.add_option('--channel', type='string',
+                   help='Promote from this channel',
+                   default=None)
   result.add_option_group(group)
 
   result.add_option('--gsbucketuri',
                     help='Dart Continuous Google Storage bucket URI.',
                     action='store')
   result.add_option('--gsutilloc',
                     help='location of gsutil the program',
                     action='store')
   result.add_option('--dryrun', help='don\'t do anything that would change'
                     ' Google Storage',
@@ skipping 16 matching lines @@
     parser.print_help()
     sys.exit(1)
 
   if args[0] == 'promote':
     command = 'promote'
     if options.revision is None:
       print 'You must specify a --revision to specify which revision to promote'
       parser.print_help()
       sys.exit(3)
     if not (options.continuous or options.integration or
-            options.testing or options.trunk or options.internal):
-      print 'Specify --continuous, --integration, --testing, or --trunk'
+            options.testing or options.trunk or options.internal or
+            options.channel):
+      print ('Specify --continuous, --integration, --testing, --trunk or '
+            '--channel=be/dev/stable')
       parser.print_help()
       sys.exit(4)
     if options.continuous and options.integration:
       print 'continuous and integration can not be specified at the same time'
       parser.print_help()
       sys.exit(5)
     if (options.continuous or options.integration) and options.testing:
       print """Warning --continuous or --integration  and --testing are
        specified.  The --testing flag will take precedence and all data will
        go to the testing bucket {0}""".format(TESTING)
@@ skipping 31 matching lines @@
   if command == 'cleanup':
     #if the testing flag is set remove the date from the testing bucket
     if options.testing:
       bucket = TESTING
     #otherwise use the value passed as --gsbucketuri
     else:
       bucket = options.gsbucketuri
     version_dirs = _ReadBucket(gsu, '{0}/{1}'.format(bucket, '[0-9]*'))
     _RemoveElements(gsu, bucket, version_dirs, options.keepcount)
   elif command == 'promote':
-    _PromoteBuild(options.revision, bucket_from, bucket_to)
-    _UpdateDocs()
+    if options.channel:
+      _PromoteDartArchiveBuild(options.channel, options.revision)
+    else:
+      _PromoteBuild(options.revision, bucket_from, bucket_to)
+      _UpdateDocs()
 
 
 def _UpdateDocs():
   try:
     print 'Updating docs'
     url = "http://api.dartlang.org/docs/releases/latest/?force_reload=true"
     f = urllib.urlopen(url)
     f.read()
     print 'Successfully updated api docs'
   except Exception as e:
@@ skipping 81 matching lines @@
   _Gsutil(['cp', '-r', '-a', 'public-read', src + '*', dest])
 
   # copy from continuous/1234 to trunk/latest
   dest = '%s/%s/' % (to_bucket, 'latest')
   destUpdate = dest + 'eclipse-update/'
   print 'copying: %s -> %s' % (src, dest)
   _Gsutil(['cp', '-a', 'public-read', srcVersion, destUpdate + 'features/'])
   _Gsutil(['cp', '-a', 'public-read', srcVersion, destUpdate + 'plugins/'])
   _Gsutil(['cp', '-r', '-a', 'public-read', src + '*', dest])
 
+def _PromoteDartArchiveBuild(channel, revision):

[ricow1, 2013/10/14 15:39:38]

I think it would be really beneficial to actually state the structure, either
here or in the bot_utils file so that we have a common reference. Reading this
without much context means that it hard to reason about. I know we already have
this in a document, but we should have it here somewhere.

[kustermann, 2013/10/15 08:01:18]

Then it should obviously be in bot_utils.py. (Otherwise we would need to
document it in any user of bot_utils.py.)

+  raw_namer = bot_utils.GCSNamer(channel, bot_utils.ReleaseType.RAW)
+  signed_namer = bot_utils.GCSNamer(channel, bot_utils.ReleaseType.SIGNED)
+  release_namer = bot_utils.GCSNamer(channel, bot_utils.ReleaseType.RELEASE)
+
+  def promote(to_revision):
+    # Copy VERSION file.
+    from_loc = raw_namer.version_filepath(revision)
+    to_loc = release_namer.version_filepath(to_revision)
+    _Gsutil(['cp', '-a', 'public-read', from_loc, to_loc])
+
+    # Copy sdk directory.
+    from_loc = raw_namer.sdk_directory(revision)
+    to_loc = release_namer.sdk_directory(to_revision)
+    _Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc])
+
+    # Copy eclipse update directory.
+    from_loc = raw_namer.editor_eclipse_update_directory(revision)
+    to_loc = release_namer.editor_eclipse_update_directory(to_revision)
+    _Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc])
+
+    # Copy api-docs directory.
+    from_loc = raw_namer.apidocs_directory(revision)
+    to_loc = release_namer.apidocs_directory(to_revision)
+    _Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc])
+
+    # Copy dartium directory.
+    from_loc = raw_namer.dartium_directory(revision)
+    to_loc = release_namer.dartium_directory(to_revision)
+    _Gsutil(['-m', 'cp', '-a', 'public-read', '-R', from_loc, to_loc])
+
+    # Copy editor zip files.
+    for system in ['windows', 'macos', 'linux']:
+      for arch in ['ia32', 'x64']:
+        from_namer = raw_namer
+        # We have signed versions of the editor for windows and macos.
+        if system == 'windows' or system == 'macos':
+          from_namer = signed_namer
+        from_loc = from_namer.editor_zipfilepath(revision, system, arch)
+        to_loc = release_namer.editor_zipfilepath(to_revision, system, arch)
+        _Gsutil(['cp', '-a', 'public-read', from_loc, to_loc])
+        _Gsutil(['cp', '-a', 'public-read', from_loc + '.md5sum',
+                 to_loc + '.md5sum'])
+
+  promote(revision)
+  promote('latest')
 
 def _PrintSeparator(text):
   print '================================'
   print '== %s' % text
 
 
 def _PrintFailure(text):
   print '*****************************'
   print '** %s' % text
   print '*****************************'
 
 
 def _Gsutil(cmd):
   gsutilTool = join(DART_PATH, 'third_party', 'gsutil', 'gsutil')
   return _ExecuteCommand([sys.executable, gsutilTool] + cmd)
 
 
 def _ExecuteCommand(cmd, directory=None):
   """Execute the given command."""
   if directory is not None:
     cwd = os.getcwd()
     os.chdir(directory)
   subprocess.call(cmd, env=os.environ)
   if directory is not None:
     os.chdir(cwd)
 
 
 if __name__ == '__main__':
   sys.exit(main())