import glob
import utils
-from TestPlc import TestPlc
+from TestPlc import TestPlc, Ignored
from TestSite import TestSite
from TestNode import TestNode
from macros import sequences
try: (step,qualifier)=step.split('@')
except: pass
stepname=step
- for special in ['force']:
- stepname = stepname.replace(special+'_',"")
+ for special in ['force','ignore']:
+ stepname = stepname.replace('_'+special,"")
Step(stepname).print_doc()
def run (self):
help="fcdistro - as in vbuild-nightly")
parser.add_option("-e","--exclude",action="append", dest="exclude", default=[],
help="steps to exclude - can be set multiple times, or use quotes")
+ parser.add_option("-i","--ignore",action="append", dest="ignore", default=[],
+ help="steps to run but ignore - can be set multiple times, or use quotes")
parser.add_option("-a","--all",action="store_true",dest="all_steps", default=False,
help="Run all default steps")
parser.add_option("-l","--list",action="store_true",dest="list_steps", default=False,
help="Specify the set of hostnames for the boxes that host the nodes")
parser.add_option("-N","--nodes",action="append", dest="ips_vnode", default=[],
help="Specify the set of hostname/IP's to use for vnodes")
- parser.add_option ('-X', "--lxc",action='store_true',dest='plcs_use_lxc',
+ parser.add_option ('-X', "--lxc",action='store_true',dest='plcs_use_lxc',default=True,
+ help='use lxc-enabled plc boxes instead of vs-enabled ones')
+ parser.add_option ('-S', "--vs",action='store_false',dest='plcs_use_lxc',
help='use lxc-enabled plc boxes instead of vs-enabled ones')
parser.add_option("-s","--size",action="store",type="int",dest="size",default=1,
help="sets test size in # of plcs - default is 1")
help="Used by plc_db_dump and plc_db_restore")
parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False,
help="Run in verbose mode")
- parser.add_option("-i","--interactive",action="store_true",dest="interactive",default=False,
+ parser.add_option("-I","--interactive",action="store_true",dest="interactive",default=False,
help="prompts before each step")
parser.add_option("-n","--dry-run", action="store_true", dest="dry_run", default=False,
help="Show environment and exits")
result.append(el)
return result
# flatten relevant options
- for optname in ['config','exclude','ips_bplc','ips_vplc','ips_bnode','ips_vnode']:
+ for optname in ['config','exclude','ignore','ips_bplc','ips_vplc','ips_bnode','ips_vnode']:
setattr(self.options,optname, flatten ( [ arg.split() for arg in getattr(self.options,optname) ] ))
if not self.options.rspec_styles:
# rewrite '-' into '_' in step names
self.options.steps = [ step.replace('-','_') for step in self.options.steps ]
self.options.exclude = [ step.replace('-','_') for step in self.options.exclude ]
+ self.options.ignore = [ step.replace('-','_') for step in self.options.ignore ]
+
+ TestPlc.create_ignore_steps()
# exclude
selected=[]
keep=False
break
if keep: selected.append(step)
+
+ # ignore
+ selected = [ step if step not in self.options.ignore else step+"_ignore"
+ for step in selected ]
+
self.options.steps=selected
# this is useful when propagating on host boxes, to avoid conflicts
continue
# some steps need to be done regardless of the previous ones: we force them
force=False
- if step.find("force_") == 0:
- step=step.replace("force_","")
+ if step.endswith("_force"):
+ step=step.replace("_force","")
force=True
# allow for steps to specify an index like in
# run checkslice@2
utils.header("********** %d RUNNING step %s%s on plc %s"%(plc_counter,stepname,force_msg,plcname))
if not cross: step_result = method(plc_obj)
else: step_result = method(plc_obj,across_plcs)
- if step_result:
+ if isinstance (step_result,Ignored):
+ step_result=step_result.result
+ msg="OK" if step_result else "KO"
+ utils.header('********** %d IGNORED (%s) step %s on %s'%(plc_counter,msg,stepname,plcname))
+ status="%s[I]"%msg
+ elif step_result:
utils.header('********** %d SUCCESSFUL step %s on %s'%(plc_counter,stepname,plcname))
status="OK"
else: