kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-07 01:40:10 +02:00
Code Activity

makebuildserver prune gloabal vagrant status when purging broken VMs

Browse Source
This commit is contained in:
Michael Pöhn 2017-03-24 04:16:30 +01:00 committed by Hans-Christoph Steiner
parent 8cfd3ca770
commit 2aa5523011
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makebuildserver
View File

@ -304,6 +304,7 @@ def destroy_current_image(v, serverdir):
v.destroy()
elif options.verbose:
print('Cannot run destroy vagrant setup since Vagrantfile.yaml is not setup!')
subprocess.check_call(['vagrant', 'global-status', '--prune'])
try:
shutil.rmtree(os.path.join(serverdir, '.vagrant'))
@ -346,7 +347,7 @@ def kvm_package(boxfile):
img_info = json.loads(img_info_raw.decode('utf-8'))
metadata = {"provider": "libvirt",
"format": img_info['format'],
"virtual_size": math.ceil(img_info['virtual-size'] / 1024.**3),
"virtual_size": math.ceil(img_info['virtual-size'] / 1024. ** 3),
}
vagrantfile = """Vagrant.configure("2") do |config|