Merge branch 'makebuildserver/default_memory' into 'master'

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 8484e63a761970748846f4336c6062b1073d77d3..64280c35adeda549ebdd8c0407f9e8102cbbe0b3 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -58,8 +58,7 @@ logger.debug('cachedir set to: %s', cachedir)
 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,
@@ -67,7 +66,7 @@ config = {
     'boot_timeout': 600,
     'cachedir': cachedir,
     'cpus': 1,
-    'memory': 1024,
+    'memory': 2048,
     'hwvirtex': 'off',
     'vm_provider': 'virtualbox',
 }
@@ -323,6 +322,8 @@ cachefiles = [
      'd55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43'),
     ('https://services.gradle.org/distributions/gradle-4.2-bin.zip',
      '515dd63d32e55a9c05667809c5e40a947529de3054444ad274b3b75af5582eae'),
+    ('https://downloads.gradle.org/distributions/gradle-4.2.1-bin.zip',
+     'b551cc04f2ca51c78dd14edb060621f0e5439bdfafa6fd167032a09ac708fbc0'),
     ('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',
@@ -523,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']: