chiark / gitweb /
Merge branch 'mr/update_platforms_tools' into 'master'
[fdroidserver.git] / makebuildserver
index abc4ca734142e272e589dffb90dd5fe1c326e0c0..23f29917569b1b3965c2b714e9bae7545b901151 100755 (executable)
@@ -4,35 +4,57 @@ import os
 import pathlib
 import re
 import requests
-import shutil
 import stat
 import sys
+import shutil
 import subprocess
-import tarfile
 import vagrant
 import hashlib
 import yaml
+import json
+import logging
 from clint.textui import progress
 from optparse import OptionParser
 import fdroidserver.tail
+import fdroidserver.vmtools
 
 
-if not os.path.exists('makebuildserver') and not os.path.exists('buildserver'):
-    print('This must be run as ./makebuildserver in fdroidserver.git!')
-    sys.exit(1)
-
-
-tail = None
-
 parser = OptionParser()
-parser.add_option("-v", "--verbose", action="store_true", default=False,
+parser.add_option('-v', '--verbose', action="count", dest='verbosity', default=1,
                   help="Spew out even more information than normal")
+parser.add_option('-q', action='store_const', const=0, dest='verbosity')
 parser.add_option("-c", "--clean", action="store_true", default=False,
                   help="Build from scratch, rather than attempting to update the existing server")
+parser.add_option('--skip-cache-update', action="store_true", default=False,
+                  help="""Skip downloading and checking cache."""
+                       """This assumes that the cache is already downloaded completely.""")
+parser.add_option('--keep-box-file', action="store_true", default=False,
+                  help="""Box file will not be deleted after adding it to box storage"""
+                       """ (KVM-only).""")
 options, args = parser.parse_args()
 
+logger = logging.getLogger('fdroidserver-makebuildserver')
+if options.verbosity >= 2:
+    logging.basicConfig(format='%(message)s', level=logging.DEBUG)
+    logger.setLevel(logging.DEBUG)
+elif options.verbosity == 1:
+    logging.basicConfig(format='%(message)s', level=logging.INFO)
+    logger.setLevel(logging.INFO)
+elif options.verbosity <= 0:
+    logging.basicConfig(format='%(message)s', level=logging.WARNING)
+    logger.setLevel(logging.WARNING)
+
+
+if not os.path.exists('makebuildserver') and not os.path.exists('buildserver'):
+    logger.critical('This must be run as ./makebuildserver in fdroidserver.git!')
+    sys.exit(1)
+
+tail = None
+
 # set up default config
 cachedir = os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver')
+logger.debug('cachedir set to: %s', cachedir)
+
 config = {
     'basebox': 'jessie64',
     'baseboxurl': [
@@ -56,11 +78,11 @@ if os.path.isfile('/usr/bin/systemd-detect-virt'):
     except subprocess.CalledProcessError as e:
         virt = 'none'
     if virt == 'qemu' or virt == 'kvm' or virt == 'bochs':
-        print('Running in a VM guest, defaulting to QEMU/KVM via libvirt')
+        logger.info('Running in a VM guest, defaulting to QEMU/KVM via libvirt')
         config['vm_provider'] = 'libvirt'
-        config['domain'] = 'buildserver_default'
     elif virt != 'none':
-        print('Running in an unsupported VM guest (' + virt + ')!')
+        logger.info('Running in an unsupported VM guest (%s)!', virt)
+    logger.debug('detected virt: %s', virt)
 
 # load config file, if present
 if os.path.exists('makebuildserver.config.py'):
@@ -70,28 +92,40 @@ elif os.path.exists('makebs.config.py'):
     exec(compile(open('makebs.config.py').read(), 'makebs.config.py', 'exec'), config)
 if '__builtins__' in config:
     del(config['__builtins__'])  # added by compile/exec
+logger.debug("makebuildserver.config.py parsed -> %s", json.dumps(config, indent=4, sort_keys=True))
 
 # Update cached files.
 cachedir = config['cachedir']
 if not os.path.exists(cachedir):
     os.makedirs(cachedir, 0o755)
+    logger.debug('created cachedir %s because it did not exists.', cachedir)
 
 if config['vm_provider'] == 'libvirt':
     tmp = cachedir
     while tmp != '/':
         mode = os.stat(tmp).st_mode
         if not (stat.S_IXUSR & mode and stat.S_IXGRP & mode and stat.S_IXOTH & mode):
-            print('ERROR:', tmp, 'will not be accessible to the VM!  To fix, run:')
-            print('  chmod a+X', tmp)
+            logger.critical('ERROR: %s will not be accessible to the VM!  To fix, run:', tmp)
+            logger.critical('  chmod a+X %s', tmp)
             sys.exit(1)
         tmp = os.path.dirname(tmp)
+    logger.debug('cache dir %s is accessible for libvirt vm.', cachedir)
 
 if config['apt_package_cache']:
     config['aptcachedir'] = cachedir + '/apt/archives'
+    logger.debug('aptcachedir is set to %s', config['aptcachedir'])
+    aptcachelock = os.path.join(config['aptcachedir'], 'lock')
+    if os.path.isfile(aptcachelock):
+        logger.info('apt cache dir is locked, removing lock')
+        os.remove(aptcachelock)
+    aptcachepartial = os.path.join(config['aptcachedir'], 'partial')
+    if os.path.isdir(aptcachepartial):
+        logger.info('removing partial downloads from apt cache dir')
+        shutil.rmtree(aptcachepartial)
 
 cachefiles = [
-    ('https://dl.google.com/android/repository/tools_r25.2.3-linux.zip',
-     '1b35bcb94e9a686dff6460c8bca903aa0281c6696001067f34ec00093145b560'),
+    ('https://dl.google.com/android/repository/tools_r25.2.5-linux.zip',
+     '577516819c8b5fae680f049d39014ff1ba4af870b687cab10595783e6f22d33e'),
     ('https://dl.google.com/android/repository/android_m2repository_r47.zip',
      'a3f91808dce50c1717737de90c18479ed3a78b147e06985247d138e7ab5123d0'),
     ('https://dl.google.com/android/repository/android-1.5_r04-linux.zip',
@@ -138,8 +172,10 @@ cachefiles = [
      '4b4bcddead3319708275c54c76294707bfaa953d767e34f1a5b599f3edd0076c'),
     ('https://dl.google.com/android/repository/platform-24_r02.zip',
      'f268f5945c6ece7ea95c1c252067280854d2a20da924e22ae4720287df8bdbc9'),
-    ('https://dl.google.com/android/repository/platform-25_r01.zip',
-     'da519dc3e07b8cb879265c94f798262c1f90791dfaa8b745d34883891378438e'),
+    ('https://dl.google.com/android/repository/platform-25_r03.zip',
+     '9b742d34590fe73fb7229e34835ecffb1846ca389d9f924f0b2a37de525dc6b8'),
+    ('https://dl.google.com/android/repository/platform-26_r02.zip',
+     '2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a'),
     ('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
     ('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
@@ -198,6 +234,12 @@ cachefiles = [
      '671b4e00f5b986c7355507c7024b725a4b4cadf11ca61fa5b1334ec6ea57d94f'),
     ('https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip',
      '1d7ac9b6def16fb0254ec23c135c02dd9f6908073352a20315a017e4b2a904b0'),
+    ('https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip',
+     '152c1b187947edd10c65af8b279d40321ecc106106323e53df3608e578042d65'),
+    ('https://dl.google.com/android/repository/build-tools_r26-linux.zip',
+     '7422682f92fb471d4aad4c053c9982a9a623377f9d5e4de7a73cd44ebf2f3c61'),
+    ('https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip',
+     'c8617f25a7de2aeb9ddcacf1aeb413e053d5ed5ef4a3f31fe0ce21d4428ee0ea'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('https://services.gradle.org/distributions/gradle-1.4-bin.zip',
@@ -264,6 +306,16 @@ cachefiles = [
      'db1db193d479cc1202be843f17e4526660cfb0b21b57d62f3a87f88c878af9b2'),
     ('https://services.gradle.org/distributions/gradle-3.5-bin.zip',
      '0b7450798c190ff76b9f9a3d02e18b33d94553f708ebc08ebe09bdf99111d110'),
+    ('https://services.gradle.org/distributions/gradle-3.5.1-bin.zip',
+     '8dce35f52d4c7b4a4946df73aa2830e76ba7148850753d8b5e94c5dc325ceef8'),
+    ('https://services.gradle.org/distributions/gradle-4.0-bin.zip',
+     '56bd2dde29ba2a93903c557da1745cafd72cdd8b6b0b83c05a40ed7896b79dfe'),
+    ('https://services.gradle.org/distributions/gradle-4.0.1-bin.zip',
+     'd717e46200d1359893f891dab047fdab98784143ac76861b53c50dbd03b44fd4'),
+    ('https://services.gradle.org/distributions/gradle-4.0.2-bin.zip',
+     '79ac421342bd11f6a4f404e0988baa9c1f5fabf07e3c6fa65b0c15c1c31dda22'),
+    ('https://services.gradle.org/distributions/gradle-4.1-bin.zip',
+     'd55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
@@ -276,8 +328,10 @@ cachefiles = [
      'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e'),
     ('https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip',
      '3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c'),
-    ('https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip',
-     '3e622c2c9943964ea44cd56317d0769ed4c811bb4b40dc45b1f6965e4db9aa44'),
+    ('https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip',
+     '0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'),
+    ('https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip',
+     'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'),
     ('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
      'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
 ]
@@ -294,77 +348,6 @@ def sha256_for_file(path):
         return s.hexdigest()
 
 
-def destroy_current_image(v, serverdir):
-    global config
-
-    # cannot run vagrant without the config in the YAML file
-    if os.path.exists(os.path.join(serverdir, 'Vagrantfile.yaml')):
-        v.destroy()
-    elif options.verbose:
-        print('Cannot run destroy vagrant setup since Vagrantfile.yaml is not setup!')
-    if config['vm_provider'] == 'libvirt':
-        import libvirt
-        try:
-            virConnect = libvirt.open('qemu:///system')
-            virDomain = virConnect.lookupByName(config['domain'])
-            if virDomain:
-                virDomain.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE
-                                        | libvirt.VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA
-                                        | libvirt.VIR_DOMAIN_UNDEFINE_NVRAM)
-            storagePool = virConnect.storagePoolLookupByName('default')
-            if storagePool:
-                for vol in storagePool.listAllVolumes():
-                    vol.delete()
-        except libvirt.libvirtError as e:
-            print(e)
-
-
-def kvm_package(boxfile):
-    '''
-    Hack to replace missing `vagrant package` for kvm, based  on the script
-    `tools/create_box.sh from vagrant-libvirt
-    '''
-    import libvirt
-    virConnect = libvirt.open('qemu:///system')
-    storagePool = virConnect.storagePoolLookupByName('default')
-    if storagePool:
-        vol = storagePool.storageVolLookupByName(config['domain'] + '.img')
-        imagepath = vol.path()
-        # TODO use a libvirt storage pool to ensure the img file is readable
-        subprocess.check_call(['sudo', '/bin/chmod', '-R', 'a+rX', '/var/lib/libvirt/images'])
-        shutil.copy2(imagepath, 'box.img')
-        subprocess.check_call(['qemu-img', 'rebase', '-p', '-b', '', 'box.img'])
-        metadata = """{
-    "provider": "libvirt",
-    "format": "qcow2",
-    "virtual_size": 1000
-}
-"""
-        vagrantfile = """Vagrant.configure("2") do |config|
-
-  config.vm.provider :libvirt do |libvirt|
-
-    libvirt.driver = "kvm"
-    libvirt.host = ""
-    libvirt.connect_via_ssh = false
-    libvirt.storage_pool_name = "default"
-
-  end
-end
-"""
-        with open('metadata.json', 'w') as fp:
-            fp.write(metadata)
-        with open('Vagrantfile', 'w') as fp:
-            fp.write(vagrantfile)
-        with tarfile.open(boxfile, 'w:gz') as tar:
-            tar.add('metadata.json')
-            tar.add('Vagrantfile')
-            tar.add('box.img')
-        os.remove('metadata.json')
-        os.remove('Vagrantfile')
-        os.remove('box.img')
-
-
 def run_via_vagrant_ssh(v, cmdlist):
     if (isinstance(cmdlist, str) or isinstance(cmdlist, bytes)):
         cmd = cmdlist
@@ -373,9 +356,7 @@ def run_via_vagrant_ssh(v, cmdlist):
     v._run_vagrant_command(['ssh', '-c', cmd])
 
 
-def main():
-    global cachedir, cachefiles, config, tail
-
+def update_cache(cachedir, cachefiles):
     for srcurl, shasum in cachefiles:
         filename = os.path.basename(srcurl)
         local_filename = os.path.join(cachedir, filename)
@@ -396,19 +377,19 @@ def main():
                 content_length = local_length  # skip the download
         except requests.exceptions.RequestException as e:
             content_length = local_length  # skip the download
-            print(e)
+            logger.warn('%s', e)
 
         if local_length == content_length:
             download = False
         elif local_length > content_length:
-            print('deleting corrupt file from cache: ' + local_filename)
+            logger.info('deleting corrupt file from cache: %s', local_filename)
             os.remove(local_filename)
-            print("Downloading " + filename + " to cache")
+            logger.info("Downloading %s to cache", filename)
         elif local_length > -1 and local_length < content_length:
-            print("Resuming download of " + local_filename)
+            logger.info("Resuming download of %s", local_filename)
             resume_header = {'Range': 'bytes=%d-%d' % (local_length, content_length)}
         else:
-            print("Downloading " + filename + " to cache")
+            logger.info("Downloading %s to cache", filename)
 
         if download:
             r = requests.get(srcurl, headers=resume_header,
@@ -422,14 +403,39 @@ def main():
 
         v = sha256_for_file(local_filename)
         if v == shasum:
-            print("\t...shasum verified for " + local_filename)
+            logger.info("\t...shasum verified for %s", local_filename)
         else:
-            print("Invalid shasum of '" + v + "' detected for " + local_filename)
+            logger.critical("Invalid shasum of '%s' detected for %s", v, local_filename)
             os.remove(local_filename)
             sys.exit(1)
 
+
+def debug_log_vagrant_vm(vm_dir, config):
+    if options.verbosity >= 3:
+        _vagrant_dir = os.path.join(vm_dir, '.vagrant')
+        logger.debug('check %s dir exists? -> %r', _vagrant_dir, os.path.isdir(_vagrant_dir))
+        logger.debug('> vagrant status')
+        subprocess.call(['vagrant', 'status'], cwd=vm_dir)
+        logger.debug('> vagrant box list')
+        subprocess.call(['vagrant', 'box', 'list'])
+        if config['vm_provider'] == 'libvirt':
+            logger.debug('> virsh -c qmeu:///system list --all')
+            subprocess.call(['virsh', '-c', 'qemu:///system', 'list', '--all'])
+            domain = 'buildserver_default'
+            logger.debug('> virsh -c qemu:///system snapshot-list %s', domain)
+            subprocess.call(['virsh', '-c', 'qemu:///system', 'snapshot-list', domain])
+
+
+def main():
+    global cachedir, cachefiles, config, tail
+
+    if options.skip_cache_update:
+        logger.info('skipping cache update and verification...')
+    else:
+        update_cache(cachedir, cachefiles)
+
     local_qt_filename = os.path.join(cachedir, 'qt-opensource-linux-x64-android-5.7.0.run')
-    print("Setting executable bit for " + local_qt_filename)
+    logger.info("Setting executable bit for %s", local_qt_filename)
     os.chmod(local_qt_filename, 0o755)
 
     # use VirtualBox software virtualization if hardware is not available,
@@ -439,11 +445,13 @@ def main():
         # all < 10 year old Macs work, and OSX servers as VM host are very
         # rare, but this could also be auto-detected if someone codes it
         config['hwvirtex'] = 'on'
+        logger.info('platform is darwnin -> hwvirtex = \'on\'')
     elif os.path.exists('/proc/cpuinfo'):
         with open('/proc/cpuinfo') as f:
             contents = f.read()
         if 'vmx' in contents or 'svm' in contents:
             config['hwvirtex'] = 'on'
+            logger.info('found \'vmx\' or \'svm\' in /proc/cpuinfo -> hwvirtex = \'on\'')
 
     serverdir = os.path.join(os.getcwd(), 'buildserver')
     logfilename = os.path.join(serverdir, 'up.log')
@@ -452,30 +460,31 @@ def main():
     log_cm = vagrant.make_file_cm(logfilename)
     v = vagrant.Vagrant(root=serverdir, out_cm=log_cm, err_cm=log_cm)
 
-    if options.verbose:
+    if options.verbosity >= 2:
         tail = fdroidserver.tail.Tail(logfilename)
         tail.start()
 
+    vm = fdroidserver.vmtools.get_build_vm(serverdir, provider=config['vm_provider'])
     if options.clean:
-        destroy_current_image(v, serverdir)
+        vm.destroy()
 
     # Check against the existing Vagrantfile.yaml, and if they differ, we
     # need to create a new box:
     vf = os.path.join(serverdir, 'Vagrantfile.yaml')
     writevf = True
     if os.path.exists(vf):
-        print('Halting', serverdir)
+        logger.info('Halting %s', serverdir)
         v.halt()
         with open(vf, 'r', encoding='utf-8') as f:
             oldconfig = yaml.load(f)
         if config != oldconfig:
-            print("Server configuration has changed, rebuild from scratch is required")
-            destroy_current_image(v, serverdir)
+            logger.info("Server configuration has changed, rebuild from scratch is required")
+            vm.destroy()
         else:
-            print("Re-provisioning existing server")
+            logger.info("Re-provisioning existing server")
             writevf = False
     else:
-        print("No existing server - building from scratch")
+        logger.info("No existing server - building from scratch")
     if writevf:
         with open(vf, 'w', encoding='utf-8') as f:
             yaml.dump(config, f)
@@ -494,17 +503,23 @@ def main():
                 baseboxurl = config['baseboxurl']
             else:
                 baseboxurl = config['baseboxurl'][0]
-            print('Adding', config['basebox'], 'from', baseboxurl)
+            logger.info('Adding %s from %s', config['basebox'], baseboxurl)
             v.box_add(config['basebox'], baseboxurl)
             needs_mutate = True
         if needs_mutate:
-            print('Converting', config['basebox'], 'to libvirt format')
+            logger.info('Converting %s to libvirt format', config['basebox'])
             v._call_vagrant_command(['mutate', config['basebox'], 'libvirt'])
-            print('Removing virtualbox format copy of', config['basebox'])
+            logger.info('Removing virtualbox format copy of %s', config['basebox'])
             v.box_remove(config['basebox'], 'virtualbox')
 
-    print("Configuring build server VM")
-    v.up(provision=True)
+    logger.info("Configuring build server VM")
+    debug_log_vagrant_vm(serverdir, config)
+    try:
+        v.up(provision=True)
+    except fdroidserver.vmtools.FDroidBuildVmException as e:
+        debug_log_vagrant_vm(serverdir, config)
+        logger.exception('could not bring buildserver vm up. %s', e)
+        sys.exit(1)
 
     if config['copy_caches_from_host']:
         ssh_config = v.ssh_config()
@@ -527,30 +542,34 @@ def main():
         run_via_vagrant_ssh(v, ['rm', '-f', '~/.gradle/caches/modules-2/modules-2.lock'])
         run_via_vagrant_ssh(v, ['rm', '-fr', '~/.gradle/caches/*/plugin-resolution/'])
 
-    print("Writing buildserver ID")
     p = subprocess.Popen(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE,
                          universal_newlines=True)
     buildserverid = p.communicate()[0].strip()
-    print("...ID is " + buildserverid)
+    logger.info("Writing buildserver ID ...ID is %s", buildserverid)
     run_via_vagrant_ssh(v, 'sh -c "echo %s >/home/vagrant/buildserverid"' % buildserverid)
 
-    print("Stopping build server VM")
+    logger.info("Stopping build server VM")
     v.halt()
 
-    print("Packaging")
+    logger.info("Packaging")
     boxfile = os.path.join(os.getcwd(), 'buildserver.box')
     if os.path.exists(boxfile):
         os.remove(boxfile)
 
-    if config['vm_provider'] == 'libvirt':
-        kvm_package(boxfile)
-    else:
-        v.package(output=boxfile)
+    vm.package(output=boxfile)
 
-    print("Adding box")
-    v.box_add('buildserver', boxfile, force=True)
+    logger.info("Adding box")
+    vm.box_add('buildserver', boxfile, force=True)
 
-    os.remove(boxfile)
+    if 'buildserver' not in subprocess.check_output(['vagrant', 'box', 'list']).decode('utf-8'):
+        logger.critical('could not add box \'%s\' as \'buildserver\', terminating', boxfile)
+        sys.exit(1)
+
+    if not options.keep_box_file:
+        logger.debug('box added to vagrant, ' +
+                     'removing generated box file \'%s\'',
+                     boxfile)
+        os.remove(boxfile)
 
 
 if __name__ == '__main__':