X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FSubstrate.py;h=304373e28e49f7befec79ba8cc460a4c22fadce4;hb=161ead318cbbb6c79437f209052e8a938cce7ec7;hp=139790a88074b73e42084d91acf43d69d3f89d7f;hpb=567d6e70500cf677acd5e0a5a4e2d5601d2f999e;p=tests.git diff --git a/system/Substrate.py b/system/Substrate.py index 139790a..304373e 100644 --- a/system/Substrate.py +++ b/system/Substrate.py @@ -404,14 +404,15 @@ class BuildBox (Box): else: self.soft_reboot (options) +build_matcher=re.compile("\s*(?P[0-9]+).*-[bo]\s+(?P[^\s]+)(\s|\Z)") +build_matcher_initvm=re.compile("\s*(?P[0-9]+).*initvm.*\s+(?P[^\s]+)\s*\Z") + class BuildVsBox (BuildBox): def soft_reboot (self, options): command=['pkill','vbuild'] self.run_ssh(command,"Terminating vbuild processes",dry_run=options.dry_run) # inspect box and find currently running builds - matcher=re.compile("\s*(?P[0-9]+).*-[bo]\s+(?P[^\s]+)(\s|\Z)") - matcher_building_vm=re.compile("\s*(?P[0-9]+).*initvm.*\s+(?P[^\s]+)\s*\Z") def sense(self, options): print 'vb', pids=self.backquote_ssh(['pgrep','vbuild'],trash_err=True) @@ -420,13 +421,13 @@ class BuildVsBox (BuildBox): ps_lines=self.backquote_ssh (command).split('\n') for line in ps_lines: if not line.strip() or line.find('PID')>=0: continue - m=BuildVsBox.matcher.match(line) + m=build_matcher.match(line) if m: date=time.strftime('%Y-%m-%d',time.localtime(time.time())) buildname=m.group('buildname').replace('@DATE@',date) self.add_build (buildname,m.group('pid')) continue - m=BuildVsBox.matcher_building_vm.match(line) + m=build_matcher_initvm.match(line) if m: # buildname is expansed here self.add_build (buildname,m.group('pid')) @@ -441,7 +442,26 @@ class BuildLxcBox (BuildBox): # inspect box and find currently running builds def sense(self, options): - print 'xb (Substrate.BuildLxcBox.sense - NIY)', + print 'xb', + pids=self.backquote_ssh(['pgrep','lbuild'],trash_err=True) + if not pids: return + command=['ps','-o','pid,command'] + [ pid for pid in pids.split("\n") if pid] + ps_lines=self.backquote_ssh (command).split('\n') + for line in ps_lines: + if not line.strip() or line.find('PID')>=0: continue + m=build_matcher.match(line) + if m: + date=time.strftime('%Y-%m-%d',time.localtime(time.time())) + buildname=m.group('buildname').replace('@DATE@',date) + self.add_build (buildname,m.group('pid')) + continue + m=build_matcher_initvm.match(line) + if m: + # buildname is expansed here + self.add_build (buildname,m.group('pid')) + continue + header('BuildLxcBox.sense: command %r returned line that failed to match'%command) + header(">>%s<<"%line) ############################################################ class PlcInstance: @@ -849,18 +869,30 @@ class TestInstance: def set_broken (self, plcindex, step): self.broken_steps.append ( (plcindex, step,) ) + def second_letter (self): + if not self.broken_steps: return '=' + else: + really_broken = [ step for (i,step) in self.broken_steps if '_ignore' not in step ] + # W is for warning like what's in the build mail + if len(really_broken)==0: return 'W' + else: return 'B' + def line (self): - double='==' - if self.pids: double='*'+double[1] - if self.broken_steps: double=double[0]+'B' + # make up a 2-letter sign + # first letter : '=', unless build is running : '*' + double = '*' if self.pids else '=' + # second letter : '=' if fine, 'W' for warnings (only ignored steps) 'B' for broken + letter2 = self.second_letter() + double += letter2 msg = " %s %s =="%(double,self.buildname) if not self.pids: pass elif len(self.pids)==1: msg += " (pid=%s)"%self.pids[0] else: msg += " !!!pids=%s!!!"%self.pids msg += " @%s"%self.pretty_timestamp() - if self.broken_steps: + if letter2 != '=': + msg = 'BROKEN' if letter2 == 'B' else 'WARNING' # sometimes we have an empty plcindex - msg += " [BROKEN=" + " ".join( [ "%s@%s"%(s,i) if i else s for (i,s) in self.broken_steps ] ) + "]" + msg += " [%s="%msg + " ".join( [ "%s@%s"%(s,i) if i else s for (i,s) in self.broken_steps ] ) + "]" return msg class TestBox (Box): @@ -932,7 +964,7 @@ class TestBox (Box): # let's try to be robust here -- tests that fail very early like e.g. # "Cannot make space for a PLC instance: vplc IP pool exhausted", that occurs as part of provision # will result in a 'trace' symlink to an inexisting 'trace-<>.txt' because no step has gone through - # simple 'trace' sohuld exist though as it is created by run_log + # simple 'trace' should exist though as it is created by run_log command=['bash','-c',"grep KO /root/*/logs/trace /dev/null 2>&1" ] trace_lines=self.backquote_ssh (command).split('\n') for line in trace_lines: @@ -999,7 +1031,7 @@ class Options: pass class Substrate: - def __init__ (self, plcs_on_vs=True, plcs_on_lxc=False): + def __init__ (self, plcs_on_vs=False, plcs_on_lxc=True): self.options=Options() self.options.dry_run=False self.options.verbose=False @@ -1314,7 +1346,7 @@ class Substrate: parser.add_option ('-r',"--reboot",action='store_true',dest='reboot',default=False, help='reboot mode (use shutdown -r)') parser.add_option ('-s',"--soft",action='store_true',dest='soft',default=False, - help='soft mode for reboot (vserver stop or kill qemus)') + help='soft mode for reboot (terminates processes)') parser.add_option ('-t',"--testbox",action='store_true',dest='testbox',default=False, help='add test box') parser.add_option ('-b',"--build",action='store_true',dest='builds',default=False,