class slice_mapper__tasks (object):
# could not get this to work with named arguments
def __init__ (self,timeout_minutes,silent_minutes,period_seconds):
- print "self",self
print "timeout_minutes,silent_minutes,period_seconds",timeout_minutes,silent_minutes,period_seconds
self.timeout=timedelta(minutes=timeout_minutes)
self.silent=timedelta(minutes=silent_minutes)
repo_url = self.options.arch_rpms_url
for level in [ 'arch' ]:
repo_url = os.path.dirname(repo_url)
+
+ # invoke initvm (drop support for vs)
+ script="ltest-initvm.sh"
+ script_options=""
# pass the vbuild-nightly options to [lv]test-initvm
- test_env_options=""
- test_env_options += " -p %s"%self.options.personality
- test_env_options += " -d %s"%self.options.pldistro
- test_env_options += " -f %s"%self.options.fcdistro
- if self.options.plcs_use_lxc:
- script="ltest-initvm.sh"
- else:
- script="vtest-initvm.sh"
+ script_options += " -p %s"%self.options.personality
+ script_options += " -d %s"%self.options.pldistro
+ script_options += " -f %s"%self.options.fcdistro
+ script_options += " -r %s"%repo_url
vserver_name = self.vservername
- vserver_options="--netdev eth0 --interface %s"%self.vserverip
try:
vserver_hostname=socket.gethostbyaddr(self.vserverip)[0]
- vserver_options += " --hostname %s"%vserver_hostname
+ script_options += " -n %s"%vserver_hostname
except:
print "Cannot reverse lookup %s"%self.vserverip
print "This is considered fatal, as this might pollute the test results"
return False
- create_vserver="%(build_dir)s/%(script)s %(test_env_options)s %(vserver_name)s %(repo_url)s -- %(vserver_options)s"%locals()
+ create_vserver="%(build_dir)s/%(script)s %(script_options)s %(vserver_name)s"%locals()
return self.run_in_host(create_vserver) == 0
### install_rpm