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,
'7422682f92fb471d4aad4c053c9982a9a623377f9d5e4de7a73cd44ebf2f3c61'),
('https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip',
'c8617f25a7de2aeb9ddcacf1aeb413e053d5ed5ef4a3f31fe0ce21d4428ee0ea'),
+ ('https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip',
+ 'a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce'),
# 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',
'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',
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']: