From: Marcus <bubuiic@aol.com>
Date: Wed, 25 Oct 2017 12:41:25 +0000 (+0000)
Subject: Merge branch 'makebuildserver/default_memory' into 'master'
X-Git-Tag: 0.9~47
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fde964479d0f7405818cd34b993482b8057447b6;hp=-c;p=fdroidserver.git

Merge branch 'makebuildserver/default_memory' into 'master'

makebuildserver: change mem default 4 GB

See merge request fdroid/fdroidserver!358
---

fde964479d0f7405818cd34b993482b8057447b6
diff --combined makebuildserver
index 27a952b8,08f07d0a..64280c35
--- a/makebuildserver
+++ b/makebuildserver
@@@ -58,7 -58,8 +58,7 @@@ logger.debug('cachedir set to: %s', cac
  config = {
      'basebox': 'jessie64',
      'baseboxurl': [
 -        pathlib.Path(os.path.join(cachedir, 'jessie64.box')).as_uri(),
 -        'https://f-droid.org/jessie64.box',
 +        pathlib.Path(os.path.join(cachedir, 'jessie64.box')).as_uri()
      ],
      'debian_mirror': 'http://http.debian.net/debian/',
      'apt_package_cache': False,
@@@ -66,7 -67,7 +66,7 @@@
      'boot_timeout': 600,
      'cachedir': cachedir,
      'cpus': 1,
-     'memory': 1024,
+     'memory': 2048,
      'hwvirtex': 'off',
      'vm_provider': 'virtualbox',
  }
@@@ -524,9 -525,9 +524,9 @@@ def main()
      debug_log_vagrant_vm(serverdir, config)
      try:
          v.up(provision=True)
 -    except fdroidserver.vmtools.FDroidBuildVmException as e:
 +    except subprocess.CalledProcessError:
          debug_log_vagrant_vm(serverdir, config)
 -        logger.exception('could not bring buildserver vm up. %s', e)
 +        logger.error("'vagrant up' failed, is the base box missing?")
          sys.exit(1)
  
      if config['copy_caches_from_host']: