mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no_sleep' into 'master'

Browse source 
vmtools: remove old vagrant workaround

See merge request fdroid/fdroidserver!380
This commit is contained in:
Michael Pöhn 2017-12-02 12:49:05 +00:00
commit 68bbfa7e0e
1 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
fdroidserver/vmtools.py
View file

@ -22,7 +22,6 @@ import os
import math import math
import json import json
import tarfile import tarfile
import time
import shutil import shutil
import subprocess import subprocess
import textwrap import textwrap
@ -194,8 +193,6 @@ class FDroidBuildVm():
def up(self, provision=True): def up(self, provision=True):
try: try:
self.vgrnt.up(provision=provision) self.vgrnt.up(provision=provision)
logger.info('...waiting a sec...')
time.sleep(10)
self.srvuuid = self._vagrant_fetch_uuid() self.srvuuid = self._vagrant_fetch_uuid()
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise FDroidBuildVmException("could not bring up vm '%s'" % self.srvname) from e raise FDroidBuildVmException("could not bring up vm '%s'" % self.srvname) from e
@ -204,8 +201,6 @@ class FDroidBuildVm():
logger.info('suspending buildserver') logger.info('suspending buildserver')
try: try:
self.vgrnt.suspend() self.vgrnt.suspend()
logger.info('...waiting a sec...')
time.sleep(10)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise FDroidBuildVmException("could not suspend vm '%s'" % self.srvname) from e raise FDroidBuildVmException("could not suspend vm '%s'" % self.srvname) from e
@ -352,16 +347,12 @@ class LibvirtBuildVm(FDroidBuildVm):
# (eg. lookupByName only works on running VMs) # (eg. lookupByName only works on running VMs)
try: try:
_check_call(('virsh', '-c', 'qemu:///system', 'destroy', self.srvname)) _check_call(('virsh', '-c', 'qemu:///system', 'destroy', self.srvname))
logger.info("...waiting a sec...")
time.sleep(10)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logger.info("could not force libvirt domain '%s' off: %s", self.srvname, e) logger.info("could not force libvirt domain '%s' off: %s", self.srvname, e)
try: try:
# libvirt python bindings do not support all flags required # libvirt python bindings do not support all flags required
# for undefining domains correctly. # for undefining domains correctly.
_check_call(('virsh', '-c', 'qemu:///system', 'undefine', self.srvname, '--nvram', '--managed-save', '--remove-all-storage', '--snapshots-metadata')) _check_call(('virsh', '-c', 'qemu:///system', 'undefine', self.srvname, '--nvram', '--managed-save', '--remove-all-storage', '--snapshots-metadata'))
logger.info("...waiting a sec...")
time.sleep(10)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logger.info("could not undefine libvirt domain '%s': %s", self.srvname, e) logger.info("could not undefine libvirt domain '%s': %s", self.srvname, e)
@ -458,8 +449,6 @@ class LibvirtBuildVm(FDroidBuildVm):
logger.info("creating snapshot '%s' for vm '%s'", snapshot_name, self.srvname) logger.info("creating snapshot '%s' for vm '%s'", snapshot_name, self.srvname)
try: try:
_check_call(['virsh', '-c', 'qemu:///system', 'snapshot-create-as', self.srvname, snapshot_name]) _check_call(['virsh', '-c', 'qemu:///system', 'snapshot-create-as', self.srvname, snapshot_name])
logger.info('...waiting a sec...')
time.sleep(10)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise FDroidBuildVmException("could not cerate snapshot '%s' " raise FDroidBuildVmException("could not cerate snapshot '%s' "
"of libvirt vm '%s'" "of libvirt vm '%s'"
@ -488,8 +477,6 @@ class LibvirtBuildVm(FDroidBuildVm):
dom = self.conn.lookupByName(self.srvname) dom = self.conn.lookupByName(self.srvname)
snap = dom.snapshotLookupByName(snapshot_name) snap = dom.snapshotLookupByName(snapshot_name)
dom.revertToSnapshot(snap) dom.revertToSnapshot(snap)
logger.info('...waiting a sec...')
time.sleep(10)
except libvirt.libvirtError as e: except libvirt.libvirtError as e:
raise FDroidBuildVmException('could not revert domain \'%s\' to snapshot \'%s\'' raise FDroidBuildVmException('could not revert domain \'%s\' to snapshot \'%s\''
% (self.srvname, snapshot_name)) from e % (self.srvname, snapshot_name)) from e
@ -505,8 +492,6 @@ class VirtualboxBuildVm(FDroidBuildVm):
logger.info("creating snapshot '%s' for vm '%s'", snapshot_name, self.srvname) logger.info("creating snapshot '%s' for vm '%s'", snapshot_name, self.srvname)
try: try:
_check_call(['VBoxManage', 'snapshot', self.srvuuid, 'take', 'fdroidclean'], cwd=self.srvdir) _check_call(['VBoxManage', 'snapshot', self.srvuuid, 'take', 'fdroidclean'], cwd=self.srvdir)
logger.info('...waiting a sec...')
time.sleep(10)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise FDroidBuildVmException('could not cerate snapshot ' raise FDroidBuildVmException('could not cerate snapshot '
'of virtualbox vm %s' 'of virtualbox vm %s'